| Message ID | 20220704035017.54513-1-Shyam-sundar.S-k@amd.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | ACPI: PM: s2idle: Add support for upcoming AMD uPEP HID AMDI008 | expand |
[Public] > -----Original Message----- > From: S-k, Shyam-sundar <Shyam-sundar.S-k@amd.com> > Sent: Sunday, July 3, 2022 22:50 > To: rafael@kernel.org; lenb@kernel.org; Limonciello, Mario > <Mario.Limonciello@amd.com>; hdegoede@redhat.com; > nakato@nakato.io; mika.westerberg@linux.intel.com > Cc: linux-acpi@vger.kernel.org; S-k, Shyam-sundar <Shyam-sundar.S- > k@amd.com> > Subject: [PATCH] ACPI: PM: s2idle: Add support for upcoming AMD uPEP HID > AMDI008 > > New version of uPEP will have a separate ACPI id, add that > to the support list. > > Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> > --- > drivers/acpi/x86/s2idle.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c > index 2963229062f8..392f75157f34 100644 > --- a/drivers/acpi/x86/s2idle.c > +++ b/drivers/acpi/x86/s2idle.c > @@ -397,7 +397,9 @@ static int lps0_device_attach(struct acpi_device > *adev, > lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) > | 0x1; > acpi_handle_debug(adev->handle, "_DSM UUID %s: > Adjusted function mask: 0x%x\n", > ACPI_LPS0_DSM_UUID_AMD, > lps0_dsm_func_mask); > - } else if (lps0_dsm_func_mask_microsoft > 0 && !strcmp(hid, > "AMDI0007")) { > + } else if (lps0_dsm_func_mask_microsoft > 0 && > + (!strcmp(hid, "AMDI0007") || > + !strcmp(hid, "AMDI0008"))) { > lps0_dsm_func_mask_microsoft = -EINVAL; > acpi_handle_debug(adev->handle, "_DSM Using > AMD method\n"); > } > -- > 2.25.1
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index 2963229062f8..392f75157f34 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -397,7 +397,9 @@ static int lps0_device_attach(struct acpi_device *adev, lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1; acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n", ACPI_LPS0_DSM_UUID_AMD, lps0_dsm_func_mask); - } else if (lps0_dsm_func_mask_microsoft > 0 && !strcmp(hid, "AMDI0007")) { + } else if (lps0_dsm_func_mask_microsoft > 0 && + (!strcmp(hid, "AMDI0007") || + !strcmp(hid, "AMDI0008"))) { lps0_dsm_func_mask_microsoft = -EINVAL; acpi_handle_debug(adev->handle, "_DSM Using AMD method\n"); }
New version of uPEP will have a separate ACPI id, add that to the support list. Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> --- drivers/acpi/x86/s2idle.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)