From 91d006c003781dcd83e82fe7c992174a93d6c4c5 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Wed, 2 Mar 2022 15:16:17 +0100 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/62539 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel --- src/soc/amd/stoneyridge/acpi.c | 4 +--- src/soc/amd/stoneyridge/acpi/cpu.asl | 39 ------------------------------------ 2 files changed, 1 insertion(+), 42 deletions(-) (limited to 'src/soc/amd/stoneyridge') diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index 4c3b6254fd67..0a670885f3d9 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -151,7 +151,5 @@ void generate_cpu_entries(const struct device *device) 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 24b81a13aba0..818bcdb4d297 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 - }) - } -} -- cgit v1.2.3