66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
|
From 33e9e344ec9ffb7cf9d949c69420328df5fe4b29 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||
|
|
Date: Sat, 16 Mar 2024 10:19:11 -0400
|
||
|
|
Subject: [PATCH 3/3] Bring back deprecated pci ids to mptsas-mptspi driver
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/message/fusion/mptsas.c | 12 +++++++++++-
|
||
|
|
drivers/message/fusion/mptspi.c | 10 +++++-----
|
||
|
|
2 files changed, 16 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
|
||
|
|
index a4666d02a..e4e41a5d3 100644
|
||
|
|
--- a/drivers/message/fusion/mptsas.c
|
||
|
|
+++ b/drivers/message/fusion/mptsas.c
|
||
|
|
@@ -5355,8 +5355,18 @@ static void mptsas_remove(struct pci_dev *pdev)
|
||
|
|
}
|
||
|
|
|
||
|
|
static struct pci_device_id mptsas_pci_table[] = {
|
||
|
|
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,
|
||
|
|
+ PCI_ANY_ID, PCI_ANY_ID },
|
||
|
|
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
|
||
|
|
- PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
|
||
|
|
+ PCI_ANY_ID, PCI_ANY_ID },
|
||
|
|
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064E,
|
||
|
|
+ PCI_ANY_ID, PCI_ANY_ID },
|
||
|
|
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068E,
|
||
|
|
+ PCI_ANY_ID, PCI_ANY_ID },
|
||
|
|
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1078,
|
||
|
|
+ PCI_ANY_ID, PCI_ANY_ID },
|
||
|
|
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,
|
||
|
|
+ PCI_ANY_ID, PCI_ANY_ID },
|
||
|
|
{0} /* Terminating entry */
|
||
|
|
};
|
||
|
|
MODULE_DEVICE_TABLE(pci, mptsas_pci_table);
|
||
|
|
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
|
||
|
|
index 08acc09f7..9a336a161 100644
|
||
|
|
--- a/drivers/message/fusion/mptspi.c
|
||
|
|
+++ b/drivers/message/fusion/mptspi.c
|
||
|
|
@@ -1245,7 +1245,11 @@ static struct spi_function_template mptspi_transport_functions = {
|
||
|
|
|
||
|
|
static struct pci_device_id mptspi_pci_table[] = {
|
||
|
|
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
|
||
|
|
- PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
|
||
|
|
+ PCI_ANY_ID, PCI_ANY_ID },
|
||
|
|
+ { 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 */
|
||
|
|
};
|
||
|
|
MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
|
||
|
|
@@ -1536,10 +1540,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||
|
|
0, 0, 0, 0, 5);
|
||
|
|
|
||
|
|
scsi_scan_host(sh);
|
||
|
|
-
|
||
|
|
- add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
|
||
|
|
- pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n");
|
||
|
|
-
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
out_mptspi_probe:
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|