From af84368591076936f3059b080950e47939ca48fc Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Thu, 24 Oct 2019 14:59:48 +0200 Subject: mb/amd: Use 'Device()' instead of 'Processor()' Processor() operator is deprecated, use Device() instead. Change-Id: Ia1d73806b00ec38084fff3989f52227d4c216e65 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/36302 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/amd/bimini_fam10/acpi/cpstate.asl | 18 ++++++++--- src/mainboard/amd/bimini_fam10/dsdt.asl | 39 +++++++---------------- src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl | 18 ++++++++--- src/mainboard/amd/mahogany_fam10/dsdt.asl | 39 +++++++---------------- src/mainboard/amd/thatcher/acpi/cpstate.asl | 18 ++++++++--- src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl | 18 ++++++++--- src/mainboard/amd/tilapia_fam10/dsdt.asl | 39 +++++++---------------- src/mainboard/amd/torpedo/dsdt.asl | 36 +++++++-------------- 8 files changed, 100 insertions(+), 125 deletions(-) (limited to 'src') diff --git a/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl b/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl index 206dd686f5..acaa5bae32 100644 --- a/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl +++ b/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl @@ -22,17 +22,25 @@ #include DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { - Scope (\_PR) { - Processor(CPU0,0,0x808,0x06) { + Scope (\_PR) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "cpstate.asl" } - Processor(CPU1,1,0x0,0x0) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "cpstate.asl" } - Processor(CPU2,2,0x0,0x0) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "cpstate.asl" } - Processor(CPU3,3,0x0,0x0) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "cpstate.asl" } } diff --git a/src/mainboard/amd/bimini_fam10/dsdt.asl b/src/mainboard/amd/bimini_fam10/dsdt.asl index ed181a36dc..c7196229fd 100644 --- a/src/mainboard/amd/bimini_fam10/dsdt.asl +++ b/src/mainboard/amd/bimini_fam10/dsdt.asl @@ -58,39 +58,24 @@ DefinitionBlock ( * */ Scope (\_PR) { /* define processor scope */ - Processor( - CPU0, /* name space name */ - 0, /* Unique number for this processor */ - 0x808, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "acpi/cpstate.asl" } - - Processor( - CPU1, /* name space name */ - 1, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "acpi/cpstate.asl" } - - Processor( - CPU2, /* name space name */ - 2, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "acpi/cpstate.asl" } - - Processor( - CPU3, /* name space name */ - 3, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "acpi/cpstate.asl" } } /* End _PR scope */ diff --git a/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl b/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl index 206dd686f5..acaa5bae32 100644 --- a/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl +++ b/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl @@ -22,17 +22,25 @@ #include DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { - Scope (\_PR) { - Processor(CPU0,0,0x808,0x06) { + Scope (\_PR) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "cpstate.asl" } - Processor(CPU1,1,0x0,0x0) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "cpstate.asl" } - Processor(CPU2,2,0x0,0x0) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "cpstate.asl" } - Processor(CPU3,3,0x0,0x0) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "cpstate.asl" } } diff --git a/src/mainboard/amd/mahogany_fam10/dsdt.asl b/src/mainboard/amd/mahogany_fam10/dsdt.asl index 9528e01080..63748d7e01 100644 --- a/src/mainboard/amd/mahogany_fam10/dsdt.asl +++ b/src/mainboard/amd/mahogany_fam10/dsdt.asl @@ -58,39 +58,24 @@ DefinitionBlock ( * */ Scope (\_PR) { /* define processor scope */ - Processor( - CPU0, /* name space name */ - 0, /* Unique number for this processor */ - 0x808, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "acpi/cpstate.asl" } - - Processor( - CPU1, /* name space name */ - 1, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "acpi/cpstate.asl" } - - Processor( - CPU2, /* name space name */ - 2, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "acpi/cpstate.asl" } - - Processor( - CPU3, /* name space name */ - 3, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "acpi/cpstate.asl" } } /* End _PR scope */ diff --git a/src/mainboard/amd/thatcher/acpi/cpstate.asl b/src/mainboard/amd/thatcher/acpi/cpstate.asl index 69de2d86a3..3cbc0ad60b 100644 --- a/src/mainboard/amd/thatcher/acpi/cpstate.asl +++ b/src/mainboard/amd/thatcher/acpi/cpstate.asl @@ -22,17 +22,25 @@ #include DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { - Scope (\_PR) { - Processor(CPU0,0,0x808,0x06) { + Scope (\_PR) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "cpstate.asl" } - Processor(CPU1,1,0x0,0x0) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "cpstate.asl" } - Processor(CPU2,2,0x0,0x0) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "cpstate.asl" } - Processor(CPU3,3,0x0,0x0) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "cpstate.asl" } } diff --git a/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl b/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl index 206dd686f5..acaa5bae32 100644 --- a/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl +++ b/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl @@ -22,17 +22,25 @@ #include DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { - Scope (\_PR) { - Processor(CPU0,0,0x808,0x06) { + Scope (\_PR) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "cpstate.asl" } - Processor(CPU1,1,0x0,0x0) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "cpstate.asl" } - Processor(CPU2,2,0x0,0x0) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "cpstate.asl" } - Processor(CPU3,3,0x0,0x0) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "cpstate.asl" } } diff --git a/src/mainboard/amd/tilapia_fam10/dsdt.asl b/src/mainboard/amd/tilapia_fam10/dsdt.asl index f174976491..f9f7e18abb 100644 --- a/src/mainboard/amd/tilapia_fam10/dsdt.asl +++ b/src/mainboard/amd/tilapia_fam10/dsdt.asl @@ -58,39 +58,24 @@ DefinitionBlock ( * */ Scope (\_PR) { /* define processor scope */ - Processor( - CPU0, /* name space name */ - 0, /* Unique number for this processor */ - 0x808, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "acpi/cpstate.asl" } - - Processor( - CPU1, /* name space name */ - 1, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "acpi/cpstate.asl" } - - Processor( - CPU2, /* name space name */ - 2, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "acpi/cpstate.asl" } - - Processor( - CPU3, /* name space name */ - 3, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "acpi/cpstate.asl" } } /* End _PR scope */ diff --git a/src/mainboard/amd/torpedo/dsdt.asl b/src/mainboard/amd/torpedo/dsdt.asl index 9626ec66fa..48f8e1fe30 100644 --- a/src/mainboard/amd/torpedo/dsdt.asl +++ b/src/mainboard/amd/torpedo/dsdt.asl @@ -45,33 +45,21 @@ DefinitionBlock ( * */ Scope (\_PR) { /* define processor scope */ - Processor( - C000, /* name space name, align with BLDCFG_PROCESSOR_SCOPE_NAME[01] */ - 0, /* Unique number for this processor */ - 0x810, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (C000) { + Name (_HID, "ACPI0007") + Name (_UID, 0) } - Processor( - C001, /* name space name */ - 1, /* Unique number for this processor */ - 0x810, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (C001) { + Name (_HID, "ACPI0007") + Name (_UID, 1) } - Processor( - C002, /* name space name */ - 2, /* Unique number for this processor */ - 0x810, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (C002) { + Name (_HID, "ACPI0007") + Name (_UID, 2) } - Processor( - C003, /* name space name */ - 3, /* Unique number for this processor */ - 0x810, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (C003) { + Name (_HID, "ACPI0007") + Name (_UID, 3) } } /* End _PR scope */ -- cgit v1.2.3