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

scsi: ufs: core: Change the type of one ufshcd_send_command() argument 



Change the 'task_tag' argument into an LRB pointer. This patch prepares
for the removal of the hba->lrb[] array.

Reviewed-by: default avatarAvri Altman <avri.altman@sandisk.com>
Reviewed-by: default avatarPeter Wang <peter.wang@mediatek.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20251031204029.2883185-13-bvanassche@acm.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ffa5d8c1

drivers/ufs/core/ufshcd.c

+6 −7
Original line number Diff line number Diff line
@@ -2350,14 +2350,13 @@ static void ufshcd_update_monitor(struct ufs_hba *hba, const struct ufshcd_lrb * 
/**

 * ufshcd_send_command - Send SCSI or device management commands

 * @hba: per adapter instance

 * @task_tag: Task tag of the command

 * @lrbp: Local reference block of SCSI command

 * @hwq: pointer to hardware queue instance

 */

static inline

void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag,

static inline void ufshcd_send_command(struct ufs_hba *hba,

				       struct ufshcd_lrb *lrbp,

				       struct ufs_hw_queue *hwq)

{

	struct ufshcd_lrb *lrbp = &hba->lrb[task_tag];

	unsigned long flags;



	if (hba->monitor.enabled) {
@@ -3066,7 +3065,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 
	if (hba->mcq_enabled)

		hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(cmd));



	ufshcd_send_command(hba, tag, hwq);

	ufshcd_send_command(hba, lrbp, hwq);



out:

	if (ufs_trigger_eh(hba)) {
@@ -3312,7 +3311,7 @@ static int ufshcd_issue_dev_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp, 
	int err;



	ufshcd_add_query_upiu_trace(hba, UFS_QUERY_SEND, lrbp->ucd_req_ptr);

	ufshcd_send_command(hba, tag, hba->dev_cmd_queue);

	ufshcd_send_command(hba, lrbp, hba->dev_cmd_queue);

	err = ufshcd_wait_for_dev_cmd(hba, lrbp, timeout);



	ufshcd_add_query_upiu_trace(hba, err ? UFS_QUERY_ERR : UFS_QUERY_COMP,