<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29888">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/baytrail: Rework acpi/cpu.asl<br><br>Change-Id: Ifb5a5c1255f9a922063293bf430e849909468eaf<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/soc/intel/baytrail/acpi.c<br>M src/soc/intel/baytrail/acpi/cpu.asl<br>2 files changed, 24 insertions(+), 43 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/29888/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c</span><br><span>index e9934aa..e9c1e32 100644</span><br><span>--- a/src/soc/intel/baytrail/acpi.c</span><br><span>+++ b/src/soc/intel/baytrail/acpi.c</span><br><span>@@ -447,7 +447,7 @@</span><br><span> int pcontrol_blk = get_pmbase(), plen = 6;</span><br><span> const struct pattrs *pattrs = pattrs_get();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (core=0; core<pattrs->num_cpus; core++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (core=0; core < pattrs->num_cpus; core++) {</span><br><span> if (core > 0) {</span><br><span> pcontrol_blk = 0;</span><br><span> plen = 0;</span><br><span>@@ -471,6 +471,23 @@</span><br><span> </span><br><span> acpigen_pop_len();</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* PPKG is usually used for thermal management</span><br><span style="color: hsl(120, 100%, 40%);">+ of the first and only package. */</span><br><span style="color: hsl(120, 100%, 40%);">+ acpigen_write_processor_package("PPKG", 0, pattrs->num_cpus);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Add a method to notify processor nodes */</span><br><span style="color: hsl(120, 100%, 40%);">+ acpigen_write_method("\\_PR.CNOT", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (core = 0; core < pattrs->num_cpus; coreID++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ char buffer[DEVICE_PATH_MAX];</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buffer, sizeof(buffer), "\\_PR.CP%c%c",</span><br><span style="color: hsl(120, 100%, 40%);">+ '0' + core / 10, '0' + core % 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ acpigen_emit_byte(NOTIFY_OP);</span><br><span style="color: hsl(120, 100%, 40%);">+ acpigen_emit_namestring(buffer);</span><br><span style="color: hsl(120, 100%, 40%);">+ acpigen_emit_byte(ARG0_OP);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ acpigen_pop_len();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> </span><br><span> unsigned long acpi_madt_irq_overrides(unsigned long current)</span><br><span>diff --git a/src/soc/intel/baytrail/acpi/cpu.asl b/src/soc/intel/baytrail/acpi/cpu.asl</span><br><span>index dc26e0a..775b32f 100644</span><br><span>--- a/src/soc/intel/baytrail/acpi/cpu.asl</span><br><span>+++ b/src/soc/intel/baytrail/acpi/cpu.asl</span><br><span>@@ -14,59 +14,23 @@</span><br><span> * GNU General Public License for more details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* These devices are created at runtime */</span><br><span style="color: hsl(0, 100%, 40%);">-External (\_PR.CP00, DeviceObj)</span><br><span style="color: hsl(0, 100%, 40%);">-External (\_PR.CP01, DeviceObj)</span><br><span style="color: hsl(0, 100%, 40%);">-External (\_PR.CP02, DeviceObj)</span><br><span style="color: hsl(0, 100%, 40%);">-External (\_PR.CP03, DeviceObj)</span><br><span style="color: hsl(120, 100%, 40%);">+/* These come from the dynamically created CPU SSDT */</span><br><span style="color: hsl(120, 100%, 40%);">+External (\_PR.CNOT, MethodObj)</span><br><span> </span><br><span> /* Notify OS to re-read CPU tables, assuming ^2 CPU count */</span><br><span> Method (PNOT)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- If (LGreaterEqual (\PCNT, 2)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP00, 0x81) // _CST</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP01, 0x81) // _CST</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- If (LGreaterEqual (\PCNT, 4)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP02, 0x81) // _CST</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP03, 0x81) // _CST</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ \_PR.CNOT (0x81)</span><br><span> }</span><br><span> </span><br><span> /* Notify OS to re-read CPU _PPC limit, assuming ^2 CPU count */</span><br><span> Method (PPCN)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- If (LGreaterEqual (\PCNT, 2)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP00, 0x80) // _PPC</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP01, 0x80) // _PPC</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- If (LGreaterEqual (\PCNT, 4)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP02, 0x80) // _PPC</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP03, 0x80) // _PPC</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ \_PR.CNOT (0x81)</span><br><span> }</span><br><span> </span><br><span> /* Notify OS to re-read Throttle Limit tables, assuming ^2 CPU count */</span><br><span> Method (TNOT)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- If (LGreaterEqual (\PCNT, 2)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP00, 0x82) // _TPC</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP01, 0x82) // _TPC</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- If (LGreaterEqual (\PCNT, 4)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP02, 0x82) // _TPC</span><br><span style="color: hsl(0, 100%, 40%);">- Notify (\_PR.CP03, 0x82) // _TPC</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Return a package containing enabled processor entries */</span><br><span style="color: hsl(0, 100%, 40%);">-Method (PPKG)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- If (LGreaterEqual (\PCNT, 4)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Return (Package() {\_PR.CP00, \_PR.CP01, \_PR.CP02, \_PR.CP03})</span><br><span style="color: hsl(0, 100%, 40%);">- } ElseIf (LGreaterEqual (\PCNT, 2)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Return (Package() {\_PR.CP00, \_PR.CP01})</span><br><span style="color: hsl(0, 100%, 40%);">- } Else {</span><br><span style="color: hsl(0, 100%, 40%);">- Return (Package() {\_PR.CP00})</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+ \_PR.CNOT (0x82)</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29888">change 29888</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/c/coreboot/+/29888"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifb5a5c1255f9a922063293bf430e849909468eaf </div>
<div style="display:none"> Gerrit-Change-Number: 29888 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>