Commit 1de4378f authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: Remove ufshcd_lrb.sense_buffer 

ufshcd_lrb.sense_buffer is NULL if ufshcd_lrb.cmd is NULL and
ufshcd_lrb.sense_buffer points at cmd->sense_buffer if ufshcd_lrb.cmd is
set. In other words, the ufshcd_lrb.sense_buffer member is identical to
cmd->sense_buffer. Hence this patch that removes the
ufshcd_lrb.sense_buffer structure member.

Link: https://lore.kernel.org/r/20220419225811.4127248-7-bvanassche@acm.org


Tested-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b639b59b

drivers/scsi/ufs/ufshcd.c

+4 −5
Original line number Diff line number Diff line
@@ -2127,15 +2127,17 @@ void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag) 
 */

static inline void ufshcd_copy_sense_data(struct ufshcd_lrb *lrbp)

{

	u8 *const sense_buffer = lrbp->cmd->sense_buffer;

	int len;

	if (lrbp->sense_buffer &&



	if (sense_buffer &&

	    ufshcd_get_rsp_upiu_data_seg_len(lrbp->ucd_rsp_ptr)) {

		int len_to_copy;



		len = be16_to_cpu(lrbp->ucd_rsp_ptr->sr.sense_data_len);

		len_to_copy = min_t(int, UFS_SENSE_SIZE, len);



		memcpy(lrbp->sense_buffer, lrbp->ucd_rsp_ptr->sr.sense_data,

		memcpy(sense_buffer, lrbp->ucd_rsp_ptr->sr.sense_data,

		       len_to_copy);

	}

}
@@ -2789,7 +2791,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 
	lrbp = &hba->lrb[tag];

	WARN_ON(lrbp->cmd);

	lrbp->cmd = cmd;

	lrbp->sense_buffer = cmd->sense_buffer;

	lrbp->task_tag = tag;

	lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);

	lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba);
@@ -2829,7 +2830,6 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba *hba, 
		struct ufshcd_lrb *lrbp, enum dev_cmd_type cmd_type, int tag)

{

	lrbp->cmd = NULL;

	lrbp->sense_buffer = NULL;

	lrbp->task_tag = tag;

	lrbp->lun = 0; /* device management cmd is not specific to any LUN */

	lrbp->intr_cmd = true; /* No interrupt aggregation */
@@ -6800,7 +6800,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba, 
	lrbp = &hba->lrb[tag];

	WARN_ON(lrbp->cmd);

	lrbp->cmd = NULL;

	lrbp->sense_buffer = NULL;

	lrbp->task_tag = tag;

	lrbp->lun = 0;

	lrbp->intr_cmd = true;

drivers/scsi/ufs/ufshcd.h

+0 −2
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ struct ufs_pm_lvl_states { 
 * @ucd_rsp_dma_addr: UPIU response dma address for debug

 * @ucd_req_dma_addr: UPIU request dma address for debug

 * @cmd: pointer to SCSI command

 * @sense_buffer: pointer to sense buffer address of the SCSI command

 * @scsi_status: SCSI status of the command

 * @command_type: SCSI, UFS, Query.

 * @task_tag: Task tag of the command
@@ -205,7 +204,6 @@ struct ufshcd_lrb { 
	dma_addr_t ucd_prdt_dma_addr;



	struct scsi_cmnd *cmd;

	u8 *sense_buffer;

	int scsi_status;



	int command_type;