<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20973">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cpu/amd/fam10: Link fidvid.c<br><br>Change-Id: I724fa6c3ba0cc4fdfb11cc28fd54611c5959f2fb<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/cpu/amd/family_10h-family_15h/Makefile.inc<br>M src/cpu/amd/family_10h-family_15h/fidvid.c<br>M src/cpu/amd/family_10h-family_15h/init_cpus.c<br>M src/cpu/amd/family_10h-family_15h/init_cpus.h<br>4 files changed, 24 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/20973/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/cpu/amd/family_10h-family_15h/Makefile.inc b/src/cpu/amd/family_10h-family_15h/Makefile.inc<br>index c540320..aa9b4d0 100644<br>--- a/src/cpu/amd/family_10h-family_15h/Makefile.inc<br>+++ b/src/cpu/amd/family_10h-family_15h/Makefile.inc<br>@@ -1,5 +1,6 @@<br> romstage-y += ../../x86/mtrr/earlymtrr.c<br> <br>+romstage-y += fidvid.c<br> romstage-y += init_cpus.c<br> <br> ramstage-y += model_10xxx_init.c<br>diff --git a/src/cpu/amd/family_10h-family_15h/fidvid.c b/src/cpu/amd/family_10h-family_15h/fidvid.c<br>index e4bb9a3..af3a674 100644<br>--- a/src/cpu/amd/family_10h-family_15h/fidvid.c<br>+++ b/src/cpu/amd/family_10h-family_15h/fidvid.c<br>@@ -89,8 +89,16 @@<br> <br> */<br> <br>+#include <arch/io.h><br>+#include <console/console.h><br>+#include <cpu/x86/msr.h><br> #include <inttypes.h><br>+#include <northbridge/amd/amdfam10/amdfam10.h><br> #include <northbridge/amd/amdht/AsPsDefs.h><br>+#include <northbridge/amd/amdht/ht_wrapper.h><br>+#include <cpu/amd/multicore.h><br>+<br>+#include "init_cpus.h"<br> <br> static inline void print_debug_fv(const char *str, u32 val)<br> {<br>@@ -859,7 +867,7 @@<br> <br> }<br> <br>-static void init_fidvid_ap(u32 apicid, u32 nodeid, u32 coreid)<br>+void init_fidvid_ap(u32 apicid, u32 nodeid, u32 coreid)<br> {<br> u32 send;<br> <br>diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c<br>index f5a949c..be4f8d4 100644<br>--- a/src/cpu/amd/family_10h-family_15h/init_cpus.c<br>+++ b/src/cpu/amd/family_10h-family_15h/init_cpus.c<br>@@ -138,7 +138,7 @@<br> //core range = 1 : core 0 only<br> //core range = 2 : cores other than core0<br> <br>-static void for_each_ap(uint32_t bsp_apicid, uint32_t core_range, int8_t node,<br>+void for_each_ap(uint32_t bsp_apicid, uint32_t core_range, int8_t node,<br> process_ap_t process_ap, void *gp)<br> {<br> // here assume the OS don't change our apicid<br>@@ -198,7 +198,7 @@<br> }<br> }<br> <br>-static inline int lapic_remote_read(int apicid, int reg, u32 *pvalue)<br>+int lapic_remote_read(int apicid, int reg, u32 *pvalue)<br> {<br> int timeout;<br> u32 status;<br>@@ -226,10 +226,6 @@<br> }<br> return result;<br> }<br>-<br>-#if IS_ENABLED(CONFIG_SET_FIDVID)<br>-static void init_fidvid_ap(u32 apicid, u32 nodeid, u32 coreid);<br>-#endif<br> <br> static inline __attribute__((always_inline))<br> void print_apicid_nodeid_coreid(u32 apicid, struct node_core_id id,<br>@@ -764,7 +760,7 @@<br> }<br> }<br> <br>-static u32 get_platform_type(void)<br>+u32 get_platform_type(void)<br> {<br> u32 ret = 0;<br> <br>@@ -825,7 +821,7 @@<br> *<br> * Returns the offset of the link register.<br> */<br>-static BOOL AMD_CpuFindCapability(u8 node, u8 cap_count, u8 * offset)<br>+BOOL AMD_CpuFindCapability(u8 node, u8 cap_count, u8 * offset)<br> {<br> u32 reg;<br> u32 val;<br>@@ -865,7 +861,7 @@<br> *<br> * Returns the link characteristic mask.<br> */<br>-static u32 AMD_checkLinkType(u8 node, u8 regoff)<br>+u32 AMD_checkLinkType(u8 node, u8 regoff)<br> {<br> uint32_t val;<br> uint32_t val2;<br>@@ -1878,7 +1874,3 @@<br> }<br> #endif<br> }<br>-<br>-#if IS_ENABLED(CONFIG_SET_FIDVID)<br>-# include "fidvid.c"<br>-#endif<br>diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.h b/src/cpu/amd/family_10h-family_15h/init_cpus.h<br>index d4bff0b..8ca9c8b 100644<br>--- a/src/cpu/amd/family_10h-family_15h/init_cpus.h<br>+++ b/src/cpu/amd/family_10h-family_15h/init_cpus.h<br>@@ -25,6 +25,7 @@<br> #include <cpu/amd/multicore.h><br> #include <reset.h><br> #include <northbridge/amd/amdfam10/raminit.h><br>+#include <northbridge/amd/amdht/porting.h><br> #include "defaults.h"<br> <br> #define NODE_HT(x) NODE_PCI(x,0)<br>@@ -45,6 +46,13 @@<br> uint32_t wait_cpu_state(uint32_t apicid, uint32_t state, uint32_t state2);<br> void start_other_cores(uint32_t bsp_apicid);<br> u32 get_core_num_in_bsp(u32 nodeid);<br>+void for_each_ap(uint32_t bsp_apicid, uint32_t core_range, int8_t node,<br>+ process_ap_t process_ap, void *gp);<br>+u32 get_platform_type(void);<br>+BOOL AMD_CpuFindCapability(u8 node, u8 cap_count, u8 * offset);<br>+u32 AMD_checkLinkType(u8 node, u8 regoff);<br>+int lapic_remote_read(int apicid, int reg, u32 *pvalue);<br>+<br> <br> void update_microcode(u32 cpu_deviceid);<br> <br>@@ -52,5 +60,6 @@<br> void init_fidvid_stage2(u32 apicid, u32 nodeid);<br> void prep_fid_change(void);<br> int init_fidvid_bsp(u32 bsp_apicid, u32 nodes);<br>+void init_fidvid_ap(u32 apicid, u32 nodeid, u32 coreid);<br> <br> #endif<br></pre><p>To view, visit <a href="https://review.coreboot.org/20973">change 20973</a>. To unsubscribe, 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/20973"/><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: I724fa6c3ba0cc4fdfb11cc28fd54611c5959f2fb </div>
<div style="display:none"> Gerrit-Change-Number: 20973 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>