From 29ca6f8a2e61d719424c36bdadbceac88ec44133 Mon Sep 17 00:00:00 2001
From: Peter Georg <peter.georg@physik.uni-regensburg.de>
Date: Feb 13 2022 17:32:38 +0000
Subject: Update patch


---

diff --git a/SOURCES/0001-add-deprecated-ids.patch b/SOURCES/0001-add-deprecated-ids.patch
index 62e7747..7c7e260 100644
--- a/SOURCES/0001-add-deprecated-ids.patch
+++ b/SOURCES/0001-add-deprecated-ids.patch
@@ -1,30 +1,70 @@
 --- a/src/mpt3sas_scsih.c
 +++ b/src/mpt3sas_scsih.c
-@@ -12564,7 +12564,6 @@
-  * The pci device ids are defined in mpi/mpi2_cnfg.h.
-  */
- static const struct pci_device_id mpt3sas_pci_table[] = {
--#ifndef CONFIG_RHEL_DIFFERENCES
- 	/* Spitfire ~ 2004 */
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004,
- 		PCI_ANY_ID, PCI_ANY_ID },
-@@ -12583,7 +12582,6 @@
- 		PCI_ANY_ID, PCI_ANY_ID },
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2,
- 		PCI_ANY_ID, PCI_ANY_ID },
+@@ -12022,59 +12021,0 @@
+-#ifdef CONFIG_RHEL_DIFFERENCES
+-static const struct pci_device_id rh_deprecated_pci_table[] = {
+-
+-	{0}     /* Terminating entry */
+-};
+-
+-static const struct pci_device_id rh_unmaintained_pci_table[] = {
+-	/* Thunderbolt ~ 2208 */
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_2,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_3,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_4,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_5,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_6,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	/* Mustang ~ 2308 */
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_1,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_3,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-
+-	{0}     /* Terminating entry */
+-};
+-
+-
+-static const struct pci_device_id rh_disabled_pci_table[] = {
+-	/* Spitfire ~ 2004 */
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	/* Falcon ~ 2008 */
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2008,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	/* Liberator ~ 2108 */
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2108_1,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2108_2,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2108_3,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	/* Meteor ~ 2116 */
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_1,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-
+-	/* SSS6200 */
+-	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SSS6200,
+-		PCI_ANY_ID, PCI_ANY_ID },
+-
+-	{0}     /* Terminating entry */
+-};
 -#endif
- 	/* Thunderbolt ~ 2208 */
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1,
- 		PCI_ANY_ID, PCI_ANY_ID },
-@@ -12608,11 +12606,9 @@
- 		PCI_ANY_ID, PCI_ANY_ID },
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1,
- 		PCI_ANY_ID, PCI_ANY_ID },
--#ifndef CONFIG_RHEL_DIFFERENCES
- 	/* SSS6200 */
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SSS6200,
- 		PCI_ANY_ID, PCI_ANY_ID },
+@@ -12098,7 +12038,0 @@
+-#ifdef CONFIG_RHEL_DIFFERENCES
+-	if (pci_hw_disabled(rh_disabled_pci_table, pdev))
+-		return -ENODEV;
+-
+-	pci_hw_deprecated(rh_deprecated_pci_table, pdev);
+-	pci_hw_unmaintained(rh_unmaintained_pci_table, pdev);
 -#endif
- 	/* Fury ~ 3004 and 3008 */
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004,
- 		PCI_ANY_ID, PCI_ANY_ID },