diff --git a/Patchlist.changelog b/Patchlist.changelog index f48b00e42..aaa8115cc 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,12 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/91d392fbbe771b2b4c45fd39b9150e27be3251ba + 91d392fbbe771b2b4c45fd39b9150e27be3251ba ACPI: video: Use acpi_device_fix_up_power_children() + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/3bd5c005766e37c5c60b1210e844091ddebd28d6 + 3bd5c005766e37c5c60b1210e844091ddebd28d6 ACPI: PM: Add acpi_device_fix_up_power_children() function + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/46f41fa0448229c32bbc60d3c8ef50d22c33b117 + 46f41fa0448229c32bbc60d3c8ef50d22c33b117 rtc: cmos: Use ACPI alarm for non-Intel x86 systems too + "https://gitlab.com/cki-project/kernel-ark/-/commit"/84c68fe1f91beef8b25ca2202d3581260447b334 84c68fe1f91beef8b25ca2202d3581260447b334 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set diff --git a/kernel.spec b/kernel.spec index 88dea13fd..ec626b663 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.6.1 -%define specversion 6.6.1 +%define specrpmversion 6.6.2 +%define specversion 6.6.2 %define patchversion 6.6 -%define pkgrelease 300 +%define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.6.1 +%define tarfile_release 6.6.2 # This is needed to do merge window version magic %define patchlevel 6 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 300%{?buildid}%{?dist} +%define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.6.1 +%define kabiversion 6.6.2 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3709,6 +3709,18 @@ fi\ # # %changelog +* Mon Nov 20 2023 Justin M. Forbes [6.6.2-200] +- frop the build number back to 200 for fedora-srpm.sh (Justin M. Forbes) +- ACPI: video: Use acpi_device_fix_up_power_children() (Hans de Goede) +- ACPI: PM: Add acpi_device_fix_up_power_children() function (Hans de Goede) + +* Mon Nov 20 2023 Justin M. Forbes [6.6.2-0] +- Add bug for AMD ACPI alarm (Justin M. Forbes) +- rtc: cmos: Use ACPI alarm for non-Intel x86 systems too (Mario Limonciello) +- Add bluetooth fixes to BugsFixed (Justin M. Forbes) +- Drop F37 from release targets as it will not rebase to 6.6 (Justin M. Forbes) +- Linux v6.6.2 + * Wed Nov 08 2023 Justin M. Forbes [6.6.1-0] - drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) - Added required files for rebase (Augusto Caringi) diff --git a/patch-6.6-redhat.patch b/patch-6.6-redhat.patch index 9009a0b00..50b6ea994 100644 --- a/patch-6.6-redhat.patch +++ b/patch-6.6-redhat.patch @@ -3,7 +3,9 @@ arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + arch/x86/kernel/setup.c | 22 ++- + drivers/acpi/acpi_video.c | 2 +- drivers/acpi/apei/hest.c | 8 + + drivers/acpi/device_pm.c | 13 ++ drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 ++ drivers/ata/libahci.c | 18 +++ @@ -18,8 +20,10 @@ drivers/input/rmi4/rmi_driver.c | 124 +++++++++------ drivers/iommu/iommu.c | 22 +++ drivers/pci/quirks.c | 24 +++ + drivers/rtc/rtc-cmos.c | 18 ++- drivers/scsi/sd.c | 10 ++ drivers/usb/core/hub.c | 7 + + include/acpi/acpi_bus.h | 1 + include/linux/efi.h | 22 ++- include/linux/lsm_hook_defs.h | 2 + include/linux/module.h | 1 + @@ -34,10 +38,10 @@ security/lockdown/Kconfig | 13 ++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 36 files changed, 669 insertions(+), 175 deletions(-) + 40 files changed, 696 insertions(+), 182 deletions(-) diff --git a/Makefile b/Makefile -index f8c14da7c7bc..3dc4598eb8a7 100644 +index 03c52108af62..66048c4637d1 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -168,6 +172,19 @@ index b098b1fa2470..a159419e60df 100644 reserve_initrd(); +diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c +index b411948594ff..4e868454b38d 100644 +--- a/drivers/acpi/acpi_video.c ++++ b/drivers/acpi/acpi_video.c +@@ -2031,7 +2031,7 @@ static int acpi_video_bus_add(struct acpi_device *device) + * HP ZBook Fury 16 G10 requires ACPI video's child devices have _PS0 + * evaluated to have functional panel brightness control. + */ +- acpi_device_fix_up_power_extended(device); ++ acpi_device_fix_up_power_children(device); + + pr_info("%s [%s] (multi-head: %s rom: %s post: %s)\n", + ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device), diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 6aef1ee5e1bd..8f146b1b4972 100644 --- a/drivers/acpi/apei/hest.c @@ -187,6 +204,30 @@ index 6aef1ee5e1bd..8f146b1b4972 100644 hest_hdr = (struct acpi_hest_header *)(hest_tab + 1); for (i = 0; i < hest_tab->error_source_count; i++) { len = hest_esrc_len(hest_hdr); +diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c +index f007116a8427..3b4d048c4941 100644 +--- a/drivers/acpi/device_pm.c ++++ b/drivers/acpi/device_pm.c +@@ -397,6 +397,19 @@ void acpi_device_fix_up_power_extended(struct acpi_device *adev) + } + EXPORT_SYMBOL_GPL(acpi_device_fix_up_power_extended); + ++/** ++ * acpi_device_fix_up_power_children - Force a device's children into D0. ++ * @adev: Parent device object whose children's power state is to be fixed up. ++ * ++ * Call acpi_device_fix_up_power() for @adev's children so long as they ++ * are reported as present and enabled. ++ */ ++void acpi_device_fix_up_power_children(struct acpi_device *adev) ++{ ++ acpi_dev_for_each_child(adev, fix_up_power_if_applicable, NULL); ++} ++EXPORT_SYMBOL_GPL(acpi_device_fix_up_power_children); ++ + int acpi_device_update_power(struct acpi_device *device, int *state_p) + { + int state; diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c index 1687483ff319..390b67f19181 100644 --- a/drivers/acpi/irq.c @@ -997,6 +1038,41 @@ index e3e915329510..929ca9fa61a7 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 228fb2d11c70..696cfa7025de 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 6effa13039f3..fbfbd542b858 100644 --- a/drivers/scsi/sd.c @@ -1043,6 +1119,18 @@ index 0ff47eeffb49..005b8c595c60 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h +index 254685085c82..0b7eab0ef7d7 100644 +--- a/include/acpi/acpi_bus.h ++++ b/include/acpi/acpi_bus.h +@@ -539,6 +539,7 @@ int acpi_device_set_power(struct acpi_device *device, int state); + int acpi_bus_init_power(struct acpi_device *device); + int acpi_device_fix_up_power(struct acpi_device *device); + void acpi_device_fix_up_power_extended(struct acpi_device *adev); ++void acpi_device_fix_up_power_children(struct acpi_device *adev); + int acpi_bus_update_power(acpi_handle handle, int *state_p); + int acpi_device_update_power(struct acpi_device *device, int *state_p); + bool acpi_bus_power_manageable(acpi_handle handle); diff --git a/include/linux/efi.h b/include/linux/efi.h index 80b21d1c6eaf..b66c0683f2fc 100644 --- a/include/linux/efi.h diff --git a/sources b/sources index 1ac65f6cb..c928e518b 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.4.3.tar.bz2) = cb87592809af7763cbb47dfb49dd7aada112d37ceb1e555f4171d32991a6dc88c2c6e76ded75a57649946dc909f2f9bc20a01d637a704f97c3a6a13b3404d78b SHA512 (kernel-kabi-dw-6.4.3.tar.bz2) = b790a94af10031835256bba229b1bd954d8677a18b7f74ab6267e36b180dea9b088f69a4f6c5a6508f4a27d287e9c99f5262ab421c34f78792501bf05ba081b5 -SHA512 (linux-6.6.1.tar.xz) = 1a5f60928cfe98a191dd143db593a39c91fda70186ddec3145cde72fec8072c84f46a12763abf4d1b0f37498dac9d0e794511bca12046e2150ee7fdbe3aaee27 -SHA512 (kernel-abi-stablelists-6.6.1.tar.xz) = adea0893522f9ecfca7510cd4712f526b4b4a4f8335f15e5c2860513210cf4d69d3077ffb8cbf7351b7307ffba70844ed903e1392c85b6b808574b7a4a4ee21a -SHA512 (kernel-kabi-dw-6.6.1.tar.xz) = 0aff06a96ae808039f7cfc7505eaa73b12cc4cbc901311c375600fee3ba12d57c3c71fb31dabbfbe6ad462b4bfb42a112707d7211d791181693fa5e4a26c8899 +SHA512 (linux-6.6.2.tar.xz) = 202683efebc3db663fbb095626e54c33efeff239894f34f5d814bee2e2b87a2ac85ac768cea33e31f6b44a01b4185b0ef384e67d812898ed6953f7089d551335 +SHA512 (kernel-abi-stablelists-6.6.2.tar.xz) = 72d06a0e843c92f83fb82726a85c50eb7008d030ffe01aebb7f92bcb86df4da01b3dc1b7a698cbf0a5115898da23ab7165d4ad6fca19ee1e6fac42382b1587ce +SHA512 (kernel-kabi-dw-6.6.2.tar.xz) = 2551e4536193748cfa027a9f24e227d3d58a41aaf0d5857bd2300c97c3580b2f572cb0a422248f41a20d5ca13d5f94ee2b8021cba6680cd29fda390e28144ad4