[coreboot-gerrit] Change in ...coreboot[master]: soc/intel/baytrail: Rework acpi/cpu.asl

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29888

Change subject: soc/intel/baytrail: Rework acpi/cpu.asl
......................................................................

soc/intel/baytrail: Rework acpi/cpu.asl

Change-Id: Ifb5a5c1255f9a922063293bf430e849909468eaf
Signed-off-by: Arthur Heymans 
---
M src/soc/intel/baytrail/acpi.c
M src/soc/intel/baytrail/acpi/cpu.asl
2 files changed, 24 insertions(+), 43 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/29888/1

diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c
index e9934aa..e9c1e32 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -447,7 +447,7 @@
    int pcontrol_blk = get_pmbase(), plen = 6;
    const struct pattrs *pattrs = pattrs_get();

-	for (core=0; core<pattrs->num_cpus; core++) {
+	for (core=0; core < pattrs->num_cpus; core++) {
    	if (core > 0) {
    		pcontrol_blk = 0;
    		plen = 0;
@@ -471,6 +471,23 @@

acpigen_pop_len();
    }
+
+	/* PPKG is usually used for thermal management
+	   of the first and only package. */
+	acpigen_write_processor_package("PPKG", 0, pattrs->num_cpus);
+
+	/* Add a method to notify processor nodes */
+	acpigen_write_method("\_PR.CNOT", 1);
+	for (core = 0; core < pattrs->num_cpus; coreID++) {
+		char buffer[DEVICE_PATH_MAX];
+		snprintf(buffer, sizeof(buffer), "\_PR.CP%c%c",
+			 '0' + core / 10, '0' + core % 10);
+		acpigen_emit_byte(NOTIFY_OP);
+		acpigen_emit_namestring(buffer);
+		acpigen_emit_byte(ARG0_OP);
+	}
+	acpigen_pop_len();
+
 }

unsigned long acpi_madt_irq_overrides(unsigned long current)
diff --git a/src/soc/intel/baytrail/acpi/cpu.asl b/src/soc/intel/baytrail/acpi/cpu.asl
index dc26e0a..775b32f 100644
--- a/src/soc/intel/baytrail/acpi/cpu.asl
+++ b/src/soc/intel/baytrail/acpi/cpu.asl
@@ -14,59 +14,23 @@
  * GNU General Public License for more details.
  */

-/* These devices are created at runtime */
-External (_PR.CP00, DeviceObj)
-External (_PR.CP01, DeviceObj)
-External (_PR.CP02, DeviceObj)
-External (_PR.CP03, DeviceObj)
+/* These come from the dynamically created CPU SSDT */
+External (_PR.CNOT, MethodObj)

/* Notify OS to re-read CPU tables, assuming ^2 CPU count */
 Method (PNOT)
 {
-	If (LGreaterEqual (\PCNT, 2)) {
-		Notify (_PR.CP00, 0x81)  // _CST
-		Notify (_PR.CP01, 0x81)  // _CST
-	}
-	If (LGreaterEqual (\PCNT, 4)) {
-		Notify (_PR.CP02, 0x81)  // _CST
-		Notify (_PR.CP03, 0x81)  // _CST
-	}
+	_PR.CNOT (0x81)
 }

/* Notify OS to re-read CPU _PPC limit, assuming ^2 CPU count */
 Method (PPCN)
 {
-	If (LGreaterEqual (\PCNT, 2)) {
-		Notify (_PR.CP00, 0x80)  // _PPC
-		Notify (_PR.CP01, 0x80)  // _PPC
-	}
-	If (LGreaterEqual (\PCNT, 4)) {
-		Notify (_PR.CP02, 0x80)  // _PPC
-		Notify (_PR.CP03, 0x80)  // _PPC
-	}
+	_PR.CNOT (0x81)
 }

/* Notify OS to re-read Throttle Limit tables, assuming ^2 CPU count */
 Method (TNOT)
 {
-	If (LGreaterEqual (\PCNT, 2)) {
-		Notify (_PR.CP00, 0x82)  // _TPC
-		Notify (_PR.CP01, 0x82)  // _TPC
-	}
-	If (LGreaterEqual (\PCNT, 4)) {
-		Notify (_PR.CP02, 0x82)  // _TPC
-		Notify (_PR.CP03, 0x82)  // _TPC
-	}
-}
-
-/* Return a package containing enabled processor entries */
-Method (PPKG)
-{
-	If (LGreaterEqual (\PCNT, 4)) {
-		Return (Package() {_PR.CP00, _PR.CP01, _PR.CP02, _PR.CP03})
-	} ElseIf (LGreaterEqual (\PCNT, 2)) {
-		Return (Package() {_PR.CP00, _PR.CP01})
-	} Else {
-		Return (Package() {_PR.CP00})
-	}
-}
+	_PR.CNOT (0x82)
+}
\ No newline at end of file