From: Peter Georg <peter.georg@xxxxxxxxxxxxxxxxxxxxxxxx>
mptspi: Add new messaging
Upstream Status: RHEL only
Signed-off-by: Peter Georg <peter.georg@xxxxxxxxxxxxxxxxxxxxxxxx>
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index blahblah..blahblah 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -1244,15 +1244,30 @@ static struct pci_device_id mptspi_pci_table[] = {
#else
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
PCI_ANY_ID, PCI_ANY_ID },
+#endif
{ PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030,
PCI_ANY_ID, PCI_ANY_ID },
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035,
PCI_ANY_ID, PCI_ANY_ID },
-#endif
{0} /* Terminating entry */
};
MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
+#ifdef CONFIG_RHEL_DIFFERENCES
+static const struct pci_device_id rh_unmaintained_pci_table[] = {
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
+ PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
+ {0} /* Terminating entry */
+};
+
+static const struct pci_device_id rh_disabled_pci_table[] = {
+ { PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030,
+ PCI_ANY_ID, PCI_ANY_ID },
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035,
+ PCI_ANY_ID, PCI_ANY_ID },
+ {0} /* Terminating entry */
+};
+#endif
/*
* renegotiate for a given target
@@ -1367,6 +1382,13 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
int error=0;
int r;
+#ifdef CONFIG_RHEL_DIFFERENCES
+ if (pci_hw_disabled(rh_disabled_pci_table, pdev))
+ return -ENODEV;
+
+ pci_hw_unmaintained(rh_unmaintained_pci_table, pdev);
+#endif
+
if ((r = mpt_attach(pdev,id)) != 0)
return r;
@@ -1540,11 +1562,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
scsi_scan_host(sh);
-#ifdef CONFIG_RHEL_DIFFERENCES
- add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
- pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n");
-#endif
-
return 0;
out_mptspi_probe:
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
