tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "scsi: replace blk_mq_pci_map_queues with blk_mq_map_hw_queues"

Browse Source 
This reverts commit 5e8438fd7f which is
commit bd326a5ad6397ccfc67af862606be107c15a43e6 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I2a9698e86a15e9ee12f6b61bd028986227ea00c5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-05-19 15:45:54 +00:00
parent 38f1a2afb6
commit cbab53e120
12 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/scsi/fnic/fnic_main.c
+2 -1
View File
@@ -16,6 +16,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/blk-mq-pci.h>
#include <scsi/fc/fc_fip.h> #include <scsi/fc/fc_fip.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include <scsi/scsi_transport.h> #include <scsi/scsi_transport.h>
@@ -600,7 +601,7 @@ void fnic_mq_map_queues_cpus(struct Scsi_Host *host)
return; return;
} }
blk_mq_map_hw_queues(qmap, &l_pdev->dev, FNIC_PCI_OFFSET); blk_mq_pci_map_queues(qmap, l_pdev, FNIC_PCI_OFFSET);
} }
static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
drivers/scsi/hisi_sas/hisi_sas.h
+1
View File
@@ -9,6 +9,7 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/blk-mq.h> #include <linux/blk-mq.h>
#include <linux/blk-mq-pci.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/dmapool.h> #include <linux/dmapool.h>
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+2 -2
View File
@@ -3333,8 +3333,8 @@ static void hisi_sas_map_queues(struct Scsi_Host *shost)
if (i == HCTX_TYPE_POLL) if (i == HCTX_TYPE_POLL)
blk_mq_map_queues(qmap); blk_mq_map_queues(qmap);
else else
blk_mq_map_hw_queues(qmap, hisi_hba->dev, blk_mq_pci_map_queues(qmap, hisi_hba->pci_dev,
BASE_VECTORS_V3_HW); BASE_VECTORS_V3_HW);
qoff += qmap->nr_queues; qoff += qmap->nr_queues;
} }
} }
drivers/scsi/megaraid/megaraid_sas_base.c
+2 -1
View File
@@ -37,6 +37,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/irq_poll.h> #include <linux/irq_poll.h>
#include <linux/blk-mq-pci.h>
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
@@ -3195,7 +3196,7 @@ static void megasas_map_queues(struct Scsi_Host *shost)
map = &shost->tag_set.map[HCTX_TYPE_DEFAULT]; map = &shost->tag_set.map[HCTX_TYPE_DEFAULT];
map->nr_queues = instance->msix_vectors - offset; map->nr_queues = instance->msix_vectors - offset;
map->queue_offset = 0; map->queue_offset = 0;
blk_mq_map_hw_queues(map, &instance->pdev->dev, offset); blk_mq_pci_map_queues(map, instance->pdev, offset);
qoff += map->nr_queues; qoff += map->nr_queues;
offset += map->nr_queues; offset += map->nr_queues;
drivers/scsi/mpi3mr/mpi3mr.h
+1
View File
@@ -12,6 +12,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/blk-mq.h> #include <linux/blk-mq.h>
#include <linux/blk-mq-pci.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/dmapool.h> #include <linux/dmapool.h>
#include <linux/errno.h> #include <linux/errno.h>
drivers/scsi/mpi3mr/mpi3mr_os.c
+1 -1
View File
@@ -4042,7 +4042,7 @@ static void mpi3mr_map_queues(struct Scsi_Host *shost)
*/ */
map->queue_offset = qoff; map->queue_offset = qoff;
if (i != HCTX_TYPE_POLL) if (i != HCTX_TYPE_POLL)
blk_mq_map_hw_queues(map, &mrioc->pdev->dev, offset); blk_mq_pci_map_queues(map, mrioc->pdev, offset);
else else
blk_mq_map_queues(map); blk_mq_map_queues(map);
drivers/scsi/mpt3sas/mpt3sas_scsih.c
+2 -1
View File
@@ -53,6 +53,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/raid_class.h> #include <linux/raid_class.h>
#include <linux/blk-mq-pci.h>
#include <linux/unaligned.h> #include <linux/unaligned.h>
#include "mpt3sas_base.h" #include "mpt3sas_base.h"
@@ -11889,7 +11890,7 @@ static void scsih_map_queues(struct Scsi_Host *shost)
*/ */
map->queue_offset = qoff; map->queue_offset = qoff;
if (i != HCTX_TYPE_POLL) if (i != HCTX_TYPE_POLL)
blk_mq_map_hw_queues(map, &ioc->pdev->dev, offset); blk_mq_pci_map_queues(map, ioc->pdev, offset);
else else
blk_mq_map_queues(map); blk_mq_map_queues(map);
drivers/scsi/pm8001/pm8001_init.c
+1 -1
View File
@@ -101,7 +101,7 @@ static void pm8001_map_queues(struct Scsi_Host *shost)
struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT]; struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT];
if (pm8001_ha->number_of_intr > 1) { if (pm8001_ha->number_of_intr > 1) {
blk_mq_map_hw_queues(qmap, &pm8001_ha->pdev->dev, 1); blk_mq_pci_map_queues(qmap, pm8001_ha->pdev, 1);
return; return;
} }
drivers/scsi/pm8001/pm8001_sas.h
+1
View File
@@ -56,6 +56,7 @@
#include <scsi/sas_ata.h> #include <scsi/sas_ata.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/blk-mq.h> #include <linux/blk-mq.h>
#include <linux/blk-mq-pci.h>
#include "pm8001_defs.h" #include "pm8001_defs.h"
#define DRV_NAME "pm80xx" #define DRV_NAME "pm80xx"
drivers/scsi/qla2xxx/qla_nvme.c
+2 -1
View File
@@ -8,6 +8,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/nvme.h> #include <linux/nvme.h>
#include <linux/nvme-fc.h> #include <linux/nvme-fc.h>
#include <linux/blk-mq-pci.h>
#include <linux/blk-mq.h> #include <linux/blk-mq.h>
static struct nvme_fc_port_template qla_nvme_fc_transport; static struct nvme_fc_port_template qla_nvme_fc_transport;
@@ -840,7 +841,7 @@ static void qla_nvme_map_queues(struct nvme_fc_local_port *lport,
{ {
struct scsi_qla_host *vha = lport->private; struct scsi_qla_host *vha = lport->private;
blk_mq_map_hw_queues(map, &vha->hw->pdev->dev, vha->irq_offset); blk_mq_pci_map_queues(map, vha->hw->pdev, vha->irq_offset);
} }
static void qla_nvme_localport_delete(struct nvme_fc_local_port *lport) static void qla_nvme_localport_delete(struct nvme_fc_local_port *lport)
drivers/scsi/qla2xxx/qla_os.c
+2 -2
View File
@@ -13,6 +13,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/kobject.h> #include <linux/kobject.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/blk-mq-pci.h>
#include <linux/refcount.h> #include <linux/refcount.h>
#include <linux/crash_dump.h> #include <linux/crash_dump.h>
#include <linux/trace_events.h> #include <linux/trace_events.h>
@@ -8070,8 +8071,7 @@ static void qla2xxx_map_queues(struct Scsi_Host *shost)
if (USER_CTRL_IRQ(vha->hw) || !vha->hw->mqiobase) if (USER_CTRL_IRQ(vha->hw) || !vha->hw->mqiobase)
blk_mq_map_queues(qmap); blk_mq_map_queues(qmap);
else else
blk_mq_map_hw_queues(qmap, &vha->hw->pdev->dev, blk_mq_pci_map_queues(qmap, vha->hw->pdev, vha->irq_offset);
vha->irq_offset);
} }
struct scsi_host_template qla2xxx_driver_template = { struct scsi_host_template qla2xxx_driver_template = {
drivers/scsi/smartpqi/smartpqi_init.c
+4 -3
View File
@@ -19,6 +19,7 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/cciss_ioctl.h> #include <linux/cciss_ioctl.h>
#include <linux/blk-mq-pci.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
@@ -6546,10 +6547,10 @@ static void pqi_map_queues(struct Scsi_Host *shost)
struct pqi_ctrl_info *ctrl_info = shost_to_hba(shost); struct pqi_ctrl_info *ctrl_info = shost_to_hba(shost);
if (!ctrl_info->disable_managed_interrupts) if (!ctrl_info->disable_managed_interrupts)
blk_mq_map_hw_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT], return blk_mq_pci_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT],
&ctrl_info->pci_dev->dev, 0); ctrl_info->pci_dev, 0);
else else
blk_mq_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT]); return blk_mq_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT]);
} }
static inline bool pqi_is_tape_changer_device(struct pqi_scsi_dev *device) static inline bool pqi_is_tape_changer_device(struct pqi_scsi_dev *device)