From f2a59a4de2440f8f1dc4a33d031471f1902c362d Mon Sep 17 00:00:00 2001
From: Jason Glenesk <jason.glenesk@amd.corp-partner.google.com>
Date: Mon, 10 Aug 2020 00:58:37 -0700
Subject: [PATCH] soc/amd/picasso: Correct processor ACPI scope

Change namespace from _PR to _SB.

Cq-Depend: chrome-internal:3208104
BUG=b:153242529
TEST=Boot a trembyle with change applied and dump SSDTs to ensure
processors are in _SB scope.

Change-Id: I534f02dc50756759da945cf64d5b3623b0ec9db1
Signed-off-by: Jason Glenesk <jason.glenesk@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44325
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/amd/picasso/Kconfig      |  2 +-
 src/soc/amd/picasso/acpi/cpu.asl | 46 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 526900a23b..8001b7a20c 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -321,7 +321,7 @@ config SMM_MODULE_STACK_SIZE
 
 config ACPI_CPU_STRING
 	string
-	default "\\_PR.C%03d"
+	default "\\_SB.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 8b61b8f921..eb646dec1e 100644
--- a/src/soc/amd/picasso/acpi/cpu.asl
+++ b/src/soc/amd/picasso/acpi/cpu.asl
@@ -36,14 +36,14 @@ Method (PNOT)
  * Processor Object
  */
 /* These devices are created at runtime */
-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)
+External (\_SB.C000, DeviceObj)
+External (\_SB.C001, DeviceObj)
+External (\_SB.C002, DeviceObj)
+External (\_SB.C003, DeviceObj)
+External (\_SB.C004, DeviceObj)
+External (\_SB.C005, DeviceObj)
+External (\_SB.C006, DeviceObj)
+External (\_SB.C007, DeviceObj)
 
 /* Return a package containing enabled processor entries */
 Method (PPKG)
@@ -51,33 +51,33 @@ Method (PPKG)
 	If (LGreaterEqual (\PCNT, 8)) {
 		Return (Package ()
 		{
-			\_PR.C000,
-			\_PR.C001,
-			\_PR.C002,
-			\_PR.C003,
-			\_PR.C004,
-			\_PR.C005,
-			\_PR.C006,
-			\_PR.C007
+			\_SB.C000,
+			\_SB.C001,
+			\_SB.C002,
+			\_SB.C003,
+			\_SB.C004,
+			\_SB.C005,
+			\_SB.C006,
+			\_SB.C007
 		})
 	} ElseIf (LGreaterEqual (\PCNT, 4)) {
 		Return (Package ()
 		{
-			\_PR.C000,
-			\_PR.C001,
-			\_PR.C002,
-			\_PR.C003
+			\_SB.C000,
+			\_SB.C001,
+			\_SB.C002,
+			\_SB.C003
 		})
 	} ElseIf (LGreaterEqual (\PCNT, 2)) {
 		Return (Package ()
 		{
-			\_PR.C000,
-			\_PR.C001
+			\_SB.C000,
+			\_SB.C001
 		})
 	} Else {
 		Return (Package ()
 		{
-			\_PR.C000
+			\_SB.C000
 		})
 	}
 }