Change in coreboot[master]: soc/amd: move acpi_wake_source.asl to common directory

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42545 )

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

soc/amd: move acpi_wake_source.asl to common directory

Files are both identical and common for both SoCs.

Change-Id: I54b78108d342a0fd03bf70ffe6a09695c5678eb4
Signed-off-by: Felix Held 
---
M src/mainboard/google/kahlee/dsdt.asl
M src/mainboard/google/zork/dsdt.asl
R src/soc/amd/common/acpi/acpi_wake_source.asl
D src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl
4 files changed, 2 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/42545/1

diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
index 4d920c9..19d620e 100644
--- a/src/mainboard/google/kahlee/dsdt.asl
+++ b/src/mainboard/google/kahlee/dsdt.asl
@@ -34,7 +34,7 @@
    #include <variant/acpi/sleep.asl>

/* Contains _SWS methods */
-	#include <acpi_wake_source.asl>
+	#include <soc/amd/common/acpi/acpi_wake_source.asl>

/* System Bus */
    Scope(_SB) { /* Start _SB scope */
diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl
index 0831ddd..f561de3 100644
--- a/src/mainboard/google/zork/dsdt.asl
+++ b/src/mainboard/google/zork/dsdt.asl
@@ -35,7 +35,7 @@
    #include <variant/acpi/sleep.asl>

/* Contains _SWS methods */
-	#include <acpi_wake_source.asl>
+	#include <soc/amd/common/acpi/acpi_wake_source.asl>

/* System Bus */
    Scope(_SB) { /* Start _SB scope */
diff --git a/src/soc/amd/picasso/acpi/acpi_wake_source.asl b/src/soc/amd/common/acpi/acpi_wake_source.asl
similarity index 100%
rename from src/soc/amd/picasso/acpi/acpi_wake_source.asl
rename to src/soc/amd/common/acpi/acpi_wake_source.asl
diff --git a/src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl b/src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl
deleted file mode 100644
index e847884..0000000
--- a/src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-Scope (_SB)
-{
-	Method (_SWS)
-	{
-		/* Index into PM1 for device that caused wake */
-		Return (\PM1I)
-	}
-}
-
-Scope (_GPE)
-{
-	Method (_SWS)
-	{
-		/* Index into GPE for device that caused wake */
-		Return (\GPEI)
-	}
-}

[Felix Held (Code Review)]

Hello build bot (Jenkins), Jason Glenesk, Raul Rangel, Furquan Shaikh, Angel Pons, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42545

to look at the new patch set (#2).

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

soc/amd: move acpi_wake_source.asl to common directory

Files are both identical and common for both SoCs.

Change-Id: I54b78108d342a0fd03bf70ffe6a09695c5678eb4
Signed-off-by: Felix Held 
---
M src/mainboard/google/kahlee/dsdt.asl
M src/mainboard/google/zork/dsdt.asl
R src/soc/amd/common/acpi/acpi_wake_source.asl
D src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl
4 files changed, 2 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/42545/2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42545 )

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

Patch Set 2: Code-Review+1

[Raul Rangel (Code Review)]

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42545 )

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/42545/3/src/soc/amd/stoneyridge/acp... 
File src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl:

https://review.coreboot.org/c/coreboot/+/42545/3/src/soc/amd/stoneyridge/acp... 
PS3, Line 17: GPEI
Is this defined in common as well?

[Felix Held (Code Review)]

Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42545 )

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/42545/3/src/soc/amd/stoneyridge/acp... 
File src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl:

https://review.coreboot.org/c/coreboot/+/42545/3/src/soc/amd/stoneyridge/acp... 
PS3, Line 17: GPEI
> Is this defined in common as well?

That's defined in each SoC's globalnvs.asl which is different for stoneyridge and picasso

[Felix Held (Code Review)]

Hello build bot (Jenkins), Jason Glenesk, Raul Rangel, Furquan Shaikh, Paul Menzel, Angel Pons, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42545

