0858e1ebf5
Changes - Fix power button on AMD Surface Laptop 4. For details see https://github.com/linux-surface/kernel/pull/108 - Rebase onto v5.14.10
74 lines
2.6 KiB
Diff
74 lines
2.6 KiB
Diff
From 26e3b115246a289e611663a3985f0a81148bab78 Mon Sep 17 00:00:00 2001
|
|
From: Sachi King <nakato@nakato.io>
|
|
Date: Sat, 29 May 2021 22:27:25 +1000
|
|
Subject: [PATCH] platform/x86: amd-pmc: Add device HID for AMD PMC
|
|
|
|
The Surface Laptop 4 appears to have used AMD0005 for the PMC instead of
|
|
the AMDI0005 which would match the ACPI ID Registry.
|
|
|
|
AMD appears to have previously used "AMD" in a number of IDs in the past,
|
|
and AMD is not allocated to any other entity as an ID, so adding this ID
|
|
should not cause any harm.
|
|
|
|
Signed-off-by: Sachi King <nakato@nakato.io>
|
|
Patchset: amd-s0ix
|
|
---
|
|
drivers/platform/x86/amd-pmc.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
|
|
index d6a7c896ac86..fc95620101e8 100644
|
|
--- a/drivers/platform/x86/amd-pmc.c
|
|
+++ b/drivers/platform/x86/amd-pmc.c
|
|
@@ -476,6 +476,7 @@ static const struct acpi_device_id amd_pmc_acpi_ids[] = {
|
|
{"AMDI0006", 0},
|
|
{"AMDI0007", 0},
|
|
{"AMD0004", 0},
|
|
+ {"AMD0005", 0},
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(acpi, amd_pmc_acpi_ids);
|
|
--
|
|
2.33.0
|
|
|
|
From 3fb90b0d3770441ff16b6d8b3926778ef68476b0 Mon Sep 17 00:00:00 2001
|
|
From: Sachi King <nakato@nakato.io>
|
|
Date: Sat, 2 Oct 2021 13:39:36 +1000
|
|
Subject: [PATCH] ACPI: PM: Include alternate AMDI0005 id in special behaviour
|
|
|
|
The Surface Laptop 4 AMD has used the AMD0005 to identify this
|
|
controller instead of using the appropriate ACPI ID AMDI0005. The
|
|
AMD0005 needs the same special casing as AMDI0005.
|
|
|
|
Cc: <stable@vger.kernel.org> # 5.14+
|
|
Signed-off-by: Sachi King <nakato@nakato.io>
|
|
Patchset: amd-s0ix
|
|
---
|
|
drivers/acpi/x86/s2idle.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
|
|
index bd92b549fd5a..1c48358b43ba 100644
|
|
--- a/drivers/acpi/x86/s2idle.c
|
|
+++ b/drivers/acpi/x86/s2idle.c
|
|
@@ -371,7 +371,7 @@ static int lps0_device_attach(struct acpi_device *adev,
|
|
return 0;
|
|
|
|
if (acpi_s2idle_vendor_amd()) {
|
|
- /* AMD0004, AMDI0005:
|
|
+ /* AMD0004, AMD0005, AMDI0005:
|
|
* - Should use rev_id 0x0
|
|
* - function mask > 0x3: Should use AMD method, but has off by one bug
|
|
* - function mask = 0x3: Should use Microsoft method
|
|
@@ -390,6 +390,7 @@ static int lps0_device_attach(struct acpi_device *adev,
|
|
ACPI_LPS0_DSM_UUID_MICROSOFT, 0,
|
|
&lps0_dsm_guid_microsoft);
|
|
if (lps0_dsm_func_mask > 0x3 && (!strcmp(hid, "AMD0004") ||
|
|
+ !strcmp(hid, "AMD0005") ||
|
|
!strcmp(hid, "AMDI0005"))) {
|
|
lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1;
|
|
acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n",
|
|
--
|
|
2.33.0
|
|
|