<p>Subrata Banik has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26346">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/common/block/cpu: Use core apic id to get cpu_index()<br><br>This cpu_index() implementation assumes that cpu_index() function might<br>always getting called from coreboot context (ESP stack pointer will always refer<br>to coreboot). This might not true incase of proposed PI spec MP_SERVICES_PPI<br>implementation, where FSP context (stack pointer refers to fsp) will request<br>to get cpu_index(), natural alignment logic will use ESP and retrieve<br>struct cpu_info *ci from (stack_top - 8 byte). This is not the place where<br>cpu_index is actually stored by ramstage c_start.S<br><br>Hence this patch tries to remove those dependencies while retriving cpu_index(),<br>rather it uses cpuid to fetch lapic id and matches with cpu_mp structure to get<br>correct cpu_index()<br><br>BRANCH=none<br>BUG=b:79562868<br>TEST=Ensures functions can be run on APs without any failure and cpu_index() also<br>provides correct index number.<br><br>Change-Id: I55023a3e0cf42f0496d45bc6af8ead447f402350<br>Signed-off-by: Subrata Banik <subrata.banik@intel.com><br>---<br>M src/cpu/x86/mp_init.c<br>M src/include/cpu/x86/mp.h<br>M src/soc/intel/common/block/cpu/cpulib.c<br>3 files changed, 23 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/26346/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c</span><br><span>index a696cd0..86be8a8 100644</span><br><span>--- a/src/cpu/x86/mp_init.c</span><br><span>+++ b/src/cpu/x86/mp_init.c</span><br><span>@@ -660,12 +660,12 @@</span><br><span> }</span><br><span> </span><br><span> /* Returns APIC id for coreboot CPU number or < 0 on failure. */</span><br><span style="color: hsl(0, 100%, 40%);">-static int mp_get_apic_id(int cpu_slot)</span><br><span style="color: hsl(120, 100%, 40%);">+int mp_get_apic_id(int logical_cpu)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (cpu_slot >= CONFIG_MAX_CPUS || cpu_slot < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (logical_cpu >= CONFIG_MAX_CPUS || logical_cpu < 0)</span><br><span> return -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return cpus[cpu_slot].default_apic_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ return cpus[logical_cpu].default_apic_id;</span><br><span> }</span><br><span> </span><br><span> void smm_initiate_relocation_parallel(void)</span><br><span>diff --git a/src/include/cpu/x86/mp.h b/src/include/cpu/x86/mp.h</span><br><span>index c04252e..45da999 100644</span><br><span>--- a/src/include/cpu/x86/mp.h</span><br><span>+++ b/src/include/cpu/x86/mp.h</span><br><span>@@ -153,5 +153,7 @@</span><br><span> void smm_initiate_relocation_parallel(void);</span><br><span> /* Send SMI to self with single execution. */</span><br><span> void smm_initiate_relocation(void);</span><br><span style="color: hsl(120, 100%, 40%);">+/* Get CPU Index based on apic id */</span><br><span style="color: hsl(120, 100%, 40%);">+int mp_get_apic_id(int logical_cpu);</span><br><span> </span><br><span> #endif /* _X86_MP_H_ */</span><br><span>diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c</span><br><span>index c67904f..8e2289b 100644</span><br><span>--- a/src/soc/intel/common/block/cpu/cpulib.c</span><br><span>+++ b/src/soc/intel/common/block/cpu/cpulib.c</span><br><span>@@ -16,10 +16,13 @@</span><br><span> </span><br><span> #include <arch/acpigen.h></span><br><span> #include <arch/io.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <arch/cpu.h></span><br><span> #include <console/console.h></span><br><span> #include <cpu/intel/turbo.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cpu/x86/lapic.h></span><br><span> #include <cpu/x86/msr.h></span><br><span> #include <cpu/x86/mtrr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <cpu/x86/mp.h></span><br><span> #include <delay.h></span><br><span> #include <intelblocks/cpulib.h></span><br><span> #include <intelblocks/fast_spi.h></span><br><span>@@ -314,3 +317,18 @@</span><br><span> (msr_t) {.lo = 0xffffffff, .hi = 0xffffffff});</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_SOC_INTEL_COMMON_BLOCK_PUBLISH_MP_SERVICES_PPI) && \</span><br><span style="color: hsl(120, 100%, 40%);">+ ENV_RAMSTAGE</span><br><span style="color: hsl(120, 100%, 40%);">+int cpu_index(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < CONFIG_MAX_CPUS; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_get_apic_id(i) == lapicid()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return i;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26346">change 26346</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/26346"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I55023a3e0cf42f0496d45bc6af8ead447f402350 </div>
<div style="display:none"> Gerrit-Change-Number: 26346 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Subrata Banik <subrata.banik@intel.com> </div>