From 202b980e0c3b0ffd20132538ac3060a89f8cc176 Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Mon, 20 Nov 2023 18:31:29 -0300 Subject: [PATCH] kernel-6.5.12-200 * Mon Nov 20 2023 Augusto Caringi [6.5.12-0] - Add bug for AMD ACPI alarm (Justin M. Forbes) - rtc: cmos: Use ACPI alarm for non-Intel x86 systems too (Mario Limonciello) - Linux v6.5.12 Resolves: Signed-off-by: Augusto Caringi --- Patchlist.changelog | 3 +++ kernel.spec | 13 +++++++++---- patch-6.5-redhat.patch | 40 ++++++++++++++++++++++++++++++++++++++-- sources | 6 +++--- 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index cc876adc3..eb625d3bd 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/acc130077a200c2467cd265c2ef75e82f653a1ad + acc130077a200c2467cd265c2ef75e82f653a1ad rtc: cmos: Use ACPI alarm for non-Intel x86 systems too + "https://gitlab.com/cki-project/kernel-ark/-/commit"/9ed1817997b0d2f283275cce33cd7043b220d990 9ed1817997b0d2f283275cce33cd7043b220d990 power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint diff --git a/kernel.spec b/kernel.spec index f0b68e446..a49702799 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.5.11 -%define specversion 6.5.11 +%define specrpmversion 6.5.12 +%define specversion 6.5.12 %define patchversion 6.5 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.5.11 +%define tarfile_release 6.5.12 # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.5.11 +%define kabiversion 6.5.12 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3702,6 +3702,11 @@ fi\ # # %changelog +* Mon Nov 20 2023 Augusto Caringi [6.5.12-0] +- Add bug for AMD ACPI alarm (Justin M. Forbes) +- rtc: cmos: Use ACPI alarm for non-Intel x86 systems too (Mario Limonciello) +- Linux v6.5.12 + * Wed Nov 08 2023 Augusto Caringi [6.5.11-0] - Linux v6.5.11 diff --git a/patch-6.5-redhat.patch b/patch-6.5-redhat.patch index ddf4c90fd..cb273af5e 100644 --- a/patch-6.5-redhat.patch +++ b/patch-6.5-redhat.patch @@ -24,6 +24,7 @@ drivers/nvme/host/multipath.c | 19 ++-- drivers/nvme/host/nvme.h | 4 + drivers/pci/quirks.c | 24 ++++ + drivers/rtc/rtc-cmos.c | 18 ++- drivers/scsi/sd.c | 10 ++ drivers/usb/core/hub.c | 7 ++ fs/btrfs/space-info.c | 17 +++ @@ -37,10 +38,10 @@ security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 39 files changed, 549 insertions(+), 184 deletions(-) + 40 files changed, 561 insertions(+), 190 deletions(-) diff --git a/Makefile b/Makefile -index 555cc34f4730..f87dc4f3eb24 100644 +index a6e152146028..af6bab938da2 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1172,6 +1173,41 @@ index eb65170b97ff..e8b906b6ffbf 100644 /* * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. +diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c +index c9416fe8542d..aafb1efe7915 100644 +--- a/drivers/rtc/rtc-cmos.c ++++ b/drivers/rtc/rtc-cmos.c +@@ -818,18 +818,24 @@ static void rtc_wake_off(struct device *dev) + } + + #ifdef CONFIG_X86 +-/* Enable use_acpi_alarm mode for Intel platforms no earlier than 2015 */ + static void use_acpi_alarm_quirks(void) + { +- if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) ++ switch (boot_cpu_data.x86_vendor) { ++ case X86_VENDOR_INTEL: ++ if (dmi_get_bios_year() < 2015) ++ return; ++ break; ++ case X86_VENDOR_AMD: ++ case X86_VENDOR_HYGON: ++ if (dmi_get_bios_year() < 2021) ++ return; ++ break; ++ default: + return; +- ++ } + if (!is_hpet_enabled()) + return; + +- if (dmi_get_bios_year() < 2015) +- return; +- + use_acpi_alarm = true; + } + #else diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index c4babb16dac7..9c9342e0c055 100644 --- a/drivers/scsi/sd.c diff --git a/sources b/sources index 6f76ef487..3dbb664bc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5.11.tar.xz) = 0941115121d805fd615b1009d73fe12d51c1a3c944a78e7de0a73b0240872f7e605b602562e3c8b5898f0f20d66de8f47bbfdf8ab13cbf519d3a5d3d8ca99f5f -SHA512 (kernel-abi-stablelists-6.5.11.tar.bz2) = 3547963a9368516844f25120a12c92800cda4561c9c3958948921c6fb3856cee8ceaa347148c546fed2710dd19403b08d90f73d478e08c12de0a2d2d1583cb5f -SHA512 (kernel-kabi-dw-6.5.11.tar.bz2) = c84c5b65e3270d5c773d2d76aa981d22c8d3a7668ec0e9a5990e95f36fd16b2cb5515e8771034fcf519dc2ea0c9b4c979048b0a0c02063a7080cf5ae2ad380f4 +SHA512 (linux-6.5.12.tar.xz) = 9953738058a9a333417070e99c3ab7e0ce0c72726c9e80e863dc2606de01bed03319fd47dc1195285ce69c157cbee84b77a6f7c74c735519ca92bff3ac4d3a19 +SHA512 (kernel-abi-stablelists-6.5.12.tar.bz2) = ea72bdfb5065f430c0b7076ba49f8fbc1b16f861dc4182f1ee5bc8a809f8f3103d97766e5719354f8163a77235a759a65cc7d4efc66e314dcc658ceda6a77016 +SHA512 (kernel-kabi-dw-6.5.12.tar.bz2) = 7fc7372de576d1f3602abe70483edf30cf635a6d4175261bb44e1b7d4b413bc045b1e2affc0dbe6bf710a7c10b4a5c26c7fd47d8b8e7fe4bee2a25e2fd80b13a