diff options
| author | Bart Van Assche <[email protected]> | 2021-02-21 18:10:42 -0800 |
|---|---|---|
| committer | Martin K. Petersen <[email protected]> | 2021-02-22 22:39:44 -0500 |
| commit | aaf15f8c6de932861f1fce6aeec6a89ac0e354b6 (patch) | |
| tree | cfd5ee4b1fd9fed1bf17e9290f4e96894be4d8f3 | |
| parent | 8f33bb2400f48a6a319176866af6e7aac9e5211e (diff) | |
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.
[mkp: updated sha for PM patch]
Link: https://lore.kernel.org/r/[email protected]
Fixes: d80210f25ff0 ("sd: add support for TCG OPAL self encrypting disks")
Fixes: e6044f714b25 ("scsi: core: Only process PM requests if rpm_status != RPM_ACTIVE")
Cc: [email protected]
Cc: Jens Axboe <[email protected]>
Cc: Alan Stern <[email protected]>
Cc: [email protected]
Reported-by: [email protected]
Tested-by: [email protected]
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Bart Van Assche <[email protected]>
Signed-off-by: Martin K. Petersen <[email protected]>
| -rw-r--r-- | drivers/scsi/sd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 6e41ecbf4399..ed0b1bb99f08 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -707,9 +707,9 @@ 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, NULL, NULL, SD_TIMEOUT, sdkp->max_retries, 0, + RQF_PM, NULL); return ret <= 0 ? ret : -EIO; } #endif /* CONFIG_BLK_SED_OPAL */ |