to look at the new patch set (#4).

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

soc/amd: move acpi_wake_source.asl to common directory

Files are both identical and common for both SoCs.

Change-Id: I54b78108d342a0fd03bf70ffe6a09695c5678eb4
Signed-off-by: Felix Held 
---
M src/mainboard/google/kahlee/dsdt.asl
M src/mainboard/google/zork/dsdt.asl
R src/soc/amd/common/acpi/acpi_wake_source.asl
D src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl
4 files changed, 4 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/42545/4

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42545 )

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

Patch Set 4: Code-Review+2

[Felix Held (Code Review)]

Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42545 )

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/c/coreboot/+/42545/3/src/soc/amd/stoneyridge/acp... 
File src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl:

https://review.coreboot.org/c/coreboot/+/42545/3/src/soc/amd/stoneyridge/acp... 
PS3, Line 17: GPEI
> That's defined in each SoC's globalnvs. […]

added a comment that the soc specific code needs to provide those

[Raul Rangel (Code Review)]

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42545 )

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

Patch Set 4: Code-Review+2

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42545 )

Change subject: soc/amd: move acpi_wake_source.asl to common directory
......................................................................

soc/amd: move acpi_wake_source.asl to common directory

Files are both identical and common for both SoCs.

Change-Id: I54b78108d342a0fd03bf70ffe6a09695c5678eb4
Signed-off-by: Felix Held 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42545
Reviewed-by: Aaron Durbin 
Reviewed-by: Raul Rangel 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/kahlee/dsdt.asl
M src/mainboard/google/zork/dsdt.asl
R src/soc/amd/common/acpi/acpi_wake_source.asl
D src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl
4 files changed, 4 insertions(+), 21 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved
  Raul Rangel: Looks good to me, approved

diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
index 4d920c9..19d620e 100644
--- a/src/mainboard/google/kahlee/dsdt.asl
+++ b/src/mainboard/google/kahlee/dsdt.asl
@@ -34,7 +34,7 @@
    #include <variant/acpi/sleep.asl>

/* Contains _SWS methods */
-	#include <acpi_wake_source.asl>
+	#include <soc/amd/common/acpi/acpi_wake_source.asl>

/* System Bus */
    Scope(_SB) { /* Start _SB scope */
diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl
index 0831ddd..f561de3 100644
--- a/src/mainboard/google/zork/dsdt.asl
+++ b/src/mainboard/google/zork/dsdt.asl
@@ -35,7 +35,7 @@
    #include <variant/acpi/sleep.asl>

/* Contains _SWS methods */
-	#include <acpi_wake_source.asl>
+	#include <soc/amd/common/acpi/acpi_wake_source.asl>

/* System Bus */
    Scope(_SB) { /* Start _SB scope */
diff --git a/src/soc/amd/picasso/acpi/acpi_wake_source.asl b/src/soc/amd/common/acpi/acpi_wake_source.asl
similarity index 78%
rename from src/soc/amd/picasso/acpi/acpi_wake_source.asl
rename to src/soc/amd/common/acpi/acpi_wake_source.asl
index e847884..de9cb25 100644
--- a/src/soc/amd/picasso/acpi/acpi_wake_source.asl
+++ b/src/soc/amd/common/acpi/acpi_wake_source.asl
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

+/* The SoC-specific code needs to provide the PM1I and GPEI fields */
+
 Scope (_SB)
 {
    Method (_SWS)
diff --git a/src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl b/src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl
deleted file mode 100644
index e847884..0000000
--- a/src/soc/amd/stoneyridge/acpi/acpi_wake_source.asl
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-Scope (_SB)
-{
-	Method (_SWS)
-	{
-		/* Index into PM1 for device that caused wake */
-		Return (\PM1I)
-	}
-}
-
-Scope (_GPE)
-{
-	Method (_SWS)
-	{
-		/* Index into GPE for device that caused wake */
-		Return (\GPEI)
-	}
-}