Skip to contentSkip to conversation

platform/x86: Add missing LPS0 functions for AMD

PATCH In review Alex Deucher 4 participants 5 messages May 4, 2021 – May 5, 2021 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: Add missing LPS0 functions for AMD

These are supposedly not required for AMD platforms, but at least some HP laptops seem to require it to properly turn off the keyboard backlight.

Based on a patch from Marcin Bachry <[email protected]>.

---

Dropping patch 2/2 for now. This patch fixes several systems and doesn't appear to cause any issues.

 drivers/acpi/x86/s2idle.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/acpi/x86/s2idle.c +4 -0
index 2b69536cdccb..2d7ddb8a8cb6 100644
@@ -42,6 +42,8 @@ static const struct acpi_device_id lps0_device_ids[] = {
 
 /* AMD */
 #define ACPI_LPS0_DSM_UUID_AMD      "e3f32452-febc-43ce-9039-932122d37721"
+#define ACPI_LPS0_ENTRY_AMD         2
+#define ACPI_LPS0_EXIT_AMD          3
 #define ACPI_LPS0_SCREEN_OFF_AMD    4
 #define ACPI_LPS0_SCREEN_ON_AMD     5
 
@@ -408,6 +410,7 @@ int acpi_s2idle_prepare_late(void)
 
 	if (acpi_s2idle_vendor_amd()) {
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF_AMD);
+		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY_AMD);
 	} else {
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF);
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY);
@@ -422,6 +425,7 @@ void acpi_s2idle_restore_early(void)
 		return;
 
 	if (acpi_s2idle_vendor_amd()) {
+		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT_AMD);
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON_AMD);
 	} else {
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT);
Signature · 1 line
2.30.2
#1 lore raw

[AMD Public Use]

Quoted 1 line

Subject: [PATCH] platform/x86: Add missing LPS0 functions for AMD

Rafael might be willing to fix it up on commit, but if you end up needing to re-spin I think technically this subsystem prefix to match other stuff committed to this file should be:

"ACPI: PM: s2idle:"

Quoted 52 lines

These are supposedly not required for AMD platforms, but at least some HP laptops seem to require it to properly turn off the keyboard backlight.

Based on a patch from Marcin Bachry <[email protected]>.

---

Dropping patch 2/2 for now. This patch fixes several systems and doesn't appear to cause any issues.

 drivers/acpi/x86/s2idle.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/acpi/x86/s2idle.c +0 -0
index 2b69536cdccb..2d7ddb8a8cb6 100644
@@ -42,6 +42,8 @@ static const struct acpi_device_id lps0_device_ids[] = {
 
 /* AMD */
 #define ACPI_LPS0_DSM_UUID_AMD      "e3f32452-febc-43ce-9039-

932122d37721"

drivers/acpi/x86/s2idle.c +4 -1
+#define ACPI_LPS0_ENTRY_AMD         2
+#define ACPI_LPS0_EXIT_AMD          3
 #define ACPI_LPS0_SCREEN_OFF_AMD    4
 #define ACPI_LPS0_SCREEN_ON_AMD     5
@@ -408,6 +410,7 @@ int acpi_s2idle_prepare_late(void)
 
 	if (acpi_s2idle_vendor_amd()) {
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF_AMD);
+		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY_AMD);
 	} else {
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF);
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY);
@@ -422,6 +425,7 @@ void acpi_s2idle_restore_early(void)
 		return;
 
 	if (acpi_s2idle_vendor_amd()) {
+		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT_AMD);
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON_AMD);
 	} else {
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT);
--

2.30.2

#2 lore raw

Hi,

Quoted 9 lines · Mario

[AMD Public Use]

Quoted 1 line

Subject: [PATCH] platform/x86: Add missing LPS0 functions for AMD

Rafael might be willing to fix it up on commit, but if you end up needing to re-spin I think technically this subsystem prefix to match other stuff committed to this file should be:

"ACPI: PM: s2idle:"

Ack, please get the subject next right time. I was about the put this in a folder with patches to apply to the pdx86 kernel tree once 5.13-rc1 is out, but this should not go upstream through the pdx86 tree at all.

Regards,

Hans

Quoted 54 lines
Quoted 53 lines

These are supposedly not required for AMD platforms, but at least some HP laptops seem to require it to properly turn off the keyboard backlight.

Based on a patch from Marcin Bachry <[email protected]>.

---

Dropping patch 2/2 for now. This patch fixes several systems and doesn't appear to cause any issues.

 drivers/acpi/x86/s2idle.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/acpi/x86/s2idle.c +0 -0
index 2b69536cdccb..2d7ddb8a8cb6 100644
@@ -42,6 +42,8 @@ static const struct acpi_device_id lps0_device_ids[] = {
 
 /* AMD */
 #define ACPI_LPS0_DSM_UUID_AMD      "e3f32452-febc-43ce-9039-

932122d37721"

drivers/acpi/x86/s2idle.c +4 -1
+#define ACPI_LPS0_ENTRY_AMD         2
+#define ACPI_LPS0_EXIT_AMD          3
 #define ACPI_LPS0_SCREEN_OFF_AMD    4
 #define ACPI_LPS0_SCREEN_ON_AMD     5
@@ -408,6 +410,7 @@ int acpi_s2idle_prepare_late(void)
 
 	if (acpi_s2idle_vendor_amd()) {
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF_AMD);
+		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY_AMD);
 	} else {
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF);
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY);
@@ -422,6 +425,7 @@ void acpi_s2idle_restore_early(void)
 		return;
 
 	if (acpi_s2idle_vendor_amd()) {
+		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT_AMD);
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON_AMD);
 	} else {
 		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT);
