From 587723a7ee57280b740216bb6a619d7bcf339056 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 18 Oct 2022 13:29:57 -0700 Subject: [PATCH] BACKPORT: FROMGIT: scsi: ufs: Introduce the function ufshcd_execute_start_stop() Open-code scsi_execute() because a later patch will modify scmd->flags and because scsi_execute() does not support setting scmd->flags. No functionality is changed. Change-Id: I427ec2f5f46aed3a0bd2c31d7f0c92ab58c6b4a2 Signed-off-by: Bart Van Assche Link: https://lore.kernel.org/r/20221018202958.1902564-10-bvanassche@acm.org Reviewed-by: Mike Christie Signed-off-by: Martin K. Petersen Bug: 258234315 (cherry picked from commit 6a354a7e740ee779d8595bb3c555d415433f2b19 git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next) [ bvanassche: backported from kernel v6.1 to kernel v5.15 ] Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 40 ++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 3dd651d0ecf4..fa42fd0604c1 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -8811,6 +8811,40 @@ static void ufshcd_hba_exit(struct ufs_hba *hba) } } +static int ufshcd_execute_start_stop(struct scsi_device *sdev, + enum ufs_dev_pwr_mode pwr_mode, + struct scsi_sense_hdr *sshdr) +{ + unsigned char cdb[6] = { START_STOP, 0, 0, 0, pwr_mode << 4, 0 }; + struct request *req; + struct scsi_request *rq; + struct scsi_cmnd *scmd; + int ret; + + req = blk_get_request(sdev->request_queue, REQ_OP_DRV_IN, + BLK_MQ_REQ_PM); + if (IS_ERR(req)) + return PTR_ERR(req); + + rq = scsi_req(req); + scmd = blk_mq_rq_to_pdu(req); + rq->cmd_len = COMMAND_SIZE(cdb[0]); + memcpy(rq->cmd, cdb, rq->cmd_len); + rq->retries = 0/*retries*/; + req->timeout = 1 * HZ; + req->rq_flags |= RQF_PM | RQF_QUIET; + + blk_execute_rq(NULL, req, /*at_head=*/true); + + if (sshdr) + scsi_normalize_sense(rq->sense, rq->sense_len, sshdr); + ret = rq->result; + + blk_put_request(req); + + return ret; +} + /** * ufshcd_set_dev_pwr_mode - sends START STOP UNIT command to set device * power mode @@ -8823,7 +8857,6 @@ static void ufshcd_hba_exit(struct ufs_hba *hba) static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, enum ufs_dev_pwr_mode pwr_mode) { - unsigned char cmd[6] = { START_STOP }; struct scsi_sense_hdr sshdr; struct scsi_device *sdp; unsigned long flags; @@ -8848,16 +8881,13 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, */ hba->host->eh_noresume = 1; - cmd[4] = pwr_mode << 4; - /* * Current function would be generally called from the power management * callbacks hence set the RQF_PM flag so that it doesn't resume the * already suspended childs. */ for (retries = 3; retries > 0; --retries) { - ret = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr, - HZ, 0, 0, RQF_PM, NULL); + ret = ufshcd_execute_start_stop(sdp, pwr_mode, &sshdr); /* * scsi_execute() only returns a negative value if the request * queue is dying.