From: Peter Georg <peter.georg(a)physik.uni-regensburg.de>
qla2xxx: Add new messaging
Bugzilla:
https://bugzilla.redhat.com/2039070
Upstream Status: RHEL only
commit 3e0ddf59e494012fa5bc015328c6425143eb103f
Author: Ewan D. Milne <emilne(a)redhat.com>
Date: Tue Jan 11 12:32:58 2022 -0500
qla2xxx: Add new messaging
Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=2039070
Upstream Status: RHEL-only
New messages based on input from BU and RH Engineering.
Signed-off-by: Ewan D. Milne <emilne(a)redhat.com>
Signed-off-by: Peter Georg <peter.georg(a)physik.uni-regensburg.de>
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index blahblah..blahblah 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2805,6 +2805,12 @@ static void qla2x00_iocb_work_fn(struct work_struct *work)
spin_unlock_irqrestore(&vha->work_lock, flags);
}
+#ifdef CONFIG_RHEL_DIFFERENCES
+static const struct pci_device_id rh_disabled_pci_table[] = {
+ { 0 }
+};
+#endif
+
/*
* PCI driver interface
*/
@@ -2824,6 +2830,11 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id
*id)
struct rsp_que *rsp = NULL;
int i;
+#ifdef CONFIG_RHEL_DIFFERENCES
+ if (pci_hw_disabled(rh_disabled_pci_table, pdev))
+ return -ENODEV;
+#endif
+
bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);
sht = &qla2xxx_driver_template;
if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2422 ||
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610