From b53045be918111905e21838e8783964e4c722921 Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Feb 10 2022 22:56:54 +0000 Subject: Update for 4.18.0-365.el8 --- diff --git a/SOURCES/0001-add-deprecated-ids.patch b/SOURCES/0001-add-deprecated-ids.patch index cbcba5f..730cda3 100644 --- a/SOURCES/0001-add-deprecated-ids.patch +++ b/SOURCES/0001-add-deprecated-ids.patch @@ -1,9 +1,8 @@ --- a/src/megaraid_sas_base.c +++ b/src/megaraid_sas_base.c -@@ -138,12 +138,24 @@ - */ +@@ -141,3 +141,10 @@ static struct pci_device_id megasas_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)}, @@ -13,22 +12,14 @@ + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)}, + /* gen2*/ {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)}, +@@ -148,2 +155,6 @@ /* skinny*/ + {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 */ {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)}, -@@ -178,20 +190,6 @@ - - MODULE_DEVICE_TABLE(pci, megasas_pci_table); - +@@ -183,13 +194,0 @@ -/* - * PCI ID table for all unsupported controllers - */ @@ -42,16 +33,5 @@ - /* skinny*/ - {} -}; -- - static int megasas_mgmt_majorno; - struct megasas_mgmt_info megasas_mgmt_info; - static struct fasync_struct *megasas_async_queue; -@@ -7345,8 +7343,6 @@ - struct megasas_instance *instance; - u16 control = 0; - -- check_unsupported_pci_hardware(unsupported_ids_table, pdev); -- - switch (pdev->device) { - case PCI_DEVICE_ID_LSI_AERO_10E0: - case PCI_DEVICE_ID_LSI_AERO_10E3: +@@ -7403 +7401,0 @@ +- pci_hw_deprecated(unsupported_ids_table, pdev);