--

2.30.2

#3 lore raw
Quoted 12 lines · Hans de Goede

Hi,

Quoted 8 lines · Mario

[AMD Public Use]

Quoted 1 line

Subject: [PATCH] platform/x86: Add missing LPS0 functions for AMD

Rafael might be willing to fix it up on commit, but if you end up needing to re-spin I think technically this subsystem prefix to match other stuff committed to this file should be:

Quoted 5 lines
Quoted 1 line

"ACPI: PM: s2idle:"

Ack, please get the subject next right time. I was about the put this in a folder with patches to apply to the pdx86 kernel tree once 5.13-rc1 is out, but this should not go upstream through the pdx86 tree at all.

Do you want me to resend with the corrected subject? What tree does this need to go through?

Alex

Quoted 66 lines

Regards,

Hans

Quoted 46 lines
Quoted 46 lines

These are supposedly not required for AMD platforms, but at least some HP laptops seem to require it to properly turn off the keyboard backlight.

Based on a patch from Marcin Bachry <[email protected]>.

---

Dropping patch 2/2 for now. This patch fixes several systems and doesn't appear to cause any issues.

 drivers/acpi/x86/s2idle.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/acpi/x86/s2idle.c +0 -0
index 2b69536cdccb..2d7ddb8a8cb6 100644
@@ -42,6 +42,8 @@ static const struct acpi_device_id lps0_device_ids[] = {
 
 /* AMD */
 #define ACPI_LPS0_DSM_UUID_AMD      "e3f32452-febc-43ce-9039-

932122d37721"

drivers/acpi/x86/s2idle.c +3 -0
+#define ACPI_LPS0_ENTRY_AMD         2
+#define ACPI_LPS0_EXIT_AMD          3
 #define ACPI_LPS0_SCREEN_OFF_AMD    4
 #define ACPI_LPS0_SCREEN_ON_AMD     5
@@ -408,6 +410,7 @@ int acpi_s2idle_prepare_late(void)
 
     if (acpi_s2idle_vendor_amd()) {
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF_AMD);
+            acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY_AMD);
     } else {
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF);
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY);
@@ -422,6 +425,7 @@ void acpi_s2idle_restore_early(void)
             return;
 
Quoted 8 lines
Quoted 7 lines
drivers/acpi/x86/s2idle.c +1 -1
     if (acpi_s2idle_vendor_amd()) {
+            acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT_AMD);
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON_AMD);
     } else {
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT);
--

2.30.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#4 lore raw

Hi,

Quoted 13 lines · Alex Deucher
Quoted 12 lines · Hans de Goede

Hi,

Quoted 8 lines · Mario

[AMD Public Use]

Quoted 1 line

Subject: [PATCH] platform/x86: Add missing LPS0 functions for AMD

Rafael might be willing to fix it up on commit, but if you end up needing to re-spin I think technically this subsystem prefix to match other stuff committed to this file should be:

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

"ACPI: PM: s2idle:"

Ack, please get the subject next right time. I was about the put this in a folder with patches to apply to the pdx86 kernel tree once 5.13-rc1 is out, but this should not go upstream through the pdx86 tree at all.

Do you want me to resend with the corrected subject? What tree does this need to go through?

That might be helpful, I think that like how to subject made me think "Oh I need to pick this one up" it will probably to the opposite for Rafael.

It should go through Rafael's ACPI/PM tree:

[hans@x1 linux]$ scripts/get_maintainer.pl -f drivers/acpi/x86/s2idle.c "Rafael J. Wysocki" <[email protected]> (supporter:ACPI)
Len Brown <[email protected]> (supporter:ACPI) [email protected] (open list:ACPI) [email protected] (open list)

Regards,

Hans

Quoted 58 lines
Quoted 57 lines
Quoted 44 lines
Quoted 44 lines

These are supposedly not required for AMD platforms, but at least some HP laptops seem to require it to properly turn off the keyboard backlight.

Based on a patch from Marcin Bachry <[email protected]>.

---

Dropping patch 2/2 for now. This patch fixes several systems and doesn't appear to cause any issues.

 drivers/acpi/x86/s2idle.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/acpi/x86/s2idle.c +0 -0
index 2b69536cdccb..2d7ddb8a8cb6 100644
@@ -42,6 +42,8 @@ static const struct acpi_device_id lps0_device_ids[] = {
 
 /* AMD */
 #define ACPI_LPS0_DSM_UUID_AMD      "e3f32452-febc-43ce-9039-

932122d37721"

drivers/acpi/x86/s2idle.c +3 -0
+#define ACPI_LPS0_ENTRY_AMD         2
+#define ACPI_LPS0_EXIT_AMD          3
 #define ACPI_LPS0_SCREEN_OFF_AMD    4
 #define ACPI_LPS0_SCREEN_ON_AMD     5
@@ -408,6 +410,7 @@ int acpi_s2idle_prepare_late(void)
 
     if (acpi_s2idle_vendor_amd()) {
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF_AMD);
+            acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY_AMD);
     } else {
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF);
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY);
@@ -422,6 +425,7 @@ void acpi_s2idle_restore_early(void)
             return;
 
Quoted 8 lines
Quoted 7 lines
drivers/acpi/x86/s2idle.c +1 -1
     if (acpi_s2idle_vendor_amd()) {
+            acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT_AMD);
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON_AMD);
     } else {
             acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT);
--

2.30.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx