mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-28 07:26:28 +00:00
Linux: Update kernel 5.15.92 (#2343)
* Linux: Update kernel 5.15.92 * Drop patch which has been applied upstream
This commit is contained in:
parent
078c38c20c
commit
0867e3c70c
@ -5,18 +5,18 @@ Default Kernel tree: 5.15
|
||||
|
||||
| Board | Version |
|
||||
|-------|---------|
|
||||
| Open Virtual Appliance | 5.15.91 |
|
||||
| Open Virtual Appliance | 5.15.92 |
|
||||
| Raspberry Pi | 5.15.84 |
|
||||
| Raspberry Pi 0-W | 5.15.84 |
|
||||
| Raspberry Pi 2 | 5.15.84 |
|
||||
| Raspberry Pi 3 | 5.15.84 |
|
||||
| Raspberry Pi 4 | 5.15.84 |
|
||||
| Home Assistant Yellow | 5.15.84 |
|
||||
| Tinker Board | 5.15.91 |
|
||||
| Odroid-C2 | 5.15.91 |
|
||||
| Odroid-C4 | 5.15.91 |
|
||||
| Odroid-N2 | 5.15.91 |
|
||||
| Odroid-XU4 | 5.15.91 |
|
||||
| Generic aarch64 | 5.15.91 |
|
||||
| Generic x86-64 | 5.15.91 |
|
||||
| Khadas VIM3 | 5.15.91 |
|
||||
| Tinker Board | 5.15.92 |
|
||||
| Odroid-C2 | 5.15.92 |
|
||||
| Odroid-C4 | 5.15.92 |
|
||||
| Odroid-N2 | 5.15.92 |
|
||||
| Odroid-XU4 | 5.15.92 |
|
||||
| Generic aarch64 | 5.15.92 |
|
||||
| Generic x86-64 | 5.15.92 |
|
||||
| Khadas VIM3 | 5.15.92 |
|
||||
|
@ -1,78 +0,0 @@
|
||||
From 7efc00c0e169869fdc93866fa2c5500cb6ab1c7d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <7efc00c0e169869fdc93866fa2c5500cb6ab1c7d.1667383432.git.stefan@agner.ch>
|
||||
From: Dave Hansen <dave.hansen@intel.com>
|
||||
Date: Thu, 22 Sep 2022 11:47:45 -0700
|
||||
Subject: [PATCH] ACPI: processor idle: Practically limit "Dummy wait"
|
||||
workaround to old Intel systems
|
||||
|
||||
Old, circa 2002 chipsets have a bug: they don't go idle when they are
|
||||
supposed to. So, a workaround was added to slow the CPU down and
|
||||
ensure that the CPU waits a bit for the chipset to actually go idle.
|
||||
This workaround is ancient and has been in place in some form since
|
||||
the original kernel ACPI implementation.
|
||||
|
||||
But, this workaround is very painful on modern systems. The "inl()"
|
||||
can take thousands of cycles (see Link: for some more detailed
|
||||
numbers and some fun kernel archaeology).
|
||||
|
||||
First and foremost, modern systems should not be using this code.
|
||||
Typical Intel systems have not used it in over a decade because it is
|
||||
horribly inferior to MWAIT-based idle.
|
||||
|
||||
Despite this, people do seem to be tripping over this workaround on
|
||||
AMD system today.
|
||||
|
||||
Limit the "dummy wait" workaround to Intel systems. Keep Modern AMD
|
||||
systems from tripping over the workaround. Remotely modern Intel
|
||||
systems use intel_idle instead of this code and will, in practice,
|
||||
remain unaffected by the dummy wait.
|
||||
|
||||
Reported-by: K Prateek Nayak <kprateek.nayak@amd.com>
|
||||
Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
||||
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
|
||||
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
|
||||
Tested-by: K Prateek Nayak <kprateek.nayak@amd.com>
|
||||
Link: https://lore.kernel.org/all/20220921063638.2489-1-kprateek.nayak@amd.com/
|
||||
Link: https://lkml.kernel.org/r/20220922184745.3252932-1-dave.hansen@intel.com
|
||||
---
|
||||
drivers/acpi/processor_idle.c | 23 ++++++++++++++++++++---
|
||||
1 file changed, 20 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
|
||||
index dc880dad2ade..e9116db1e352 100644
|
||||
--- a/drivers/acpi/processor_idle.c
|
||||
+++ b/drivers/acpi/processor_idle.c
|
||||
@@ -531,10 +531,27 @@ static void wait_for_freeze(void)
|
||||
/* No delay is needed if we are in guest */
|
||||
if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
|
||||
return;
|
||||
+ /*
|
||||
+ * Modern (>=Nehalem) Intel systems use ACPI via intel_idle,
|
||||
+ * not this code. Assume that any Intel systems using this
|
||||
+ * are ancient and may need the dummy wait. This also assumes
|
||||
+ * that the motivating chipset issue was Intel-only.
|
||||
+ */
|
||||
+ if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
|
||||
+ return;
|
||||
#endif
|
||||
- /* Dummy wait op - must do something useless after P_LVL2 read
|
||||
- because chipsets cannot guarantee that STPCLK# signal
|
||||
- gets asserted in time to freeze execution properly. */
|
||||
+ /*
|
||||
+ * Dummy wait op - must do something useless after P_LVL2 read
|
||||
+ * because chipsets cannot guarantee that STPCLK# signal gets
|
||||
+ * asserted in time to freeze execution properly
|
||||
+ *
|
||||
+ * This workaround has been in place since the original ACPI
|
||||
+ * implementation was merged, circa 2002.
|
||||
+ *
|
||||
+ * If a profile is pointing to this instruction, please first
|
||||
+ * consider moving your system to a more modern idle
|
||||
+ * mechanism.
|
||||
+ */
|
||||
inl(acpi_gbl_FADT.xpm_timer_block.address);
|
||||
}
|
||||
|
||||
--
|
||||
2.38.1
|
||||
|
@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64 $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.92"
|
||||
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/kernel.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.92"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3 $(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.92"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/kernel-vim.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
|
@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.92"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
|
@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.92"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
|
@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.92"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config"
|
||||
|
@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.92"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="exynos"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.92"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config"
|
||||
BR2_LINUX_KERNEL_LZ4=y
|
||||
|
@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.92"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
|
||||
|
Loading…
x
Reference in New Issue
Block a user