kernel-5.14.6-0
* Sat Sep 18 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.6-0] - Fix changelog generation (Justin M. Forbes) - Clean up changelog (Justin M. Forbes) - ACPI: PM: s2idle: Run both AMD and Microsoft methods if both are supported (Mario Limonciello) - Don't tag a release as [redhat] (Justin M. Forbes) - Fixes for changelog that I think will help with the next stable bump (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes
parent
9c5634bada
commit
416de88845
|
|
@ -1,11 +1,5 @@
|
|||
https://gitlab.com/cki-project/kernel-ark/-/commit/d92805b6228532148fe7e597b615fdae199e9de7
|
||||
d92805b6228532148fe7e597b615fdae199e9de7 Linux 5.14.5
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/4ff654aba77c54100726bd67112cb7f0d09a2f1b
|
||||
4ff654aba77c54100726bd67112cb7f0d09a2f1b Revert "time: Handle negative seconds correctly in timespec64_to_ns()"
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/6bac75c9019bef9b259f184e59726ad825fd9a3c
|
||||
6bac75c9019bef9b259f184e59726ad825fd9a3c Revert "posix-cpu-timers: Force next expiration recalc after itimer reset"
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/f0c98d3a1045b6149d85b93b350a738d2a495d16
|
||||
f0c98d3a1045b6149d85b93b350a738d2a495d16 ACPI: PM: s2idle: Run both AMD and Microsoft methods if both are supported
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/e11905f1a6ea9f03a9f1a3b061a1a581536a2850
|
||||
e11905f1a6ea9f03a9f1a3b061a1a581536a2850 Revert "team: mark team driver as deprecated"
|
||||
|
|
|
|||
772
kernel.spec
772
kernel.spec
File diff suppressed because it is too large
Load Diff
|
|
@ -10,6 +10,7 @@
|
|||
drivers/acpi/apei/hest.c | 8 +
|
||||
drivers/acpi/irq.c | 17 +-
|
||||
drivers/acpi/scan.c | 9 +
|
||||
drivers/acpi/x86/s2idle.c | 67 +--
|
||||
drivers/ata/libahci.c | 18 +
|
||||
drivers/char/ipmi/ipmi_dmi.c | 15 +
|
||||
drivers/char/ipmi/ipmi_msghandler.c | 16 +-
|
||||
|
|
@ -51,7 +52,7 @@
|
|||
tools/testing/selftests/bpf/progs/linked_maps2.c | 76 ---
|
||||
tools/testing/selftests/bpf/progs/linked_vars1.c | 54 --
|
||||
tools/testing/selftests/bpf/progs/linked_vars2.c | 55 ---
|
||||
53 files changed, 655 insertions(+), 1495 deletions(-)
|
||||
54 files changed, 694 insertions(+), 1523 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
||||
index 2fb7012c3246..47718b4f2f75 100644
|
||||
|
|
@ -400,6 +401,100 @@ index b24513ec3fae..8308569f66e0 100644
|
|||
INIT_LIST_HEAD(&resource_list);
|
||||
acpi_dev_get_resources(device, &resource_list,
|
||||
acpi_check_serial_bus_slave,
|
||||
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
|
||||
index 3a308461246a..bd92b549fd5a 100644
|
||||
--- a/drivers/acpi/x86/s2idle.c
|
||||
+++ b/drivers/acpi/x86/s2idle.c
|
||||
@@ -449,25 +449,30 @@ int acpi_s2idle_prepare_late(void)
|
||||
if (pm_debug_messages_on)
|
||||
lpi_check_constraints();
|
||||
|
||||
- if (lps0_dsm_func_mask_microsoft > 0) {
|
||||
+ /* Screen off */
|
||||
+ if (lps0_dsm_func_mask > 0)
|
||||
+ acpi_sleep_run_lps0_dsm(acpi_s2idle_vendor_amd() ?
|
||||
+ ACPI_LPS0_SCREEN_OFF_AMD :
|
||||
+ ACPI_LPS0_SCREEN_OFF,
|
||||
+ lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
+
|
||||
+ if (lps0_dsm_func_mask_microsoft > 0)
|
||||
acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF,
|
||||
lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
|
||||
- acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY,
|
||||
- lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
|
||||
+
|
||||
+ /* LPS0 entry */
|
||||
+ if (lps0_dsm_func_mask > 0)
|
||||
+ acpi_sleep_run_lps0_dsm(acpi_s2idle_vendor_amd() ?
|
||||
+ ACPI_LPS0_ENTRY_AMD :
|
||||
+ ACPI_LPS0_ENTRY,
|
||||
+ lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
+ if (lps0_dsm_func_mask_microsoft > 0) {
|
||||
acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY,
|
||||
lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
|
||||
- } else if (acpi_s2idle_vendor_amd()) {
|
||||
- acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF_AMD,
|
||||
- lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
- acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY_AMD,
|
||||
- lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
- } else {
|
||||
- acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF,
|
||||
- lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
- acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY,
|
||||
- lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
+ /* modern standby entry */
|
||||
+ acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY,
|
||||
+ lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
|
||||
}
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -476,24 +481,30 @@ void acpi_s2idle_restore_early(void)
|
||||
if (!lps0_device_handle || sleep_no_lps0)
|
||||
return;
|
||||
|
||||
- if (lps0_dsm_func_mask_microsoft > 0) {
|
||||
- acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT,
|
||||
- lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
|
||||
+ /* Modern standby exit */
|
||||
+ if (lps0_dsm_func_mask_microsoft > 0)
|
||||
acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT,
|
||||
lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
|
||||
- acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON,
|
||||
- lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
|
||||
- } else if (acpi_s2idle_vendor_amd()) {
|
||||
- acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT_AMD,
|
||||
- lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
- acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON_AMD,
|
||||
- lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
- } else {
|
||||
+
|
||||
+ /* LPS0 exit */
|
||||
+ if (lps0_dsm_func_mask > 0)
|
||||
+ acpi_sleep_run_lps0_dsm(acpi_s2idle_vendor_amd() ?
|
||||
+ ACPI_LPS0_EXIT_AMD :
|
||||
+ ACPI_LPS0_EXIT,
|
||||
+ lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
+ if (lps0_dsm_func_mask_microsoft > 0)
|
||||
acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT,
|
||||
- lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
+ lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
|
||||
+
|
||||
+ /* Screen on */
|
||||
+ if (lps0_dsm_func_mask_microsoft > 0)
|
||||
acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON,
|
||||
- lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
- }
|
||||
+ lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
|
||||
+ if (lps0_dsm_func_mask > 0)
|
||||
+ acpi_sleep_run_lps0_dsm(acpi_s2idle_vendor_amd() ?
|
||||
+ ACPI_LPS0_SCREEN_ON_AMD :
|
||||
+ ACPI_LPS0_SCREEN_ON,
|
||||
+ lps0_dsm_func_mask, lps0_dsm_guid);
|
||||
}
|
||||
|
||||
static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = {
|
||||
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
|
||||
index fec2e9754aed..bea4e2973259 100644
|
||||
--- a/drivers/ata/libahci.c
|
||||
|
|
@ -1282,10 +1377,10 @@ index 75dbe77b0b4b..4bd6dd722f44 100644
|
|||
if (ret < 0)
|
||||
goto err_allowedips;
|
||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||
index 7b1c81b899cd..5904ece27f64 100644
|
||||
index 1905ee0297a4..58fded74fb31 100644
|
||||
--- a/drivers/pci/quirks.c
|
||||
+++ b/drivers/pci/quirks.c
|
||||
@@ -4231,6 +4231,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
|
||||
@@ -4232,6 +4232,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
|
||||
quirk_bridge_cavm_thrx2_pcie_root);
|
||||
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (linux-5.14.5.tar.xz) = 8751c5fbf3d5923f72324225e578b5059e556ef332f8648fb68df7b3ad4c08968ca9923f768dfefff7795a4da4745c678632df96867bbf32c055b9ec01b262e5
|
||||
SHA512 (kernel-abi-stablelists-5.14.5-300.tar.bz2) = cdf4cd466d9ffa9b4e5788fcd38fca65a88d879174d38d4b15ab913733826892d7212ea8fa557faf8c78d9e947714323877372c8ad03538d4b062708c0e1385a
|
||||
SHA512 (kernel-kabi-dw-5.14.5-300.tar.bz2) = c91c48f42f6279b3bf658e1456cf99663ed0a34b45af0fc37bffe61e548ae49e7104f113501f5304a802885c293ee47d645ef261b4a442e99007d97d32462c04
|
||||
SHA512 (linux-5.14.6.tar.xz) = 41ad9d3f50f9b640e6f722349c3b13a0237cad5c834a6e8c65ff00ca593c38a3bd350377645c0551831c7f0b1bd6b278242cfdee550b95eed809f36dd9579c7e
|
||||
SHA512 (kernel-abi-stablelists-5.14.6-300.tar.bz2) = 7db68215e34513d4b8cfe016477df6601b19f94588217e79803b1fe8edc7edacc232d879569c621331ce0023c39bb666366ecda3bcd9cdee73e25e64e5a77fc3
|
||||
SHA512 (kernel-kabi-dw-5.14.6-300.tar.bz2) = d1918fac227159427e6076a649c47fd711902e4cb06529d3144a0fb715ece78ea91bd7316cd987e383fa40f0187698199ec9c30c12ed82d73d5759a1a8ed3102
|
||||
|
|
|
|||
Loading…
Reference in New Issue