From dc7c065ed173316cca2d82d0f3306751fa7c377d Mon Sep 17 00:00:00 2001 From: Kmods SIG Date: Jan 13 2022 23:40:34 +0000 Subject: Switch to EL kernel source and versioning --- diff --git a/.gitignore b/.gitignore index eb3809f..9c452e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/arcmsr-4.19.tar.xz +SOURCES/arcmsr-4.18.0-305.el8.tar.xz diff --git a/.kmod-arcmsr.metadata b/.kmod-arcmsr.metadata index 7d692f8..99e73e7 100644 --- a/.kmod-arcmsr.metadata +++ b/.kmod-arcmsr.metadata @@ -1 +1 @@ -6da1402f0002a821d79b31ecdf085539478eec4d SOURCES/arcmsr-4.19.tar.xz +c83e1afc9324d6951d14e7f7438ab9cdefb573b2 SOURCES/arcmsr-4.18.0-305.el8.tar.xz diff --git a/SOURCES/0001-scsi-arcmsr-Fix-error-of-resuming-from-hibernation-f.patch b/SOURCES/0001-scsi-arcmsr-Fix-error-of-resuming-from-hibernation-f.patch new file mode 100644 index 0000000..1a8996a --- /dev/null +++ b/SOURCES/0001-scsi-arcmsr-Fix-error-of-resuming-from-hibernation-f.patch @@ -0,0 +1,35 @@ +From 97fe222524f8fdbcc528b44d160d1df71d96af86 Mon Sep 17 00:00:00 2001 +From: Ching Huang +Date: Mon, 9 Jul 2018 18:24:53 +0800 +Subject: [Backport 97fe222524f8] scsi: arcmsr: Fix error of resuming from + hibernation for adapter type E + +Fix error of resuming from hibernation for adapter type E. + +Signed-off-by: Ching Huang +Signed-off-by: Martin K. Petersen +--- + src/arcmsr_hba.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/arcmsr_hba.c b/src/arcmsr_hba.c +index 732b5d9242f16551b525b43023b4dcae8a94cc65..12316ef4c89318536f88e6b84f7f92d7d887d8f2 100644 +--- a/src/arcmsr_hba.c ++++ b/src/arcmsr_hba.c +@@ -1061,6 +1061,13 @@ static int arcmsr_resume(struct pci_dev *pdev) + pci_set_master(pdev); + if (arcmsr_request_irq(pdev, acb) == FAILED) + goto controller_stop; ++ if (acb->adapter_type == ACB_ADAPTER_TYPE_E) { ++ writel(0, &acb->pmuE->host_int_status); ++ writel(ARCMSR_HBEMU_DOORBELL_SYNC, &acb->pmuE->iobound_doorbell); ++ acb->in_doorbell = 0; ++ acb->out_doorbell = 0; ++ acb->doneq_index = 0; ++ } + arcmsr_iop_init(acb); + arcmsr_init_get_devmap_timer(acb); + if (set_date_time) +-- +2.31.1 + diff --git a/SOURCES/9999-enable-arcmsr.patch b/SOURCES/9999-enable-arcmsr.patch new file mode 100644 index 0000000..8a6b8ac --- /dev/null +++ b/SOURCES/9999-enable-arcmsr.patch @@ -0,0 +1,5 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -6 +6 @@ +-obj-$(CONFIG_SCSI_ARCMSR) := arcmsr.o ++obj-m := arcmsr.o diff --git a/SPECS/kmod-arcmsr.spec b/SPECS/kmod-arcmsr.spec index 2577958..1c8799d 100644 --- a/SPECS/kmod-arcmsr.spec +++ b/SPECS/kmod-arcmsr.spec @@ -1,5 +1,7 @@ %global pkg arcmsr +%global driver_version 4.18.0-305.el8 + %global kernel_version 4.18.0-348.el8 %global _use_internal_dependency_generator 0 @@ -18,14 +20,16 @@ Name: kmod-%{pkg} -Version: 4.19 -Release: 6%{?dist} +Version: 4.18.0.305 +Release: 1%{?dist} Summary: ARECA ARC11xx/12xx/13xx/16xx SATA/SAS RAID Controller (%{pkg}) driver License: GPLv2 URL: https://www.kernel.org/ -Source0: %{pkg}-%{version}.tar.xz +Source0: %{pkg}-%{driver_version}.tar.xz +Patch1: 0001-scsi-arcmsr-Fix-error-of-resuming-from-hibernation-f.patch +Patch9999: 9999-enable-arcmsr.patch ExclusiveArch: x86_64 aarch64 @@ -61,7 +65,7 @@ This driver supports ARECA's SATA/SAS RAID controller cards. %prep -%autosetup -p1 -n %{pkg}-%{version} +%autosetup -p1 -n %{pkg}-%{driver_version} %build @@ -126,8 +130,6 @@ fi %changelog -* Tue Nov 09 2021 Peter Georg - 4.19-6 -- Rebuild for 4.18.0-348.el8 - -* Tue Sep 28 2021 Peter Georg - 4.19-5 -- Convert to kABI tracking kmod package (kernel >= 4.18.0-305.7.1.el8_4) +* Wed Jan 12 2022 Kmods SIG - 4.18.0.305-1 +- Switch to EL kernel source and versioning +- kABI tracking kmod package (kernel >= 4.18.0-348.el8)