mb/amd: Use 'Device()' instead of 'Processor()'

Processor() operator is deprecated, use Device() instead.

Change-Id: Ia1d73806b00ec38084fff3989f52227d4c216e65
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36302
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Elyes HAOUAS 2019-10-24 14:59:48 +02:00 committed by Martin Roth
parent 2c34892efd
commit af84368591
8 changed files with 100 additions and 125 deletions

View File

@ -22,17 +22,25 @@
#include <arch/acpi.h> #include <arch/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001)
{ {
Scope (\_PR) { Scope (\_PR) {
Processor(CPU0,0,0x808,0x06) { Device (CPU0) {
Name (_HID, "ACPI0007")
Name (_UID, 0)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU1,1,0x0,0x0) { Device (CPU1) {
Name (_HID, "ACPI0007")
Name (_UID, 1)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU2,2,0x0,0x0) { Device (CPU2) {
Name (_HID, "ACPI0007")
Name (_UID, 2)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU3,3,0x0,0x0) { Device (CPU3) {
Name (_HID, "ACPI0007")
Name (_UID, 3)
#include "cpstate.asl" #include "cpstate.asl"
} }
} }

View File

@ -58,39 +58,24 @@ DefinitionBlock (
* *
*/ */
Scope (\_PR) { /* define processor scope */ Scope (\_PR) { /* define processor scope */
Processor( Device (CPU0) {
CPU0, /* name space name */ Name (_HID, "ACPI0007")
0, /* Unique number for this processor */ Name (_UID, 0)
0x808, /* PBLK system I/O address !hardcoded! */
0x06 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
Device (CPU1) {
Processor( Name (_HID, "ACPI0007")
CPU1, /* name space name */ Name (_UID, 1)
1, /* Unique number for this processor */
0x0000, /* PBLK system I/O address !hardcoded! */
0x00 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
Device (CPU2) {
Processor( Name (_HID, "ACPI0007")
CPU2, /* name space name */ Name (_UID, 2)
2, /* Unique number for this processor */
0x0000, /* PBLK system I/O address !hardcoded! */
0x00 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
Device (CPU3) {
Processor( Name (_HID, "ACPI0007")
CPU3, /* name space name */ Name (_UID, 3)
3, /* Unique number for this processor */
0x0000, /* PBLK system I/O address !hardcoded! */
0x00 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
} /* End _PR scope */ } /* End _PR scope */

View File

@ -22,17 +22,25 @@
#include <arch/acpi.h> #include <arch/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001)
{ {
Scope (\_PR) { Scope (\_PR) {
Processor(CPU0,0,0x808,0x06) { Device (CPU0) {
Name (_HID, "ACPI0007")
Name (_UID, 0)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU1,1,0x0,0x0) { Device (CPU1) {
Name (_HID, "ACPI0007")
Name (_UID, 1)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU2,2,0x0,0x0) { Device (CPU2) {
Name (_HID, "ACPI0007")
Name (_UID, 2)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU3,3,0x0,0x0) { Device (CPU3) {
Name (_HID, "ACPI0007")
Name (_UID, 3)
#include "cpstate.asl" #include "cpstate.asl"
} }
} }

View File

@ -58,39 +58,24 @@ DefinitionBlock (
* *
*/ */
Scope (\_PR) { /* define processor scope */ Scope (\_PR) { /* define processor scope */
Processor( Device (CPU0) {
CPU0, /* name space name */ Name (_HID, "ACPI0007")
0, /* Unique number for this processor */ Name (_UID, 0)
0x808, /* PBLK system I/O address !hardcoded! */
0x06 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
Device (CPU1) {
Processor( Name (_HID, "ACPI0007")
CPU1, /* name space name */ Name (_UID, 1)
1, /* Unique number for this processor */
0x0000, /* PBLK system I/O address !hardcoded! */
0x00 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
Device (CPU2) {
Processor( Name (_HID, "ACPI0007")
CPU2, /* name space name */ Name (_UID, 2)
2, /* Unique number for this processor */
0x0000, /* PBLK system I/O address !hardcoded! */
0x00 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
Device (CPU3) {
Processor( Name (_HID, "ACPI0007")
CPU3, /* name space name */ Name (_UID, 3)
3, /* Unique number for this processor */
0x0000, /* PBLK system I/O address !hardcoded! */
0x00 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
} /* End _PR scope */ } /* End _PR scope */

View File

@ -22,17 +22,25 @@
#include <arch/acpi.h> #include <arch/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001)
{ {
Scope (\_PR) { Scope (\_PR) {
Processor(CPU0,0,0x808,0x06) { Device (CPU0) {
Name (_HID, "ACPI0007")
Name (_UID, 0)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU1,1,0x0,0x0) { Device (CPU1) {
Name (_HID, "ACPI0007")
Name (_UID, 1)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU2,2,0x0,0x0) { Device (CPU2) {
Name (_HID, "ACPI0007")
Name (_UID, 2)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU3,3,0x0,0x0) { Device (CPU3) {
Name (_HID, "ACPI0007")
Name (_UID, 3)
#include "cpstate.asl" #include "cpstate.asl"
} }
} }

View File

@ -22,17 +22,25 @@
#include <arch/acpi.h> #include <arch/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001)
{ {
Scope (\_PR) { Scope (\_PR) {
Processor(CPU0,0,0x808,0x06) { Device (CPU0) {
Name (_HID, "ACPI0007")
Name (_UID, 0)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU1,1,0x0,0x0) { Device (CPU1) {
Name (_HID, "ACPI0007")
Name (_UID, 1)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU2,2,0x0,0x0) { Device (CPU2) {
Name (_HID, "ACPI0007")
Name (_UID, 2)
#include "cpstate.asl" #include "cpstate.asl"
} }
Processor(CPU3,3,0x0,0x0) { Device (CPU3) {
Name (_HID, "ACPI0007")
Name (_UID, 3)
#include "cpstate.asl" #include "cpstate.asl"
} }
} }

View File

@ -58,39 +58,24 @@ DefinitionBlock (
* *
*/ */
Scope (\_PR) { /* define processor scope */ Scope (\_PR) { /* define processor scope */
Processor( Device (CPU0) {
CPU0, /* name space name */ Name (_HID, "ACPI0007")
0, /* Unique number for this processor */ Name (_UID, 0)
0x808, /* PBLK system I/O address !hardcoded! */
0x06 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
Device (CPU1) {
Processor( Name (_HID, "ACPI0007")
CPU1, /* name space name */ Name (_UID, 1)
1, /* Unique number for this processor */
0x0000, /* PBLK system I/O address !hardcoded! */
0x00 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
Device (CPU2) {
Processor( Name (_HID, "ACPI0007")
CPU2, /* name space name */ Name (_UID, 2)
2, /* Unique number for this processor */
0x0000, /* PBLK system I/O address !hardcoded! */
0x00 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
Device (CPU3) {
Processor( Name (_HID, "ACPI0007")
CPU3, /* name space name */ Name (_UID, 3)
3, /* Unique number for this processor */
0x0000, /* PBLK system I/O address !hardcoded! */
0x00 /* PBLKLEN for boot processor */
) {
#include "acpi/cpstate.asl" #include "acpi/cpstate.asl"
} }
} /* End _PR scope */ } /* End _PR scope */

View File

@ -45,33 +45,21 @@ DefinitionBlock (
* *
*/ */
Scope (\_PR) { /* define processor scope */ Scope (\_PR) { /* define processor scope */
Processor( Device (C000) {
C000, /* name space name, align with BLDCFG_PROCESSOR_SCOPE_NAME[01] */ Name (_HID, "ACPI0007")
0, /* Unique number for this processor */ Name (_UID, 0)
0x810, /* PBLK system I/O address !hardcoded! */
0x06 /* PBLKLEN for boot processor */
) {
} }
Processor( Device (C001) {
C001, /* name space name */ Name (_HID, "ACPI0007")
1, /* Unique number for this processor */ Name (_UID, 1)
0x810, /* PBLK system I/O address !hardcoded! */
0x06 /* PBLKLEN for boot processor */
) {
} }
Processor( Device (C002) {
C002, /* name space name */ Name (_HID, "ACPI0007")
2, /* Unique number for this processor */ Name (_UID, 2)
0x810, /* PBLK system I/O address !hardcoded! */
0x06 /* PBLKLEN for boot processor */
) {
} }
Processor( Device (C003) {
C003, /* name space name */ Name (_HID, "ACPI0007")
3, /* Unique number for this processor */ Name (_UID, 3)
0x810, /* PBLK system I/O address !hardcoded! */
0x06 /* PBLKLEN for boot processor */
) {
} }
} /* End _PR scope */ } /* End _PR scope */