From: Sachi King <nakato@nakato.io>
To: Shyam-sundar.S-k@amd.com, hdegoede@redhat.com,
mgross@linux.intel.com, mario.limonciello@amd.com,
rafael@kernel.org, lenb@kernel.org
Cc: platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
Sachi King <nakato@nakato.io>,
stable@vger.kernel.org
Subject: [PATCH 2/2] ACPI: PM: Include alternate AMDI0005 id in special behaviour
Date: Sat, 2 Oct 2021 14:18:40 +1000 [thread overview]
Message-ID: <20211002041840.2058647-2-nakato@nakato.io> (raw)
In-Reply-To: <20211002041840.2058647-1-nakato@nakato.io>
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>
---
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
next prev parent reply other threads:[~2021-10-02 4:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-02 4:18 [PATCH 1/2] platform/x86: amd-pmc: Add alternative acpi id for PMC controller Sachi King
2021-10-02 4:18 ` Sachi King [this message]
2021-10-08 18:57 ` [PATCH 2/2] ACPI: PM: Include alternate AMDI0005 id in special behaviour Limonciello, Mario
2021-10-11 13:47 ` Hans de Goede
2021-10-12 14:01 ` Rafael J. Wysocki
2021-10-05 5:16 ` [PATCH 1/2] platform/x86: amd-pmc: Add alternative acpi id for PMC controller Shyam Sundar S K
2021-10-05 7:09 ` Sachi King
2021-10-07 20:00 ` Limonciello, Mario
2021-10-08 10:27 ` Shyam Sundar S K
2021-10-08 12:19 ` Sachi King
2021-10-08 15:57 ` Limonciello, Mario
2021-10-08 19:01 ` Limonciello, Mario
2021-10-09 2:05 ` Sachi King
2021-10-11 13:48 ` Hans de Goede
2021-10-11 13:46 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211002041840.2058647-2-nakato@nakato.io \
--to=nakato@nakato.io \
--cc=Shyam-sundar.S-k@amd.com \
--cc=hdegoede@redhat.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=mgross@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.