[PATCH] scsi/sd: Fix Opal support

[PATCH] scsi/sd: Fix Opal support

[Bart Van Assche]

The SCSI core has been modified recently such that it only processes PM
requests if rpm_status != RPM_ACTIVE. Since some Opal requests are
submitted while rpm_status != RPM_ACTIVE, set flag RQF_PM for Opal
requests.

See also https://bugzilla.kernel.org/show_bug.cgi?id=211227.

Fixes: d80210f25ff0 ("sd: add support for TCG OPAL self encrypting disks")
Fixes: 271822bbf9fe ("scsi: core: Only process PM requests if rpm_status != RPM_ACTIVE")
Reported-by: chriscjsus@yahoo.com
Tested-by: chriscjsus@yahoo.com
Cc: chriscjsus@yahoo.com
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/scsi/sd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a3d2d4bc4a3d..aaebf166066a 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -707,9 +707,10 @@ static int sd_sec_submit(void *data, u16 spsp, u8 secp, void *buffer,
 	put_unaligned_be16(spsp, &cdb[2]);
 	put_unaligned_be32(len, &cdb[6]);
 
-	ret = scsi_execute_req(sdev, cdb,
-			send ? DMA_TO_DEVICE : DMA_FROM_DEVICE,
-			buffer, len, NULL, SD_TIMEOUT, sdkp->max_retries, NULL);
+	ret = scsi_execute(sdev, cdb,
+		send ? DMA_TO_DEVICE : DMA_FROM_DEVICE, buffer, len,
+		/*sense=*/NULL, /*sshdr=*/NULL, SD_TIMEOUT, sdkp->max_retries,
+		/*flags=*/0, /*rq_flags=*/RQF_PM, /*resid=*/NULL);
 	return ret <= 0 ? ret : -EIO;
 }
 #endif /* CONFIG_BLK_SED_OPAL */

Re: [PATCH] scsi/sd: Fix Opal support

[Christoph Hellwig]

> -	ret = scsi_execute_req(sdev, cdb,
> -			send ? DMA_TO_DEVICE : DMA_FROM_DEVICE,
> -			buffer, len, NULL, SD_TIMEOUT, sdkp->max_retries, NULL);
> +	ret = scsi_execute(sdev, cdb,
> +		send ? DMA_TO_DEVICE : DMA_FROM_DEVICE, buffer, len,
> +		/*sense=*/NULL, /*sshdr=*/NULL, SD_TIMEOUT, sdkp->max_retries,
> +		/*flags=*/0, /*rq_flags=*/RQF_PM, /*resid=*/NULL);

Please keep the existing style here.  Otherwise looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>