Change in coreboot[master]: soc/amd/stoneyridge/acpi: generate PPKG object in generate_cpu_entries

[Felix Held (Code Review)]

Attention is currently required from: Marshall Dawson.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/62539 )

Change subject: soc/amd/stoneyridge/acpi: generate PPKG object in generate_cpu_entries
......................................................................

soc/amd/stoneyridge/acpi: generate PPKG object in generate_cpu_entries

Generate the PPKG object in the generate_cpu_entries function instead of
generating the PCNT object that is the used in the PPKG method in
cpu.asl to provide the PPKG object. This both simplifies the code and
aligns Stoneyridge with the other AMD SoCs. This will also make the code
behave correctly in a case where the number of CPU cores/threads isn't a
power of two.

TEST=None, but equivalent change on Picasso was verified to not break
anything on Mandolin.

Signed-off-by: Felix Held 
Change-Id: Ib42d718102151a72a5fe812e83eb2eb4f9e7b611
---
M src/soc/amd/stoneyridge/acpi.c
M src/soc/amd/stoneyridge/acpi/cpu.asl
2 files changed, 1 insertion(+), 42 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/62539/1

diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index 4c3b625..0a67088 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -151,7 +151,5 @@
    	acpigen_pop_len();
    }

-	acpigen_write_scope("\");
-	acpigen_write_name_integer("PCNT", cores);
-	acpigen_pop_len();
+	acpigen_write_processor_package("PPKG", 0, cores);
 }
diff --git a/src/soc/amd/stoneyridge/acpi/cpu.asl b/src/soc/amd/stoneyridge/acpi/cpu.asl
index 24b81a1..818bcdb 100644
--- a/src/soc/amd/stoneyridge/acpi/cpu.asl
+++ b/src/soc/amd/stoneyridge/acpi/cpu.asl
@@ -4,42 +4,3 @@
 Method (PNOT)
 {
 }
-
-/*
- * Processor Object
- */
-/* These devices are created at runtime */
-External (\PCNT, IntObj)
-External (_SB.P000, DeviceObj)
-External (_SB.P001, DeviceObj)
-External (_SB.P002, DeviceObj)
-External (_SB.P003, DeviceObj)
-External (_SB.P004, DeviceObj)
-External (_SB.P005, DeviceObj)
-External (_SB.P006, DeviceObj)
-External (_SB.P007, DeviceObj)
-
-/* Return a package containing enabled processor entries */
-Method (PPKG)
-{
-	If (\PCNT >= 4) {
-		Return (Package ()
-		{
-			_SB.P000,
-			_SB.P001,
-			_SB.P002,
-			_SB.P003
-		})
-	} ElseIf (\PCNT>= 2) {
-		Return (Package ()
-		{
-			_SB.P000,
-			_SB.P001
-		})
-	} Else {
-		Return (Package ()
-		{
-			_SB.P000
-		})
-	}
-}