From 2b4f3d6a86b96e0d85493e6efef3c922d51c59ab Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Feb 13 2022 17:28:37 +0000 Subject: Update patch --- diff --git a/SOURCES/0001-add-deprecated-ids.patch b/SOURCES/0001-add-deprecated-ids.patch index 63aa1dc..3832e93 100644 --- a/SOURCES/0001-add-deprecated-ids.patch +++ b/SOURCES/0001-add-deprecated-ids.patch @@ -1,30 +1,51 @@ --- a/src/megaraid_sas_base.c +++ b/src/megaraid_sas_base.c -@@ -149,7 +149,6 @@ - */ - static struct pci_device_id megasas_pci_table[] = { - --#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)}, - /* xscale IOP */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)}, -@@ -158,19 +157,16 @@ - /* ppc IOP */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)}, - /* gen2*/ +@@ -147,40 +146,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[] = { +- +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)}, +- /* gen2*/ +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0073SKINNY)}, +- /* skinny*/ +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0071SKINNY)}, +- /* skinny*/ +- +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FUSION)}, +- /* Fusion */ +- +- {0} /* Terminating entry */ +-}; +- +-static const struct pci_device_id rh_disabled_pci_table[] = { +- +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)}, +- /* xscale IOP */ +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)}, +- /* ppc IOP */ +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078DE)}, +- /* ppc IOP */ +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)}, +- /* gen2*/ +- +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)}, +- /* xscale IOP, vega */ +- {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, +- /* xscale IOP */ +- +- {0} /* Terminating entry */ +-}; -#endif - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)}, - /* gen2*/ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0073SKINNY)}, - /* skinny*/ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0071SKINNY)}, - /* skinny*/ --#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)}, - /* xscale IOP, vega */ - {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, - /* xscale IOP */ +@@ -7506,7 +7465,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 - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FUSION)}, - /* Fusion */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},