Skip to content

Commit b8f1d1e

Browse files
Christoph Hellwigmartinkpetersen
authored andcommitted
scsi: Wire up ata_scsi_dma_need_drain for SAS HBA drivers
We need ata_scsi_dma_need_drain for all drivers wired up to drive ATAPI devices through libata. That also includes the SAS HBA drivers in addition to native libata HBA drivers. Link: https://lore.kernel.org/r/[email protected] Fixes: cc97923 ("block: move dma drain handling to scsi") Reported-by: Michael Ellerman <[email protected]> Tested-by: Michael Ellerman <[email protected]> Acked-by: Jack Wang <[email protected]> Acked-by: John Garry <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 7bb7ee8 commit b8f1d1e

File tree

8 files changed

+8
-0
lines changed

8 files changed

+8
-0
lines changed

drivers/scsi/aic94xx/aic94xx_init.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ static struct scsi_host_template aic94xx_sht = {
4040
/* .name is initialized */
4141
.name = "aic94xx",
4242
.queuecommand = sas_queuecommand,
43+
.dma_need_drain = ata_scsi_dma_need_drain,
4344
.target_alloc = sas_target_alloc,
4445
.slave_configure = sas_slave_configure,
4546
.scan_finished = asd_scan_finished,

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,6 +1756,7 @@ static struct scsi_host_template sht_v1_hw = {
17561756
.proc_name = DRV_NAME,
17571757
.module = THIS_MODULE,
17581758
.queuecommand = sas_queuecommand,
1759+
.dma_need_drain = ata_scsi_dma_need_drain,
17591760
.target_alloc = sas_target_alloc,
17601761
.slave_configure = hisi_sas_slave_configure,
17611762
.scan_finished = hisi_sas_scan_finished,

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3532,6 +3532,7 @@ static struct scsi_host_template sht_v2_hw = {
35323532
.proc_name = DRV_NAME,
35333533
.module = THIS_MODULE,
35343534
.queuecommand = sas_queuecommand,
3535+
.dma_need_drain = ata_scsi_dma_need_drain,
35353536
.target_alloc = sas_target_alloc,
35363537
.slave_configure = hisi_sas_slave_configure,
35373538
.scan_finished = hisi_sas_scan_finished,

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3075,6 +3075,7 @@ static struct scsi_host_template sht_v3_hw = {
30753075
.proc_name = DRV_NAME,
30763076
.module = THIS_MODULE,
30773077
.queuecommand = sas_queuecommand,
3078+
.dma_need_drain = ata_scsi_dma_need_drain,
30783079
.target_alloc = sas_target_alloc,
30793080
.slave_configure = hisi_sas_slave_configure,
30803081
.scan_finished = hisi_sas_scan_finished,

drivers/scsi/ipr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6731,6 +6731,7 @@ static struct scsi_host_template driver_template = {
67316731
.compat_ioctl = ipr_ioctl,
67326732
#endif
67336733
.queuecommand = ipr_queuecommand,
6734+
.dma_need_drain = ata_scsi_dma_need_drain,
67346735
.eh_abort_handler = ipr_eh_abort,
67356736
.eh_device_reset_handler = ipr_eh_dev_reset,
67366737
.eh_host_reset_handler = ipr_eh_host_reset,

drivers/scsi/isci/init.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ static struct scsi_host_template isci_sht = {
153153
.name = DRV_NAME,
154154
.proc_name = DRV_NAME,
155155
.queuecommand = sas_queuecommand,
156+
.dma_need_drain = ata_scsi_dma_need_drain,
156157
.target_alloc = sas_target_alloc,
157158
.slave_configure = sas_slave_configure,
158159
.scan_finished = isci_host_scan_finished,

drivers/scsi/mvsas/mv_init.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ static struct scsi_host_template mvs_sht = {
3333
.module = THIS_MODULE,
3434
.name = DRV_NAME,
3535
.queuecommand = sas_queuecommand,
36+
.dma_need_drain = ata_scsi_dma_need_drain,
3637
.target_alloc = sas_target_alloc,
3738
.slave_configure = sas_slave_configure,
3839
.scan_finished = mvs_scan_finished,

drivers/scsi/pm8001/pm8001_init.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ static struct scsi_host_template pm8001_sht = {
8787
.module = THIS_MODULE,
8888
.name = DRV_NAME,
8989
.queuecommand = sas_queuecommand,
90+
.dma_need_drain = ata_scsi_dma_need_drain,
9091
.target_alloc = sas_target_alloc,
9192
.slave_configure = sas_slave_configure,
9293
.scan_finished = pm8001_scan_finished,

0 commit comments

Comments
 (0)