| Message ID | 20210222021042.3534-1-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] scsi/sd: Fix Opal support | expand |
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
Bart, > 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. Applied to 5.12/scsi-staging. Thanks for fixing this up!
On Sun, 21 Feb 2021 18:10:42 -0800, Bart Van Assche wrote: > 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. Applied to 5.12/scsi-queue, thanks! [1/1] scsi/sd: Fix Opal support https://git.kernel.org/mkp/scsi/c/aaf15f8c6de9
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a3d2d4bc4a3d..6a3a163b0706 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 */
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 Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: Jens Axboe <axboe@kernel.dk> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: stable@vger.kernel.org Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- Changes compared to v1: - Addressed Christoph's review comments. - Added Cc: stable. --- drivers/scsi/sd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)