kernel-5.14.8-0
* Mon Sep 27 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.8-0] - thermal/drivers/int340x: Do not set a wrong tcc offset on resume (Antoine Tenart) Resolves: rhbz# 1992706 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
0852697759
commit
1bfd1478a1
|
@ -1,3 +1,6 @@
|
|||
https://gitlab.com/cki-project/kernel-ark/-/commit/b404ad1e47af572e35ac407260103356c961c627
|
||||
b404ad1e47af572e35ac407260103356c961c627 thermal/drivers/int340x: Do not set a wrong tcc offset on resume
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/f0c98d3a1045b6149d85b93b350a738d2a495d16
|
||||
f0c98d3a1045b6149d85b93b350a738d2a495d16 ACPI: PM: s2idle: Run both AMD and Microsoft methods if both are supported
|
||||
|
||||
|
|
11
kernel.spec
11
kernel.spec
|
@ -123,7 +123,7 @@ Summary: The Linux kernel
|
|||
# The kernel tarball/base version
|
||||
%define kversion 5.14
|
||||
|
||||
%define rpmversion 5.14.7
|
||||
%define rpmversion 5.14.8
|
||||
%define patchversion 5.14
|
||||
%define pkgrelease 300
|
||||
|
||||
|
@ -672,7 +672,7 @@ BuildRequires: lld
|
|||
# exact git commit you can run
|
||||
#
|
||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||
Source0: linux-5.14.7.tar.xz
|
||||
Source0: linux-5.14.8.tar.xz
|
||||
|
||||
Source1: Makefile.rhelver
|
||||
|
||||
|
@ -1358,8 +1358,8 @@ ApplyOptionalPatch()
|
|||
fi
|
||||
}
|
||||
|
||||
%setup -q -n kernel-5.14.7 -c
|
||||
mv linux-5.14.7 linux-%{KVERREL}
|
||||
%setup -q -n kernel-5.14.8 -c
|
||||
mv linux-5.14.8 linux-%{KVERREL}
|
||||
|
||||
cd linux-%{KVERREL}
|
||||
cp -a %{SOURCE1} .
|
||||
|
@ -2958,6 +2958,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Sep 27 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.8-0]
|
||||
- thermal/drivers/int340x: Do not set a wrong tcc offset on resume (Antoine Tenart)
|
||||
|
||||
* Wed Sep 22 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.7-0]
|
||||
- Add Fedora 34 and 33 to release_targets (Justin M. Forbes)
|
||||
- Strip [redhat] entries from changelog (Justin M. Forbes)
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
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 +-
|
||||
|
@ -24,6 +23,7 @@
|
|||
drivers/iommu/iommu.c | 22 +
|
||||
drivers/net/wireguard/main.c | 6 +
|
||||
drivers/pci/quirks.c | 24 +
|
||||
.../int340x_thermal/processor_thermal_device.c | 5 +-
|
||||
drivers/usb/core/hub.c | 7 +
|
||||
fs/xfs/xfs_super.c | 8 -
|
||||
include/linux/efi.h | 22 +-
|
||||
|
@ -52,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 ---
|
||||
54 files changed, 694 insertions(+), 1523 deletions(-)
|
||||
54 files changed, 658 insertions(+), 1497 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
||||
index 2fb7012c3246..47718b4f2f75 100644
|
||||
|
@ -154,7 +154,7 @@ index 911cd3912351..caae31c04561 100644
|
|||
+ return !!ipl_secure_flag;
|
||||
+}
|
||||
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
|
||||
index ee23908f1b96..0273125cdfba 100644
|
||||
index 6f0d2d4dea74..2f4d60b24155 100644
|
||||
--- a/arch/s390/kernel/setup.c
|
||||
+++ b/arch/s390/kernel/setup.c
|
||||
@@ -49,6 +49,7 @@
|
||||
|
@ -163,9 +163,9 @@ index ee23908f1b96..0273125cdfba 100644
|
|||
#include <linux/start_kernel.h>
|
||||
+#include <linux/security.h>
|
||||
#include <linux/hugetlb.h>
|
||||
#include <linux/kmemleak.h>
|
||||
|
||||
#include <asm/boot_data.h>
|
||||
@@ -1030,6 +1031,9 @@ void __init setup_arch(char **cmdline_p)
|
||||
@@ -1034,6 +1035,9 @@ void __init setup_arch(char **cmdline_p)
|
||||
|
||||
log_component_list();
|
||||
|
||||
|
@ -401,100 +401,6 @@ 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
|
||||
|
@ -1411,6 +1317,29 @@ index 8c3c1ef92171..18431236ab9f 100644
|
|||
/*
|
||||
* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
|
||||
* class code. Fix it.
|
||||
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
|
||||
index 0f0038af2ad4..fb64acfd5e07 100644
|
||||
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
|
||||
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
|
||||
@@ -107,7 +107,7 @@ static int tcc_offset_update(unsigned int tcc)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static unsigned int tcc_offset_save;
|
||||
+static int tcc_offset_save = -1;
|
||||
|
||||
static ssize_t tcc_offset_degree_celsius_store(struct device *dev,
|
||||
struct device_attribute *attr, const char *buf,
|
||||
@@ -352,7 +352,8 @@ int proc_thermal_resume(struct device *dev)
|
||||
proc_dev = dev_get_drvdata(dev);
|
||||
proc_thermal_read_ppcc(proc_dev);
|
||||
|
||||
- tcc_offset_update(tcc_offset_save);
|
||||
+ if (tcc_offset_save >= 0)
|
||||
+ tcc_offset_update(tcc_offset_save);
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
||||
index 86658a81d284..5647f4756e97 100644
|
||||
--- a/drivers/usb/core/hub.c
|
||||
|
|
6
sources
6
sources
|
@ -1,3 +1,3 @@
|
|||
SHA512 (linux-5.14.7.tar.xz) = eedba59b2665d97ab132ab9bd3dc3328992d2e8692a8fe109a68d0eae63230db05f9be309bd079ed8a8fb33ff0ac9ca4029ec0bc612f5edc72430a883c4ef25f
|
||||
SHA512 (kernel-abi-stablelists-5.14.7-300.tar.bz2) = 8d1c1aace05f23b716785f4e6b1b76d0b3596baa75ba732a44358e512f6f568a12117a8cf76063277885e56fc2ad403900aba7eb8d55b16544ca0fbbaf77ba3f
|
||||
SHA512 (kernel-kabi-dw-5.14.7-300.tar.bz2) = 837aa0c7a3c843f6e8f675a109a6498e888a91721535d7b91afa6ed489feadc88afa02404b2992acba9754ca185d80485bfb9901d30473a0b8de13e5f488199e
|
||||
SHA512 (linux-5.14.8.tar.xz) = 1fcf7131bd69a8299c72e13e0a0714a6d62c6ef2ace3c47e3b977d5196e2ecdab6d88b955f5480e3863e86cce045913bb1958a2f1fabf2eab2920632e8216711
|
||||
SHA512 (kernel-abi-stablelists-5.14.8-300.tar.bz2) = 75c9e309f588093e5a26fb36c015e1bd43b3c3e7c34f24e437eae4d02ca7e33d191ccb71e87136f9b6ea50035bd79b20efedd19202c1acf2ed05aeff9ad4e661
|
||||
SHA512 (kernel-kabi-dw-5.14.8-300.tar.bz2) = 97403e9a00d49ef36deef21ca7460afd9d3029820efe08202619fdede5102b393a704b6f1078a67c9fc35571e0c0f660277f672d76a7bbb5ffdeb0af4202b9e5
|
||||
|
|
Loading…
Reference in New Issue