mirror of
https://git.proxmox.com/git/pve-kernel
synced 2025-11-04 13:08:06 +00:00
4d1db3083c
found with git log --decorate v5.16^..v6.1.4 -- Makefile kernel/ secuirty drivers/ fs \ block mm net virt/ ipc init arch/x86/ | ~/gitdm/stablefixes \ --fixed-after v6.1.2 --regressed-before v6.1.2 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
|
Date: Thu, 15 Dec 2022 13:16:15 -0600
|
|
Subject: [PATCH] ACPI: x86: s2idle: Force AMD GUID/_REV 2 on HP Elitebook 865
|
|
|
|
commit 3ea45390e9c0d35805ef8357ace55594fd4233d0 upstream.
|
|
|
|
HP Elitebook 865 supports both the AMD GUID w/ _REV 2 and Microsoft
|
|
GUID with _REV 0. Both have very similar code but the AMD GUID
|
|
has a special workaround that is specific to a problem with
|
|
spurious wakeups on systems with Qualcomm WLAN.
|
|
|
|
This is believed to be a bug in the Qualcomm WLAN F/W (it doesn't
|
|
affect any other WLAN H/W). If this WLAN firmware is fixed this
|
|
quirk can be dropped.
|
|
|
|
Cc: stable@vger.kernel.org # 6.1
|
|
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
|
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
(cherry picked from commit 577821f756cf3dfd308906d38610db178268841a)
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
drivers/acpi/x86/s2idle.c | 20 ++++++++++++++++++++
|
|
1 file changed, 20 insertions(+)
|
|
|
|
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
|
|
index 5350c73564b6..422415cb14f4 100644
|
|
--- a/drivers/acpi/x86/s2idle.c
|
|
+++ b/drivers/acpi/x86/s2idle.c
|
|
@@ -401,6 +401,13 @@ static const struct acpi_device_id amd_hid_ids[] = {
|
|
{}
|
|
};
|
|
|
|
+static int lps0_prefer_amd(const struct dmi_system_id *id)
|
|
+{
|
|
+ pr_debug("Using AMD GUID w/ _REV 2.\n");
|
|
+ rev_id = 2;
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int lps0_prefer_microsoft(const struct dmi_system_id *id)
|
|
{
|
|
pr_debug("Preferring Microsoft GUID.\n");
|
|
@@ -462,6 +469,19 @@ static const struct dmi_system_id s2idle_dmi_table[] __initconst = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "ROG Flow X16 GV601"),
|
|
},
|
|
},
|
|
+ {
|
|
+ /*
|
|
+ * AMD Rembrandt based HP EliteBook 835/845/865 G9
|
|
+ * Contains specialized AML in AMD/_REV 2 path to avoid
|
|
+ * triggering a bug in Qualcomm WLAN firmware. This may be
|
|
+ * removed in the future if that firmware is fixed.
|
|
+ */
|
|
+ .callback = lps0_prefer_amd,
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
|
|
+ DMI_MATCH(DMI_BOARD_NAME, "8990"),
|
|
+ },
|
|
+ },
|
|
{}
|
|
};
|
|
|