summaryrefslogtreecommitdiff
path: root/src/soc/amd/picasso
diff options
context:
space:
mode:
authorMarshall Dawson <marshall.dawson@amd.corp-partner.google.com>2019-11-22 17:52:39 -0700
committerFelix Held <felix-coreboot@felixheld.de>2020-05-26 16:13:55 +0000
commit879eba583b9be3df34532ea6a4ac67a7eadadbf7 (patch)
treed1275f7804471ec95ebeae0df26bb3bed17c107a /src/soc/amd/picasso
parenta1d0fb031c74853922d76d7341023efa2435562c (diff)
soc/amd/picasso: Use C00n for CPU ACPI string
Match the path generated by AGESA. Add more PPKG packages. TEST=Verify that "\_PR.C00n" AE_NOT_FOUND errors go away BUG=b:145013057 Change-Id: I82587648d37c0be885991f2e5741d9f874d6a2eb Signed-off-by: Marshall Dawson <marshall.dawson@amd.corp-partner.google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/1937788 Reviewed-by: Martin Roth <martinroth@chromium.org> Commit-Queue: Martin Roth <martinroth@chromium.org> Tested-by: Martin Roth <martinroth@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/41635 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/soc/amd/picasso')
-rw-r--r--src/soc/amd/picasso/Kconfig2
-rw-r--r--src/soc/amd/picasso/acpi/cpu.asl44
2 files changed, 33 insertions, 13 deletions
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index ce1f0743f5..ddbc6c3137 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -176,7 +176,7 @@ config SMM_MODULE_STACK_SIZE
config ACPI_CPU_STRING
string
- default "\\_PR.P%03d"
+ default "\\_PR.C%03d"
config ACPI_BERT
bool "Build ACPI BERT Table"
diff --git a/src/soc/amd/picasso/acpi/cpu.asl b/src/soc/amd/picasso/acpi/cpu.asl
index c40ebf0968..41d5bf5324 100644
--- a/src/soc/amd/picasso/acpi/cpu.asl
+++ b/src/soc/amd/picasso/acpi/cpu.asl
@@ -9,28 +9,48 @@ Method (PNOT)
* Processor Object
*/
/* These devices are created at runtime */
-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)
+External (\_PR.C000, DeviceObj)
+External (\_PR.C001, DeviceObj)
+External (\_PR.C002, DeviceObj)
+External (\_PR.C003, DeviceObj)
+External (\_PR.C004, DeviceObj)
+External (\_PR.C005, DeviceObj)
+External (\_PR.C006, DeviceObj)
+External (\_PR.C007, DeviceObj)
/* Return a package containing enabled processor entries */
Method (PPKG)
{
- If (LGreaterEqual (\PCNT, 2)) {
+ If (LGreaterEqual (\PCNT, 8)) {
Return (Package ()
{
- \_SB.P000,
- \_SB.P001
+ \_PR.C000,
+ \_PR.C001,
+ \_PR.C002,
+ \_PR.C003,
+ \_PR.C004,
+ \_PR.C005,
+ \_PR.C006,
+ \_PR.C007
+ })
+ } ElseIf (LGreaterEqual (\PCNT, 4)) {
+ Return (Package ()
+ {
+ \_PR.C000,
+ \_PR.C001,
+ \_PR.C002,
+ \_PR.C003
+ })
+ } ElseIf (LGreaterEqual (\PCNT, 2)) {
+ Return (Package ()
+ {
+ \_PR.C000,
+ \_PR.C001
})
} Else {
Return (Package ()
{
- \_SB.P000
+ \_PR.C000
})
}
}