<p>Marshall Dawson has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22885">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/common: Make AGESA wrapper build in any stage<br><br>Convert the global variables to CAR_GLOBALs and modify their access<br>methods. Remove all checks for __PRE_RAM__.<br><br>BUG=b:70671590<br>TEST=Build and boot Kahlee<br><br>Change-Id: I7a35141f212f340c157d57fde8daf93c0c383af8<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/soc/amd/common/block/pi/agesawrapper.c<br>1 file changed, 31 insertions(+), 39 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/22885/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c<br>index b9931d2..c6ff89e 100644<br>--- a/src/soc/amd/common/block/pi/agesawrapper.c<br>+++ b/src/soc/amd/common/block/pi/agesawrapper.c<br>@@ -26,19 +26,16 @@<br> void __attribute__((weak)) SetMemParams(AMD_POST_PARAMS *PostParams) {}<br> void __attribute__((weak)) OemPostParams(AMD_POST_PARAMS *PostParams) {}<br> <br>-#ifndef __PRE_RAM__<br> /* ACPI table pointers returned by AmdInitLate */<br>-static void *DmiTable;<br>-static void *AcpiPstate;<br>-static void *AcpiSrat;<br>-static void *AcpiSlit;<br>-<br>-static void *AcpiWheaMce;<br>-static void *AcpiWheaCmc;<br>-static void *AcpiAlib;<br>-static void *AcpiIvrs;<br>-static void *AcpiCrat;<br>-#endif /* #ifndef __PRE_RAM__ */<br>+static void *DmiTable CAR_GLOBAL;<br>+static void *AcpiPstate CAR_GLOBAL;<br>+static void *AcpiSrat CAR_GLOBAL;<br>+static void *AcpiSlit CAR_GLOBAL;<br>+static void *AcpiWheaMce CAR_GLOBAL;<br>+static void *AcpiWheaCmc CAR_GLOBAL;<br>+static void *AcpiAlib CAR_GLOBAL;<br>+static void *AcpiIvrs CAR_GLOBAL;<br>+static void *AcpiCrat CAR_GLOBAL;<br> <br> static AGESA_STATUS agesawrapper_readeventlog(UINT8 HeapStatus)<br> {<br>@@ -244,33 +241,31 @@<br> return status;<br> }<br> <br>-#ifndef __PRE_RAM__<br> VOID* agesawrapper_getlateinitptr (int pick)<br> {<br> switch (pick) {<br> case PICK_DMI:<br>- return DmiTable;<br>+ return car_get_var(DmiTable);<br> case PICK_PSTATE:<br>- return AcpiPstate;<br>+ return car_get_var(AcpiPstate);<br> case PICK_SRAT:<br>- return AcpiSrat;<br>+ return car_get_var(AcpiSrat);<br> case PICK_SLIT:<br>- return AcpiSlit;<br>+ return car_get_var(AcpiSlit);<br> case PICK_WHEA_MCE:<br>- return AcpiWheaMce;<br>+ return car_get_var(AcpiWheaMce);<br> case PICK_WHEA_CMC:<br>- return AcpiWheaCmc;<br>+ return car_get_var(AcpiWheaCmc);<br> case PICK_ALIB:<br>- return AcpiAlib;<br>+ return car_get_var(AcpiAlib);<br> case PICK_IVRS:<br>- return AcpiIvrs;<br>+ return car_get_var(AcpiIvrs);<br> case PICK_CRAT:<br>- return AcpiCrat;<br>+ return car_get_var(AcpiCrat);<br> default:<br> return NULL;<br> }<br> }<br>-#endif /* #ifndef __PRE_RAM__ */<br> <br> AGESA_STATUS agesawrapper_amdinitmid(void)<br> {<br>@@ -313,7 +308,6 @@<br> return status;<br> }<br> <br>-#ifndef __PRE_RAM__<br> AGESA_STATUS agesawrapper_amdinitlate(void)<br> {<br> AGESA_STATUS Status;<br>@@ -343,26 +337,24 @@<br> ASSERT(Status == AGESA_SUCCESS);<br> }<br> <br>- DmiTable = AmdLateParams->DmiTable;<br>- AcpiPstate = AmdLateParams->AcpiPState;<br>+ car_set_var(DmiTable, AmdLateParams->DmiTable);<br>+ car_set_var(AcpiPstate, AmdLateParams->AcpiPState);<br>+ car_set_var(AcpiWheaMce, AmdLateParams->AcpiWheaMce);<br>+ car_set_var(AcpiWheaCmc, AmdLateParams->AcpiWheaCmc);<br>+ car_set_var(AcpiAlib, AmdLateParams->AcpiAlib);<br>+ car_set_var(AcpiIvrs, AmdLateParams->AcpiIvrs);<br>+ car_set_var(AcpiCrat, AmdLateParams->AcpiCrat);<br> <br>- AcpiWheaMce = AmdLateParams->AcpiWheaMce;<br>- AcpiWheaCmc = AmdLateParams->AcpiWheaCmc;<br>- AcpiAlib = AmdLateParams->AcpiAlib;<br>- AcpiIvrs = AmdLateParams->AcpiIvrs;<br>- AcpiCrat = AmdLateParams->AcpiCrat;<br>-<br>- printk(BIOS_DEBUG, "DmiTable:%x, AcpiPstatein: %x, AcpiSrat:%x,"<br>- "AcpiSlit:%x, Mce:%x, Cmc:%x,"<br>- "Alib:%x, AcpiIvrs:%x in %s\n",<br>- (unsigned int)DmiTable, (unsigned int)AcpiPstate, (unsigned int)AcpiSrat,<br>- (unsigned int)AcpiSlit, (unsigned int)AcpiWheaMce, (unsigned int)AcpiWheaCmc,<br>- (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);<br>+ printk(BIOS_SPEW, "\tDmiTable %p, AcpiPstatein %p, AcpiSrat %p\n\t"<br>+ "AcpiSlit %p, Mce %p, Cmc %p, Alib %p, AcpiIvrs %p\n",<br>+ car_get_var(DmiTable), car_get_var(AcpiPstate),<br>+ car_get_var(AcpiSrat), car_get_var(AcpiSlit),<br>+ car_get_var(AcpiWheaMce), car_get_var(AcpiWheaCmc),<br>+ car_get_var(AcpiAlib), car_get_var(AcpiIvrs));<br> <br> /* AmdReleaseStruct (&AmdParamStruct); */<br> return Status;<br> }<br>-#endif /* #ifndef __PRE_RAM__ */<br> <br> AGESA_STATUS agesawrapper_amdlaterunaptask (<br> UINT32 Func,<br></pre><p>To view, visit <a href="https://review.coreboot.org/22885">change 22885</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/22885"/><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: I7a35141f212f340c157d57fde8daf93c0c383af8 </div>
<div style="display:none"> Gerrit-Change-Number: 22885 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>