From 033bb4bc8d620288ed82fe982a32f567060499b6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 10 Feb 2015 22:21:39 -0600 Subject: acpi: Generate valid ACPI processor objects The existing code generated invalid ACPI processor objects if the core number was greater than 9. The first invalid object instance was autocorrected by Linux, but subsequent instances conflicted with each other, leading to a failure to boot if more than 10 CPU cores were installed. The modified code will function with up to 99 cores. Change-Id: I62dc0eb61ae2e2b7f7dcf30e9c7de09cd901a81c Signed-off-by: Timothy Pearson Reviewed-on: http://review.coreboot.org/8422 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc Reviewed-by: Marc Jones --- src/mainboard/roda/rk886ex/acpi/thermal.asl | 4 ++-- src/mainboard/roda/rk9/acpi/platform.asl | 16 ++++++++-------- src/mainboard/roda/rk9/acpi/thermal.asl | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/mainboard/roda') diff --git a/src/mainboard/roda/rk886ex/acpi/thermal.asl b/src/mainboard/roda/rk886ex/acpi/thermal.asl index e445d3cf92..873b089d32 100644 --- a/src/mainboard/roda/rk886ex/acpi/thermal.asl +++ b/src/mainboard/roda/rk886ex/acpi/thermal.asl @@ -67,9 +67,9 @@ Scope (\_TZ) Method (_PSL, 0, Serialized) { If (MPEN) { - Return (Package() {\_PR.CPU0, \_PR.CPU1}) + Return (Package() {\_PR.CP00, \_PR.CP01}) } - Return (Package() {\_PR.CPU0}) + Return (Package() {\_PR.CP00}) } // TC1 value for passive cooling diff --git a/src/mainboard/roda/rk9/acpi/platform.asl b/src/mainboard/roda/rk9/acpi/platform.asl index 3d4a2148a8..decceaf8aa 100644 --- a/src/mainboard/roda/rk9/acpi/platform.asl +++ b/src/mainboard/roda/rk9/acpi/platform.asl @@ -100,33 +100,33 @@ Method(_WAK,1) // Power notification -External (\_PR_.CPU0, DeviceObj) -External (\_PR_.CPU1, DeviceObj) +External (\_PR_.CP00, DeviceObj) +External (\_PR_.CP01, DeviceObj) Method (PNOT) { If (MPEN) { If(And(PDC0, 0x08)) { - Notify (\_PR_.CPU0, 0x80) // _PPC + Notify (\_PR_.CP00, 0x80) // _PPC If (And(PDC0, 0x10)) { Sleep(100) - Notify(\_PR_.CPU0, 0x81) // _CST + Notify(\_PR_.CP00, 0x81) // _CST } } If(And(PDC1, 0x08)) { - Notify (\_PR_.CPU1, 0x80) // _PPC + Notify (\_PR_.CP01, 0x80) // _PPC If (And(PDC1, 0x10)) { Sleep(100) - Notify(\_PR_.CPU1, 0x81) // _CST + Notify(\_PR_.CP01, 0x81) // _CST } } } Else { // UP - Notify (\_PR_.CPU0, 0x80) + Notify (\_PR_.CP00, 0x80) Sleep(0x64) - Notify(\_PR_.CPU0, 0x81) + Notify(\_PR_.CP00, 0x81) } // Notify the Batteries diff --git a/src/mainboard/roda/rk9/acpi/thermal.asl b/src/mainboard/roda/rk9/acpi/thermal.asl index 6e28f1710f..f4868b42bf 100644 --- a/src/mainboard/roda/rk9/acpi/thermal.asl +++ b/src/mainboard/roda/rk9/acpi/thermal.asl @@ -86,9 +86,9 @@ Scope (\_TZ) Method (_PSL, 0, Serialized) { If (MPEN) { - Return (Package() {\_PR.CPU0, \_PR.CPU1}) + Return (Package() {\_PR.CP00, \_PR.CP01}) } - Return (Package() {\_PR.CPU0}) + Return (Package() {\_PR.CP00}) } // TC1 value for passive cooling -- cgit v1.2.3