sugar/linux
1
0
Fork 0
Code Activity

scsi: ufs: core: Remove the ufshcd_lrb task_tag member

Browse Source 
Remove the ufshcd_lrb task_tag member and use scsi_cmd_to_rq(cmd)->tag
instead. Use rq->tag instead of lrbp->task_tag. This patch reduces the
size of struct ufshcd_lrb.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20251031204029.2883185-26-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche
2025-10-31 13:39:33 -07:00
committed by Martin K. Petersen
parent 176b93004c
commit 9a2c950092
2 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/ufs/core/ufshcd.c
View File

@@ -599,7 +599,7 @@ static void ufshcd_print_tr(struct ufs_hba *hba, struct scsi_cmnd *cmd,
bool pr_prdt) bool pr_prdt)
{ {
struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd);
const int tag = lrbp->task_tag; const int tag = scsi_cmd_to_rq(cmd)->tag;
int prdt_length; int prdt_length;
if (hba->monitor.enabled) { if (hba->monitor.enabled) {
@@ -2369,6 +2369,7 @@ static inline void ufshcd_send_command(struct ufs_hba *hba,
struct ufs_hw_queue *hwq) struct ufs_hw_queue *hwq)
{ {
struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd);
const int tag = scsi_cmd_to_rq(cmd)->tag;
unsigned long flags; unsigned long flags;
if (hba->monitor.enabled) { if (hba->monitor.enabled) {
@@ -2397,11 +2398,10 @@ static inline void ufshcd_send_command(struct ufs_hba *hba,
} else { } else {
spin_lock_irqsave(&hba->outstanding_lock, flags); spin_lock_irqsave(&hba->outstanding_lock, flags);
if (hba->vops && hba->vops->setup_xfer_req) if (hba->vops && hba->vops->setup_xfer_req)
hba->vops->setup_xfer_req(hba, lrbp->task_tag, hba->vops->setup_xfer_req(hba, tag,
ufshcd_is_scsi_cmd(cmd)); ufshcd_is_scsi_cmd(cmd));
__set_bit(lrbp->task_tag, &hba->outstanding_reqs); __set_bit(tag, &hba->outstanding_reqs);
ufshcd_writel(hba, 1 << lrbp->task_tag, ufshcd_writel(hba, 1 << tag, REG_UTP_TRANSFER_REQ_DOOR_BELL);
REG_UTP_TRANSFER_REQ_DOOR_BELL);
spin_unlock_irqrestore(&hba->outstanding_lock, flags); spin_unlock_irqrestore(&hba->outstanding_lock, flags);
} }
} }
@@ -2798,6 +2798,7 @@ static void ufshcd_prepare_utp_scsi_cmd_upiu(struct scsi_cmnd *cmd,
u8 upiu_flags) u8 upiu_flags)
{ {
struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd);
const int tag = scsi_cmd_to_rq(cmd)->tag;
struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr; struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr;
unsigned short cdb_len; unsigned short cdb_len;
@@ -2805,11 +2806,11 @@ static void ufshcd_prepare_utp_scsi_cmd_upiu(struct scsi_cmnd *cmd,
.transaction_code = UPIU_TRANSACTION_COMMAND, .transaction_code = UPIU_TRANSACTION_COMMAND,
.flags = upiu_flags, .flags = upiu_flags,
.lun = lrbp->lun, .lun = lrbp->lun,
.task_tag = lrbp->task_tag, .task_tag = tag,
.command_set_type = UPIU_COMMAND_SET_TYPE_SCSI, .command_set_type = UPIU_COMMAND_SET_TYPE_SCSI,
}; };
WARN_ON_ONCE(ucd_req_ptr->header.task_tag != lrbp->task_tag); WARN_ON_ONCE(ucd_req_ptr->header.task_tag != tag);
ucd_req_ptr->sc.exp_data_transfer_len = cpu_to_be32(cmd->sdb.length); ucd_req_ptr->sc.exp_data_transfer_len = cpu_to_be32(cmd->sdb.length);
@@ -2830,6 +2831,7 @@ static void ufshcd_prepare_utp_query_req_upiu(struct ufs_hba *hba,
{ {
struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd);
struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr; struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr;
const int tag = scsi_cmd_to_rq(cmd)->tag;
struct ufs_query *query = &hba->dev_cmd.query; struct ufs_query *query = &hba->dev_cmd.query;
u16 len = be16_to_cpu(query->request.upiu_req.length); u16 len = be16_to_cpu(query->request.upiu_req.length);
@@ -2838,7 +2840,7 @@ static void ufshcd_prepare_utp_query_req_upiu(struct ufs_hba *hba,
.transaction_code = UPIU_TRANSACTION_QUERY_REQ, .transaction_code = UPIU_TRANSACTION_QUERY_REQ,
.flags = upiu_flags, .flags = upiu_flags,
.lun = lrbp->lun, .lun = lrbp->lun,
.task_tag = lrbp->task_tag, .task_tag = tag,
.query_function = query->request.query_func, .query_function = query->request.query_func,
/* Data segment length only need for WRITE_DESC */ /* Data segment length only need for WRITE_DESC */
.data_segment_length = .data_segment_length =
@@ -2861,12 +2863,13 @@ static inline void ufshcd_prepare_utp_nop_upiu(struct scsi_cmnd *cmd)
{ {
struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd);
struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr; struct utp_upiu_req *ucd_req_ptr = lrbp->ucd_req_ptr;
const int tag = scsi_cmd_to_rq(cmd)->tag;
memset(ucd_req_ptr, 0, sizeof(struct utp_upiu_req)); memset(ucd_req_ptr, 0, sizeof(struct utp_upiu_req));
ucd_req_ptr->header = (struct utp_upiu_header){ ucd_req_ptr->header = (struct utp_upiu_header){
.transaction_code = UPIU_TRANSACTION_NOP_OUT, .transaction_code = UPIU_TRANSACTION_NOP_OUT,
.task_tag = lrbp->task_tag, .task_tag = tag,
}; };
} }
@@ -2951,7 +2954,6 @@ static void __ufshcd_setup_cmd(struct ufs_hba *hba, struct scsi_cmnd *cmd,
memset(lrbp->ucd_req_ptr, 0, sizeof(*lrbp->ucd_req_ptr)); memset(lrbp->ucd_req_ptr, 0, sizeof(*lrbp->ucd_req_ptr));
lrbp->task_tag = tag;
lrbp->lun = lun; lrbp->lun = lun;
ufshcd_prepare_lrbp_crypto(ufshcd_is_scsi_cmd(cmd) ? ufshcd_prepare_lrbp_crypto(ufshcd_is_scsi_cmd(cmd) ?
scsi_cmd_to_rq(cmd) : NULL, lrbp); scsi_cmd_to_rq(cmd) : NULL, lrbp);
@@ -3249,6 +3251,8 @@ ufshcd_dev_cmd_completion(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba, static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba,
struct ufshcd_lrb *lrbp, int max_timeout) struct ufshcd_lrb *lrbp, int max_timeout)
{ {
struct scsi_cmnd *cmd = (struct scsi_cmnd *)lrbp - 1;
const int tag = scsi_cmd_to_rq(cmd)->tag;
unsigned long time_left = msecs_to_jiffies(max_timeout); unsigned long time_left = msecs_to_jiffies(max_timeout);
unsigned long flags; unsigned long flags;
bool pending; bool pending;
@@ -3265,18 +3269,18 @@ retry:
} else { } else {
err = -ETIMEDOUT; err = -ETIMEDOUT;
dev_dbg(hba->dev, "%s: dev_cmd request timedout, tag %d\n", dev_dbg(hba->dev, "%s: dev_cmd request timedout, tag %d\n",
__func__, lrbp->task_tag); __func__, tag);
/* MCQ mode */ /* MCQ mode */
if (hba->mcq_enabled) { if (hba->mcq_enabled) {
/* successfully cleared the command, retry if needed */ /* successfully cleared the command, retry if needed */
if (ufshcd_clear_cmd(hba, lrbp->task_tag) == 0) if (ufshcd_clear_cmd(hba, tag) == 0)
err = -EAGAIN; err = -EAGAIN;
return err; return err;
} }
/* SDB mode */ /* SDB mode */
if (ufshcd_clear_cmd(hba, lrbp->task_tag) == 0) { if (ufshcd_clear_cmd(hba, tag) == 0) {
/* successfully cleared the command, retry if needed */ /* successfully cleared the command, retry if needed */
err = -EAGAIN; err = -EAGAIN;
/* /*
@@ -3285,11 +3289,9 @@ retry:
* variable. * variable.
*/ */
spin_lock_irqsave(&hba->outstanding_lock, flags); spin_lock_irqsave(&hba->outstanding_lock, flags);
pending = test_bit(lrbp->task_tag, pending = test_bit(tag, &hba->outstanding_reqs);
&hba->outstanding_reqs);
if (pending) if (pending)
__clear_bit(lrbp->task_tag, __clear_bit(tag, &hba->outstanding_reqs);
&hba->outstanding_reqs);
spin_unlock_irqrestore(&hba->outstanding_lock, flags); spin_unlock_irqrestore(&hba->outstanding_lock, flags);
if (!pending) { if (!pending) {
@@ -3302,11 +3304,10 @@ retry:
} }
} else { } else {
dev_err(hba->dev, "%s: failed to clear tag %d\n", dev_err(hba->dev, "%s: failed to clear tag %d\n",
__func__, lrbp->task_tag); __func__, tag);
spin_lock_irqsave(&hba->outstanding_lock, flags); spin_lock_irqsave(&hba->outstanding_lock, flags);
pending = test_bit(lrbp->task_tag, pending = test_bit(tag, &hba->outstanding_reqs);
&hba->outstanding_reqs);
spin_unlock_irqrestore(&hba->outstanding_lock, flags); spin_unlock_irqrestore(&hba->outstanding_lock, flags);
if (!pending) { if (!pending) {
@@ -5468,6 +5469,7 @@ static inline int ufshcd_transfer_rsp_status(struct ufs_hba *hba,
struct cq_entry *cqe) struct cq_entry *cqe)
{ {
struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd); struct ufshcd_lrb *lrbp = scsi_cmd_priv(cmd);
const int tag = scsi_cmd_to_rq(cmd)->tag;
int result = 0; int result = 0;
int scsi_status; int scsi_status;
enum utp_ocs ocs; enum utp_ocs ocs;
@@ -5539,10 +5541,8 @@ static inline int ufshcd_transfer_rsp_status(struct ufs_hba *hba,
case OCS_ABORTED: case OCS_ABORTED:
case OCS_INVALID_COMMAND_STATUS: case OCS_INVALID_COMMAND_STATUS:
result |= DID_REQUEUE << 16; result |= DID_REQUEUE << 16;
dev_warn(hba->dev, dev_warn(hba->dev, "OCS %s from controller for tag %d\n",
"OCS %s from controller for tag %d\n", ocs == OCS_ABORTED ? "aborted" : "invalid", tag);
(ocs == OCS_ABORTED ? "aborted" : "invalid"),
lrbp->task_tag);
break; break;
case OCS_INVALID_CMD_TABLE_ATTR: case OCS_INVALID_CMD_TABLE_ATTR:
case OCS_INVALID_PRDT_ATTR: case OCS_INVALID_PRDT_ATTR:
@@ -5555,9 +5555,8 @@ static inline int ufshcd_transfer_rsp_status(struct ufs_hba *hba,
case OCS_GENERAL_CRYPTO_ERROR: case OCS_GENERAL_CRYPTO_ERROR:
default: default:
result |= DID_ERROR << 16; result |= DID_ERROR << 16;
dev_err(hba->dev, dev_err(hba->dev, "OCS error from controller = %x for tag %d\n",
"OCS error from controller = %x for tag %d\n", ocs, tag);
ocs, lrbp->task_tag);
ufshcd_print_evt_hist(hba); ufshcd_print_evt_hist(hba);
ufshcd_print_host_state(hba); ufshcd_print_host_state(hba);
break; break;
@@ -7692,8 +7691,8 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)
u8 resp = 0xF; u8 resp = 0xF;
for (poll_cnt = 100; poll_cnt; poll_cnt--) { for (poll_cnt = 100; poll_cnt; poll_cnt--) {
err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag, err = ufshcd_issue_tm_cmd(hba, lrbp->lun, tag, UFS_QUERY_TASK,
UFS_QUERY_TASK, &resp); &resp);
if (!err && resp == UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED) { if (!err && resp == UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED) {
/* cmd pending in the device */ /* cmd pending in the device */
dev_err(hba->dev, "%s: cmd pending in the device. tag = %d\n", dev_err(hba->dev, "%s: cmd pending in the device. tag = %d\n",
@@ -7726,8 +7725,7 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)
if (!poll_cnt) if (!poll_cnt)
return -EBUSY; return -EBUSY;
err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag, err = ufshcd_issue_tm_cmd(hba, lrbp->lun, tag, UFS_ABORT_TASK, &resp);
UFS_ABORT_TASK, &resp);
if (err || resp != UPIU_TASK_MANAGEMENT_FUNC_COMPL) { if (err || resp != UPIU_TASK_MANAGEMENT_FUNC_COMPL) {
if (!err) { if (!err) {
err = resp; /* service response error */ err = resp; /* service response error */
@@ -7837,7 +7835,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)
goto release; goto release;
} }
err = ufshcd_try_to_abort_task(hba, lrbp->task_tag); err = ufshcd_try_to_abort_task(hba, tag);
if (err) { if (err) {
dev_err(hba->dev, "%s: failed with err %d\n", __func__, err); dev_err(hba->dev, "%s: failed with err %d\n", __func__, err);
ufshcd_set_req_abort_skip(hba, hba->outstanding_reqs); ufshcd_set_req_abort_skip(hba, hba->outstanding_reqs);

1
include/ufs/ufshcd.h
View File

@@ -188,7 +188,6 @@ struct ufshcd_lrb {
int scsi_status; int scsi_status;
int command_type; int command_type;
int task_tag;
u8 lun; /* UPIU LUN id field is only 8-bit wide */ u8 lun; /* UPIU LUN id field is only 8-bit wide */
bool intr_cmd; bool intr_cmd;
bool req_abort_skip; bool req_abort_skip;