SCSI fixes for 5.8-rc1
Subsystems (6)
James Bottomley
maintainerOne minor fix and two patches reworking the ata dma drain for the !CONFIG_LIBATA case. The latter is a regression fix for cc97923a5bcc ("block: move dma drain handling to scsi")
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Christoph Hellwig (2):
scsi: Wire up ata_scsi_dma_need_drain for SAS HBA drivers
scsi: libata: Provide an ata_scsi_dma_need_drain stub for !CONFIG_ATA
Dinghao Liu (1):
scsi: ufs-bsg: Fix runtime PM imbalance on error
And the diffstat:
drivers/scsi/aic94xx/aic94xx_init.c | 1 + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 1 + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 + drivers/scsi/ipr.c | 1 + drivers/scsi/isci/init.c | 1 + drivers/scsi/mvsas/mv_init.c | 1 + drivers/scsi/pm8001/pm8001_init.c | 1 + drivers/scsi/ufs/ufs_bsg.c | 4 +++- include/linux/libata.h | 4 ++++ 10 files changed, 15 insertions(+), 1 deletion(-)
With full diff below.
James
---
drivers/scsi/aic94xx/aic94xx_init.c +1 -0
@@ -40,6 +40,7 @@ static struct scsi_host_template aic94xx_sht = {/* .name is initialized */ .name = "aic94xx", .queuecommand = sas_queuecommand, + .dma_need_drain = ata_scsi_dma_need_drain, .target_alloc = sas_target_alloc, .slave_configure = sas_slave_configure, .scan_finished = asd_scan_finished,
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +1 -0
@@ -1756,6 +1756,7 @@ static struct scsi_host_template sht_v1_hw = { .proc_name = DRV_NAME, .module = THIS_MODULE, .queuecommand = sas_queuecommand, + .dma_need_drain = ata_scsi_dma_need_drain, .target_alloc = sas_target_alloc, .slave_configure = hisi_sas_slave_configure, .scan_finished = hisi_sas_scan_finished,
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +1 -0
@@ -3532,6 +3532,7 @@ static struct scsi_host_template sht_v2_hw = { .proc_name = DRV_NAME, .module = THIS_MODULE, .queuecommand = sas_queuecommand, + .dma_need_drain = ata_scsi_dma_need_drain, .target_alloc = sas_target_alloc, .slave_configure = hisi_sas_slave_configure, .scan_finished = hisi_sas_scan_finished,
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -0
@@ -3075,6 +3075,7 @@ static struct scsi_host_template sht_v3_hw = { .proc_name = DRV_NAME, .module = THIS_MODULE, .queuecommand = sas_queuecommand, + .dma_need_drain = ata_scsi_dma_need_drain, .target_alloc = sas_target_alloc, .slave_configure = hisi_sas_slave_configure, .scan_finished = hisi_sas_scan_finished,
drivers/scsi/ipr.c +1 -0
@@ -6731,6 +6731,7 @@ static struct scsi_host_template driver_template = { .compat_ioctl = ipr_ioctl, #endif .queuecommand = ipr_queuecommand, + .dma_need_drain = ata_scsi_dma_need_drain, .eh_abort_handler = ipr_eh_abort, .eh_device_reset_handler = ipr_eh_dev_reset, .eh_host_reset_handler = ipr_eh_host_reset,
drivers/scsi/isci/init.c +1 -0
@@ -153,6 +153,7 @@ static struct scsi_host_template isci_sht = { .name = DRV_NAME, .proc_name = DRV_NAME, .queuecommand = sas_queuecommand, + .dma_need_drain = ata_scsi_dma_need_drain, .target_alloc = sas_target_alloc, .slave_configure = sas_slave_configure, .scan_finished = isci_host_scan_finished,
drivers/scsi/mvsas/mv_init.c +1 -0
@@ -33,6 +33,7 @@ static struct scsi_host_template mvs_sht = { .module = THIS_MODULE, .name = DRV_NAME, .queuecommand = sas_queuecommand, + .dma_need_drain = ata_scsi_dma_need_drain, .target_alloc = sas_target_alloc, .slave_configure = sas_slave_configure, .scan_finished = mvs_scan_finished,
drivers/scsi/pm8001/pm8001_init.c +1 -0
@@ -87,6 +87,7 @@ static struct scsi_host_template pm8001_sht = { .module = THIS_MODULE, .name = DRV_NAME, .queuecommand = sas_queuecommand, + .dma_need_drain = ata_scsi_dma_need_drain, .target_alloc = sas_target_alloc, .slave_configure = sas_slave_configure, .scan_finished = pm8001_scan_finished,
drivers/scsi/ufs/ufs_bsg.c +3 -1
@@ -106,8 +106,10 @@ static int ufs_bsg_request(struct bsg_job *job) desc_op = bsg_request->upiu_req.qr.opcode; ret =ufs_bsg_alloc_desc_buffer (hba, job, &desc_buff, &desc_len, desc_op); -if (ret) +if (ret) { +pm_runtime_put_sync (hba->dev); goto out; + }/* fall through */ case UPIU_TRANSACTION_NOP_OUT :
include/linux/libata.h +4 -0
@@ -1092,7 +1092,11 @@ extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd,#define ATA_SCSI_COMPAT_IOCTL /* empty */ #endif extern int ata_scsi_queuecmd (struct Scsi_Host *h,struct scsi_cmnd *cmd); +#if IS_ENABLED (CONFIG_ATA )bool ata_scsi_dma_need_drain (struct request *rq); +#else +#define ata_scsi_dma_need_drain NULL +#endif extern int ata_sas_scsi_ioctl (struct ata_port *ap,struct scsi_device *dev,unsigned int cmd,void __user *arg);extern bool ata_link_online (struct ata_link *link);
The pull request you sent on Sat, 20 Jun 2020 10:42:16 -0700:
The pull request you sent on Sat, 20 Jun 2020 10:42:16 -0700:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/64677779e8962c20b580b471790fe42367750599
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker