|
 |
9dc7b3 |
centosplus patch
|
|
|
9dc7b3 |
|
|
|
9dc7b3 |
Ref: ELRepo patch elrepo-fusion-mptsas-mptspi-el8.patch
|
|
|
9dc7b3 |
|
|
|
9dc7b3 |
Revert the changes RH made in their el8 kernel
|
|
|
9dc7b3 |
|
|
|
9dc7b3 |
diff -Naurp rhel8-4.18.0-80/drivers/message/fusion/mptsas.c kernel-4.20.18/drivers/message/fusion/mptsas.c
|
|
|
9dc7b3 |
--- a/drivers/message/fusion/mptsas.c 2019-03-13 11:04:53.000000000 +0000
|
|
|
9dc7b3 |
+++ b/drivers/message/fusion/mptsas.c 2018-11-21 08:22:14.000000000 +0000
|
|
|
9dc7b3 |
@@ -5290,9 +5290,6 @@ mptsas_probe(struct pci_dev *pdev, const
|
|
|
9dc7b3 |
ioc, MPI_SAS_OP_CLEAR_ALL_PERSISTENT);
|
|
|
9dc7b3 |
}
|
|
|
9dc7b3 |
|
|
|
9dc7b3 |
- add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
|
|
|
9dc7b3 |
- pr_warn("MPTSAS MODULE IS NOT SUPPORTED\n");
|
|
|
9dc7b3 |
-
|
|
|
9dc7b3 |
error = scsi_add_host(sh, &ioc->pcidev->dev);
|
|
|
9dc7b3 |
if (error) {
|
|
|
9dc7b3 |
dprintk(ioc, printk(MYIOC_s_ERR_FMT
|
|
|
9dc7b3 |
@@ -5356,8 +5353,18 @@ static void mptsas_remove(struct pci_dev
|
|
|
9dc7b3 |
}
|
|
|
9dc7b3 |
|
|
|
9dc7b3 |
static struct pci_device_id mptsas_pci_table[] = {
|
|
|
9dc7b3 |
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,
|
|
|
9dc7b3 |
+ PCI_ANY_ID, PCI_ANY_ID },
|
|
|
9dc7b3 |
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
|
|
|
9dc7b3 |
- PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
|
|
|
9dc7b3 |
+ PCI_ANY_ID, PCI_ANY_ID },
|
|
|
9dc7b3 |
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064E,
|
|
|
9dc7b3 |
+ PCI_ANY_ID, PCI_ANY_ID },
|
|
|
9dc7b3 |
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068E,
|
|
|
9dc7b3 |
+ PCI_ANY_ID, PCI_ANY_ID },
|
|
|
9dc7b3 |
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1078,
|
|
|
9dc7b3 |
+ PCI_ANY_ID, PCI_ANY_ID },
|
|
|
9dc7b3 |
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,
|
|
|
9dc7b3 |
+ PCI_ANY_ID, PCI_ANY_ID },
|
|
|
9dc7b3 |
{0} /* Terminating entry */
|
|
|
9dc7b3 |
};
|
|
|
9dc7b3 |
MODULE_DEVICE_TABLE(pci, mptsas_pci_table);
|
|
|
9dc7b3 |
diff -Naurp rhel8-4.18.0-80/drivers/message/fusion/mptspi.c kernel-4.20.18/drivers/message/fusion/mptspi.c
|
|
|
9dc7b3 |
--- a/drivers/message/fusion/mptspi.c 2019-03-13 11:04:53.000000000 +0000
|
|
|
9dc7b3 |
+++ b/drivers/message/fusion/mptspi.c 2018-11-21 08:22:14.000000000 +0000
|
|
|
9dc7b3 |
@@ -1245,7 +1245,11 @@ static struct spi_function_template mpts
|
|
|
9dc7b3 |
|
|
|
9dc7b3 |
static struct pci_device_id mptspi_pci_table[] = {
|
|
|
9dc7b3 |
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
|
|
|
9dc7b3 |
- PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
|
|
|
9dc7b3 |
+ PCI_ANY_ID, PCI_ANY_ID },
|
|
|
9dc7b3 |
+ { PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030,
|
|
|
9dc7b3 |
+ PCI_ANY_ID, PCI_ANY_ID },
|
|
|
9dc7b3 |
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035,
|
|
|
9dc7b3 |
+ PCI_ANY_ID, PCI_ANY_ID },
|
|
|
9dc7b3 |
{0} /* Terminating entry */
|
|
|
9dc7b3 |
};
|
|
|
9dc7b3 |
MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
|
|
|
9dc7b3 |
@@ -1536,10 +1540,6 @@ mptspi_probe(struct pci_dev *pdev, const
|
|
|
9dc7b3 |
0, 0, 0, 0, 5);
|
|
|
9dc7b3 |
|
|
|
9dc7b3 |
scsi_scan_host(sh);
|
|
|
9dc7b3 |
-
|
|
|
9dc7b3 |
- add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
|
|
|
9dc7b3 |
- pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n");
|
|
|
9dc7b3 |
-
|
|
|
9dc7b3 |
return 0;
|
|
|
9dc7b3 |
|
|
|
9dc7b3 |
out_mptspi_probe:
|