diff --git a/MegaRAID_9560_8i.patch b/MegaRAID_9560_8i.patch new file mode 100644 index 0000000000000000000000000000000000000000..9973c1c5bd556ccf52aef5d77775f10922c7eb0e --- /dev/null +++ b/MegaRAID_9560_8i.patch @@ -0,0 +1,68 @@ +commit 469f72ddc618d0afe05176b18ae6ebefb1fc6fe2 +Author: Shivasharan S +Date: Fri Nov 9 09:47:20 2018 -0800 + + scsi: megaraid_sas: Add support for MegaRAID Aero controllers + + This patch adds support for MegaRAID Aero controller PCI IDs. Print a + message when a configurable secure type controller is encountered. + + Signed-off-by: Shivasharan S + Reviewed-by: Hannes Reinecke + Signed-off-by: Martin K. Petersen + +diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h +index 8edba2227cd3..55f6662ceb55 100644 +--- a/drivers/scsi/megaraid/megaraid_sas.h ++++ b/drivers/scsi/megaraid/megaraid_sas.h +@@ -60,6 +60,10 @@ + #define PCI_DEVICE_ID_LSI_TOMCAT 0x0017 + #define PCI_DEVICE_ID_LSI_VENTURA_4PORT 0x001B + #define PCI_DEVICE_ID_LSI_CRUSADER_4PORT 0x001C ++#define PCI_DEVICE_ID_LSI_AERO_10E1 0x10e1 ++#define PCI_DEVICE_ID_LSI_AERO_10E2 0x10e2 ++#define PCI_DEVICE_ID_LSI_AERO_10E5 0x10e5 ++#define PCI_DEVICE_ID_LSI_AERO_10E6 0x10e6 + + /* + * Intel HBA SSDIDs +diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c +index 27fab13c55ea..b7d3fc6fb118 100644 +--- a/drivers/scsi/megaraid/megaraid_sas_base.c ++++ b/drivers/scsi/megaraid/megaraid_sas_base.c +@@ -162,6 +162,10 @@ static struct pci_device_id megasas_pci_table[] = { + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_TOMCAT)}, + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VENTURA_4PORT)}, + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_CRUSADER_4PORT)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E1)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E2)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E5)}, ++ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_AERO_10E6)}, + {} + }; + +@@ -6235,6 +6239,10 @@ static inline void megasas_set_adapter_type(struct megasas_instance *instance) + instance->adapter_type = MFI_SERIES; + } else { + switch (instance->pdev->device) { ++ case PCI_DEVICE_ID_LSI_AERO_10E1: ++ case PCI_DEVICE_ID_LSI_AERO_10E2: ++ case PCI_DEVICE_ID_LSI_AERO_10E5: ++ case PCI_DEVICE_ID_LSI_AERO_10E6: + case PCI_DEVICE_ID_LSI_VENTURA: + case PCI_DEVICE_ID_LSI_CRUSADER: + case PCI_DEVICE_ID_LSI_HARPOON: +@@ -6598,6 +6606,13 @@ static int megasas_probe_one(struct pci_dev *pdev, + struct megasas_instance *instance; + u16 control = 0; + ++ switch (pdev->device) { ++ case PCI_DEVICE_ID_LSI_AERO_10E1: ++ case PCI_DEVICE_ID_LSI_AERO_10E5: ++ dev_info(&pdev->dev, "Adapter is in configurable secure mode\n"); ++ break; ++ } ++ + /* Reset MSI-X in the kdump kernel */ + if (reset_devices) { + pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX); diff --git a/kernel.spec b/kernel.spec index 66355b5573053da731a17f65ec6718a73350ef43..8d15de408b3dfb01419214963d1cfe0d39ec1c54 100644 --- a/kernel.spec +++ b/kernel.spec @@ -32,7 +32,7 @@ Name: kernel Version: 4.19.90 -Release: %{hulkrelease}.0173 +Release: %{hulkrelease}.0174 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -60,6 +60,8 @@ Source9002: series.conf Source9998: patches.tar.bz2 %endif +Patch0000: MegaRAID_9560_8i.patch + #BuildRequires: BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk @@ -228,6 +230,8 @@ tar -xjf %{SOURCE9998} mv kernel linux-%{KernelVer} cd linux-%{KernelVer} +%patch0000 -p1 + %if 0%{?with_patch} cp %{SOURCE9000} . cp %{SOURCE9001} . @@ -808,6 +812,8 @@ fi %endif %changelog +* Wed Oct 26 2022 Zhao Lei - 4.19.90-2210.4.0.0174 +- scsi: megaraid_sas: Add support for MegaRAID Aero controllers * Tue Oct 25 2022 Laibin Qiu - 4.19.90-2210.4.0.0173 - nfp: fix use-after-free in area_cache_get()