scsi/sd: Fix Opal support
PATCH 1/1 scsi/sd: Fix Opal support
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 [email protected]
Tested-by [email protected]
Cc Christoph Hellwig <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Alan Stern <[email protected]>
Signed-off-by Bart Van Assche <[email protected]>
--- drivers/scsi/sd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/sd.c +4 -3
@@ -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 */
drivers/scsi/sd.c static int sd_sec_submit(void *data, u16 spsp, u8 secp, void *buffer, · line 713
Quoted 7 lines
drivers/scsi/sd.c +4
-3- 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 <[email protected]>