summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineeringinc.com>2015-02-10 22:21:39 -0600
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2015-02-16 21:02:30 +0100
commit033bb4bc8d620288ed82fe982a32f567060499b6 (patch)
treebba24a07d463455825363b54894da14a6ba07025 /src/mainboard
parent4f731f2eabc9ef2c381b71515a3b2ff203c8653e (diff)
downloadcoreboot-033bb4bc8d620288ed82fe982a32f567060499b6.tar.xz
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 <tpearson@raptorengineeringinc.com> Reviewed-on: http://review.coreboot.org/8422 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/amd/dbm690t/fadt.c2
-rw-r--r--src/mainboard/amd/pistachio/fadt.c2
-rw-r--r--src/mainboard/amd/torpedo/fadt.c2
-rw-r--r--src/mainboard/getac/p470/acpi/ec.asl2
-rw-r--r--src/mainboard/getac/p470/acpi/platform.asl10
-rw-r--r--src/mainboard/getac/p470/acpi/thermal.asl4
-rw-r--r--src/mainboard/ibase/mb899/acpi/thermal.asl4
-rw-r--r--src/mainboard/intel/d945gclf/acpi/thermal.asl4
-rw-r--r--src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl4
-rw-r--r--src/mainboard/kontron/986lcd-m/acpi/thermal.asl4
-rw-r--r--src/mainboard/kontron/kt690/fadt.c2
-rw-r--r--src/mainboard/lenovo/x200/acpi/platform.asl16
-rw-r--r--src/mainboard/roda/rk886ex/acpi/thermal.asl4
-rw-r--r--src/mainboard/roda/rk9/acpi/platform.asl16
-rw-r--r--src/mainboard/roda/rk9/acpi/thermal.asl4
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl4
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl4
-rw-r--r--src/mainboard/siemens/sitemp_g1p1/fadt.c2
-rw-r--r--src/mainboard/technexion/tim5690/fadt.c2
-rw-r--r--src/mainboard/technexion/tim8690/fadt.c2
-rw-r--r--src/mainboard/via/vt8454c/dsdt.asl2
21 files changed, 48 insertions, 48 deletions
diff --git a/src/mainboard/amd/dbm690t/fadt.c b/src/mainboard/amd/dbm690t/fadt.c
index c238cbeeb5..ec75a65214 100644
--- a/src/mainboard/amd/dbm690t/fadt.c
+++ b/src/mainboard/amd/dbm690t/fadt.c
@@ -79,7 +79,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
pm_iowrite(0x28, ACPI_GPE0_BLK & 0xFF);
pm_iowrite(0x29, ACPI_GPE0_BLK >> 8);
- /* CpuControl is in \_PR.CPU0, 6 bytes */
+ /* CpuControl is in \_PR.CP00, 6 bytes */
pm_iowrite(0x26, ACPI_CPU_CONTORL & 0xFF);
pm_iowrite(0x27, ACPI_CPU_CONTORL >> 8);
diff --git a/src/mainboard/amd/pistachio/fadt.c b/src/mainboard/amd/pistachio/fadt.c
index c238cbeeb5..ec75a65214 100644
--- a/src/mainboard/amd/pistachio/fadt.c
+++ b/src/mainboard/amd/pistachio/fadt.c
@@ -79,7 +79,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
pm_iowrite(0x28, ACPI_GPE0_BLK & 0xFF);
pm_iowrite(0x29, ACPI_GPE0_BLK >> 8);
- /* CpuControl is in \_PR.CPU0, 6 bytes */
+ /* CpuControl is in \_PR.CP00, 6 bytes */
pm_iowrite(0x26, ACPI_CPU_CONTORL & 0xFF);
pm_iowrite(0x27, ACPI_CPU_CONTORL >> 8);
diff --git a/src/mainboard/amd/torpedo/fadt.c b/src/mainboard/amd/torpedo/fadt.c
index 4bc88aca8f..5d66791806 100644
--- a/src/mainboard/amd/torpedo/fadt.c
+++ b/src/mainboard/amd/torpedo/fadt.c
@@ -81,7 +81,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
val = GPE0_BLK_ADDRESS;
WritePMIO(SB_PMIOA_REG68, AccWidthUint16, &val);
- /* CpuControl is in \_PR.CPU0, 6 bytes */
+ /* CpuControl is in \_PR.CP00, 6 bytes */
val = CPU_CNT_BLK_ADDRESS;
WritePMIO(SB_PMIOA_REG66, AccWidthUint16, &val);
val = 0;
diff --git a/src/mainboard/getac/p470/acpi/ec.asl b/src/mainboard/getac/p470/acpi/ec.asl
index 1b1c157dfd..70e422485c 100644
--- a/src/mainboard/getac/p470/acpi/ec.asl
+++ b/src/mainboard/getac/p470/acpi/ec.asl
@@ -105,7 +105,7 @@ Device(EC0)
// EC Query methods, called upon SCI interrupts.
Method (_Q01, 0)
{
- Notify (\_PR.CPU0, 0x80)
+ Notify (\_PR.CP00, 0x80)
If(ADP) {
Store(1, \_SB.AC.ACST)
TRAP(0xe3)
diff --git a/src/mainboard/getac/p470/acpi/platform.asl b/src/mainboard/getac/p470/acpi/platform.asl
index 2b081e0de4..cad5a71815 100644
--- a/src/mainboard/getac/p470/acpi/platform.asl
+++ b/src/mainboard/getac/p470/acpi/platform.asl
@@ -95,15 +95,15 @@ Method(_WAK,1)
// Windows XP SP2 P-State restore
If (LAnd(LEqual(OSYS, 2002), And(CFGD, 1))) {
- If (LGreater(\_PR.CPU0._PPC, 0)) {
- Subtract(\_PR.CPU0._PPC, 1, \_PR.CPU0._PPC)
+ If (LGreater(\_PR.CP00._PPC, 0)) {
+ Subtract(\_PR.CP00._PPC, 1, \_PR.CP00._PPC)
PNOT()
- Add(\_PR.CPU0._PPC, 1, \_PR.CPU0._PPC)
+ Add(\_PR.CP00._PPC, 1, \_PR.CP00._PPC)
PNOT()
} Else {
- Add(\_PR.CPU0._PPC, 1, \_PR.CPU0._PPC)
+ Add(\_PR.CP00._PPC, 1, \_PR.CP00._PPC)
PNOT()
- Subtract(\_PR.CPU0._PPC, 1, \_PR.CPU0._PPC)
+ Subtract(\_PR.CP00._PPC, 1, \_PR.CP00._PPC)
PNOT()
}
}
diff --git a/src/mainboard/getac/p470/acpi/thermal.asl b/src/mainboard/getac/p470/acpi/thermal.asl
index eefc1b73e7..f103561b99 100644
--- a/src/mainboard/getac/p470/acpi/thermal.asl
+++ b/src/mainboard/getac/p470/acpi/thermal.asl
@@ -79,9 +79,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/ibase/mb899/acpi/thermal.asl b/src/mainboard/ibase/mb899/acpi/thermal.asl
index 128d677342..c5994d5b7a 100644
--- a/src/mainboard/ibase/mb899/acpi/thermal.asl
+++ b/src/mainboard/ibase/mb899/acpi/thermal.asl
@@ -65,9 +65,9 @@ Scope (\_TZ)
Method (_PSL, 0, Serialized)
{
If (MPEN) {
- Return (Package() {\_PR.CPU1, \_PR.CPU2})
+ Return (Package() {\_PR.CP01, \_PR.CP02})
}
- Return (Package() {\_PR.CPU1})
+ Return (Package() {\_PR.CP01})
}
// TC1 value for passive cooling
diff --git a/src/mainboard/intel/d945gclf/acpi/thermal.asl b/src/mainboard/intel/d945gclf/acpi/thermal.asl
index fc9f24e6bb..10e241dea0 100644
--- a/src/mainboard/intel/d945gclf/acpi/thermal.asl
+++ b/src/mainboard/intel/d945gclf/acpi/thermal.asl
@@ -65,9 +65,9 @@ Scope (\_TZ)
Method (_PSL, 0, Serialized)
{
If (MPEN) {
- Return (Package() {\_PR.CPU1, \_PR.CPU2})
+ Return (Package() {\_PR.CP01, \_PR.CP02})
}
- Return (Package() {\_PR.CPU1})
+ Return (Package() {\_PR.CP01})
}
// TC1 value for passive cooling
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl b/src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl
index 53303098b4..1ba2338d8a 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl
+++ b/src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl
@@ -67,9 +67,9 @@ Scope (\_TZ)
Method (_PSL, 0, Serialized)
{
If (MPEN) {
- Return (Package() {\_PR.CPU1, \_PR.CPU2})
+ Return (Package() {\_PR.CP01, \_PR.CP02})
}
- Return (Package() {\_PR.CPU1})
+ Return (Package() {\_PR.CP01})
}
// TC1 value for passive cooling
diff --git a/src/mainboard/kontron/986lcd-m/acpi/thermal.asl b/src/mainboard/kontron/986lcd-m/acpi/thermal.asl
index 128d677342..c5994d5b7a 100644
--- a/src/mainboard/kontron/986lcd-m/acpi/thermal.asl
+++ b/src/mainboard/kontron/986lcd-m/acpi/thermal.asl
@@ -65,9 +65,9 @@ Scope (\_TZ)
Method (_PSL, 0, Serialized)
{
If (MPEN) {
- Return (Package() {\_PR.CPU1, \_PR.CPU2})
+ Return (Package() {\_PR.CP01, \_PR.CP02})
}
- Return (Package() {\_PR.CPU1})
+ Return (Package() {\_PR.CP01})
}
// TC1 value for passive cooling
diff --git a/src/mainboard/kontron/kt690/fadt.c b/src/mainboard/kontron/kt690/fadt.c
index c238cbeeb5..ec75a65214 100644
--- a/src/mainboard/kontron/kt690/fadt.c
+++ b/src/mainboard/kontron/kt690/fadt.c
@@ -79,7 +79,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
pm_iowrite(0x28, ACPI_GPE0_BLK & 0xFF);
pm_iowrite(0x29, ACPI_GPE0_BLK >> 8);
- /* CpuControl is in \_PR.CPU0, 6 bytes */
+ /* CpuControl is in \_PR.CP00, 6 bytes */
pm_iowrite(0x26, ACPI_CPU_CONTORL & 0xFF);
pm_iowrite(0x27, ACPI_CPU_CONTORL >> 8);
diff --git a/src/mainboard/lenovo/x200/acpi/platform.asl b/src/mainboard/lenovo/x200/acpi/platform.asl
index 19b1e00c4b..2aa556f580 100644
--- a/src/mainboard/lenovo/x200/acpi/platform.asl
+++ b/src/mainboard/lenovo/x200/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)
}
}
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
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl
index 8af607db0e..37daa36042 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl
@@ -30,8 +30,8 @@ Method(_PIC, 1, NotSerialized)
}
}
-External (\_PR.CPU0, DeviceObj)
-External (\_PR.CPU1, DeviceObj)
+External (\_PR.CP00, DeviceObj)
+External (\_PR.CP01, DeviceObj)
Scope(\_SB)
{
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl
index 02b1df1b4f..fbcd0e7c83 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl
@@ -56,9 +56,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})
}
Method(_HOT,0) { /* return hot temp in tenths degree Kelvin */
diff --git a/src/mainboard/siemens/sitemp_g1p1/fadt.c b/src/mainboard/siemens/sitemp_g1p1/fadt.c
index f9acfe4af6..d62caa0454 100644
--- a/src/mainboard/siemens/sitemp_g1p1/fadt.c
+++ b/src/mainboard/siemens/sitemp_g1p1/fadt.c
@@ -80,7 +80,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
pm_iowrite(0x28, ACPI_GPE0_BLK & 0xFF);
pm_iowrite(0x29, ACPI_GPE0_BLK >> 8);
- /* CpuControl is in \_PR.CPU0, 6 bytes */
+ /* CpuControl is in \_PR.CP00, 6 bytes */
pm_iowrite(0x26, ACPI_CPU_CONTORL & 0xFF);
pm_iowrite(0x27, ACPI_CPU_CONTORL >> 8);
diff --git a/src/mainboard/technexion/tim5690/fadt.c b/src/mainboard/technexion/tim5690/fadt.c
index c238cbeeb5..ec75a65214 100644
--- a/src/mainboard/technexion/tim5690/fadt.c
+++ b/src/mainboard/technexion/tim5690/fadt.c
@@ -79,7 +79,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
pm_iowrite(0x28, ACPI_GPE0_BLK & 0xFF);
pm_iowrite(0x29, ACPI_GPE0_BLK >> 8);
- /* CpuControl is in \_PR.CPU0, 6 bytes */
+ /* CpuControl is in \_PR.CP00, 6 bytes */
pm_iowrite(0x26, ACPI_CPU_CONTORL & 0xFF);
pm_iowrite(0x27, ACPI_CPU_CONTORL >> 8);
diff --git a/src/mainboard/technexion/tim8690/fadt.c b/src/mainboard/technexion/tim8690/fadt.c
index c238cbeeb5..ec75a65214 100644
--- a/src/mainboard/technexion/tim8690/fadt.c
+++ b/src/mainboard/technexion/tim8690/fadt.c
@@ -79,7 +79,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
pm_iowrite(0x28, ACPI_GPE0_BLK & 0xFF);
pm_iowrite(0x29, ACPI_GPE0_BLK >> 8);
- /* CpuControl is in \_PR.CPU0, 6 bytes */
+ /* CpuControl is in \_PR.CP00, 6 bytes */
pm_iowrite(0x26, ACPI_CPU_CONTORL & 0xFF);
pm_iowrite(0x27, ACPI_CPU_CONTORL >> 8);
diff --git a/src/mainboard/via/vt8454c/dsdt.asl b/src/mainboard/via/vt8454c/dsdt.asl
index d13a6b7765..4901041599 100644
--- a/src/mainboard/via/vt8454c/dsdt.asl
+++ b/src/mainboard/via/vt8454c/dsdt.asl
@@ -27,7 +27,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 1, "CX700 ", "COREBOOT", 0x00000001)
*/
Scope (\_PR)
{
- Processor (\_PR.CPU0, 0x00, 0x00000410, 0x06) {}
+ Processor (\_PR.CP00, 0x00, 0x00000410, 0x06) {}
}
/* For now only define 2 power states:
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 20:47:21 +0000