beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixup! Update v5.14 patches

Browse source
This commit is contained in:
Maximilian Luz 2021-10-23 19:27:07 +02:00
parent 9b9abdbbe9
commit 233acb6835
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
3 changed files with 1 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
patches/5.14/0012-amd-s0ix.patch
View file

@ -1,73 +0,0 @@
From 21f21aec40a63ba2e92b5e1eaf258347fde903ac 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.1
From 8f7653b0ee9f52b27243d96d677b0d34ac5253a9 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.1

1
pkg/arch/kernel/0012-amd-s0ix.patch
View file

@ -1 +0,0 @@
../../../patches/5.14/0012-amd-s0ix.patch

4
pkg/arch/kernel/PKGBUILD
View file

@ -38,7 +38,6 @@ source=(
0009-surface-typecover.patch
0010-cameras.patch
0011-amd-gpio.patch
0012-amd-s0ix.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@ -59,8 +58,7 @@ sha256sums=('SKIP'
'c7c785f53eb79d6c4304c1f6d2a441ac4bb03df7e8ef3ff05b44641cd992ced1'
'669b7bcdc30b1655ad10dac5262fe1b6cfbeb5fb37fdee568e73a5aee7945c64'
'bd6470505a1c1a74e3c7026831af622dac00c0127139b821eff3888fd4878e2f'
'9f3d7928a7d35b12b9eced9b10cae61583f926de8cae7f207be3f691e3877450'
'e5cc3f97895a52996a59beabf0e8f1da30322bd7de3d24fa2275c05fa53f5d17')
'9f3d7928a7d35b12b9eced9b10cae61583f926de8cae7f207be3f691e3877450')
export KBUILD_BUILD_HOST=archlinux