<p>Richard Spiegel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29520">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd: Convert from AMD units to coreboot units<br><br>There are several files under soc/amd that use units defined by file<br>porting.h. These units use upper case, and are not recognized by checkpatch,<br>thus causing problems when defining a pointer (request to use space before<br>and after the star symbol). These are the definitions from porting.h showing<br>the units that this patch will change and their coreboot definitions (not all<br>are actually used):<br> typedef uintptr_t UINTN;<br> typedef int64_t INT64;<br> typedef uint64_t UINT64;<br> typedef int32_t INT32;<br> typedef uint32_t UINT32;<br> typedef int16_t INT16;<br> typedef uint16_t UINT16;<br> typedef int8_t INT8;<br> typedef uint8_t UINT8;<br> typedef char CHAR8;<br> typedef unsigned short CHAR16;<br> typedef unsigned char BOOLEAN;<br> typedef void VOID;<br><br>BUG=b:118775313<br>TEST=Build and boot grunt.<br><br>Change-Id: Ic1bd64d6224a030a65d23decabf0e602cee02871<br>Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com><br>---<br>M src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h<br>M src/soc/amd/common/block/include/amdblocks/agesawrapper.h<br>M src/soc/amd/common/block/pi/agesawrapper.c<br>M src/soc/amd/common/block/pi/def_callouts.c<br>M src/soc/amd/common/block/pi/heapmanager.c<br>M src/soc/amd/stoneyridge/BiosCallOuts.c<br>M src/soc/amd/stoneyridge/northbridge.c<br>7 files changed, 119 insertions(+), 102 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/29520/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h</span><br><span>index 3d5ae8f..829630b 100644</span><br><span>--- a/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h</span><br><span>+++ b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h</span><br><span>@@ -23,51 +23,59 @@</span><br><span> #define BSP_STACK_BASE_ADDR 0x30000</span><br><span> </span><br><span> typedef struct _BIOS_HEAP_MANAGER {</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 StartOfAllocatedNodes;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 StartOfFreedNodes;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t StartOfAllocatedNodes;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t StartOfFreedNodes;</span><br><span> } BIOS_HEAP_MANAGER;</span><br><span> </span><br><span> typedef struct _BIOS_BUFFER_NODE {</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 BufferHandle;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 BufferSize;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 NextNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t BufferHandle;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t BufferSize;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t NextNodeOffset;</span><br><span> } BIOS_BUFFER_NODE;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_GetTempHeapBase(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_HeapRebase(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_GetTempHeapBase(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_HeapRebase(uint32_t Func, uintptr_t Data, void *ConfigPtr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_AllocateBuffer(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_DeallocateBuffer(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_LocateBuffer(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_AllocateBuffer(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_DeallocateBuffer(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_LocateBuffer(uint32_t Func, uintptr_t Data, void *ConfigPtr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_NoopUnsupported(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_NoopSuccess(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_EmptyIdsInitData(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_Reset(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_RunFuncOnAp(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_GfxGetVbiosImage(UINT32 Func, UINTN FchData,</span><br><span style="color: hsl(0, 100%, 40%);">- VOID *ConfigPrt);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_NoopUnsupported(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_NoopSuccess(uint32_t Func, uintptr_t Data, void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_EmptyIdsInitData(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_Reset(uint32_t Func, uintptr_t Data, void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_RunFuncOnAp(uint32_t Func, uintptr_t Data, void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_GfxGetVbiosImage(uint32_t Func, uintptr_t FchData,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPrt);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_ReadSpd(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_RunFcnOnAllAps(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_PcieSlotResetControl(UINT32 Func, UINTN Data,</span><br><span style="color: hsl(0, 100%, 40%);">- VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_WaitForAllApsFinished(UINT32 Func, UINTN Data,</span><br><span style="color: hsl(0, 100%, 40%);">- VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_IdleAnAp(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_ReadSpd(uint32_t Func, uintptr_t Data, void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_RunFcnOnAllAps(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_PcieSlotResetControl(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_WaitForAllApsFinished(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_IdleAnAp(uint32_t Func, uintptr_t Data, void *ConfigPtr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS GetBiosCallout(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS GetBiosCallout(uint32_t Func, uintptr_t Data, void *ConfigPtr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_fch_initreset(UINT32 Func, UINTN FchData, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_fch_initenv(UINT32 Func, UINTN FchData, VOID *ConfigPtr);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_HaltThisAp(UINT32 Func, UINTN Data, VOID *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_fch_initreset(uint32_t Func, uintptr_t FchData,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_fch_initenv(uint32_t Func, uintptr_t FchData,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_HaltThisAp(uint32_t Func, uintptr_t Data, void *ConfigPtr);</span><br><span> </span><br><span> void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset);</span><br><span> void platform_FchParams_env(FCH_DATA_BLOCK *FchParams_env);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS platform_PcieSlotResetControl(UINT32 Func, UINTN Data,</span><br><span style="color: hsl(0, 100%, 40%);">- VOID *ConfigPtr);</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS platform_PcieSlotResetControl(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr);</span><br><span> typedef struct {</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 CalloutName;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t CalloutName;</span><br><span> CALLOUT_ENTRY CalloutPtr;</span><br><span> } BIOS_CALLOUT_STRUCT;</span><br><span> </span><br><span>diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h</span><br><span>index 713f76c..a48a535 100644</span><br><span>--- a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h</span><br><span>+++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h</span><br><span>@@ -41,7 +41,7 @@</span><br><span> AGESA_STATUS agesawrapper_amdinitpost(void);</span><br><span> AGESA_STATUS agesawrapper_amdinitmid(void);</span><br><span> void *agesawrapper_getlateinitptr(int pick);</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesawrapper_amdlaterunaptask(UINT32 Func, UINTN Data,</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesawrapper_amdlaterunaptask(uint32_t Func, uintptr_t Data,</span><br><span> void *ConfigPtr);</span><br><span> AGESA_STATUS agesawrapper_amdinitrtb(void);</span><br><span> AGESA_STATUS agesawrapper_amdinitresume(void);</span><br><span>@@ -51,9 +51,9 @@</span><br><span> AGESA_STATUS agesawrapper_fchs3earlyrestore(void);</span><br><span> AGESA_STATUS agesawrapper_fchs3laterestore(void);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-VOID OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly);</span><br><span style="color: hsl(0, 100%, 40%);">-VOID amd_initcpuio(void);</span><br><span style="color: hsl(0, 100%, 40%);">-const void *agesawrapper_locate_module(const CHAR8 name[8]);</span><br><span style="color: hsl(120, 100%, 40%);">+void OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly);</span><br><span style="color: hsl(120, 100%, 40%);">+void amd_initcpuio(void);</span><br><span style="color: hsl(120, 100%, 40%);">+const void *agesawrapper_locate_module(const char name[8]);</span><br><span> </span><br><span> void SetFchResetParams(FCH_RESET_INTERFACE *params);</span><br><span> void OemPostParams(AMD_POST_PARAMS *PostParams);</span><br><span>diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>index 181eafd..9c10fec 100644</span><br><span>--- a/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>+++ b/src/soc/amd/common/block/pi/agesawrapper.c</span><br><span>@@ -49,7 +49,7 @@</span><br><span> static void *AcpiIvrs;</span><br><span> static void *AcpiCrat;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static AGESA_STATUS agesawrapper_readeventlog(UINT8 HeapStatus)</span><br><span style="color: hsl(120, 100%, 40%);">+static AGESA_STATUS agesawrapper_readeventlog(uint8_t HeapStatus)</span><br><span> {</span><br><span> AGESA_STATUS Status;</span><br><span> EVENT_PARAMS AmdEventParams = {</span><br><span>@@ -190,7 +190,7 @@</span><br><span> </span><br><span> PostParams->MemConfig.UmaMode = CONFIG_GFXUMA ? UMA_AUTO : UMA_NONE;</span><br><span> PostParams->MemConfig.UmaSize = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- PostParams->MemConfig.BottomIo = (UINT16)</span><br><span style="color: hsl(120, 100%, 40%);">+ PostParams->MemConfig.BottomIo = (uint16_t)</span><br><span> (CONFIG_BOTTOMIO_POSITION >> 24);</span><br><span> </span><br><span> SetMemParams(PostParams);</span><br><span>@@ -257,7 +257,7 @@</span><br><span> return status;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-VOID *agesawrapper_getlateinitptr(int pick)</span><br><span style="color: hsl(120, 100%, 40%);">+void *agesawrapper_getlateinitptr(int pick)</span><br><span> {</span><br><span> switch (pick) {</span><br><span> case PICK_DMI:</span><br><span>@@ -326,7 +326,8 @@</span><br><span> </span><br><span> const struct device *dev = dev_find_slot(0, IOMMU_DEVFN);</span><br><span> if (dev && dev->enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- LateParams->GnbLateConfiguration.GnbIoapicId = CONFIG_MAX_CPUS + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ LateParams->GnbLateConfiguration.GnbIoapicId = CONFIG_MAX_CPUS</span><br><span style="color: hsl(120, 100%, 40%);">+ + 1;</span><br><span> LateParams->GnbLateConfiguration.FchIoapicId = CONFIG_MAX_CPUS;</span><br><span> }</span><br><span> </span><br><span>@@ -359,8 +360,8 @@</span><br><span> return Status;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesawrapper_amdlaterunaptask(UINT32 Func, UINTN Data,</span><br><span style="color: hsl(0, 100%, 40%);">- VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesawrapper_amdlaterunaptask(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> AGESA_STATUS Status;</span><br><span> AP_EXE_PARAMS ApExeParams;</span><br><span>@@ -585,7 +586,7 @@</span><br><span> return CONFIG_AGESA_POST_MEMORY_CBFS_NAME;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const void *agesawrapper_locate_module(const CHAR8 name[8])</span><br><span style="color: hsl(120, 100%, 40%);">+const void *agesawrapper_locate_module(const char name[8])</span><br><span> {</span><br><span> const void *agesa;</span><br><span> const AMD_IMAGE_HEADER *image;</span><br><span>@@ -627,7 +628,7 @@</span><br><span> MODULE_ENTRY agesa_get_dispatcher(void)</span><br><span> {</span><br><span> const AMD_MODULE_HEADER *module;</span><br><span style="color: hsl(0, 100%, 40%);">- static const CHAR8 id[8] = AGESA_ID;</span><br><span style="color: hsl(120, 100%, 40%);">+ static const char id[8] = AGESA_ID;</span><br><span> MODULE_ENTRY val = car_get_var(agesa_dispatcher);</span><br><span> </span><br><span> if (val != NULL)</span><br><span>diff --git a/src/soc/amd/common/block/pi/def_callouts.c b/src/soc/amd/common/block/pi/def_callouts.c</span><br><span>index 60bfad1..0fffaf3 100644</span><br><span>--- a/src/soc/amd/common/block/pi/def_callouts.c</span><br><span>+++ b/src/soc/amd/common/block/pi/def_callouts.c</span><br><span>@@ -74,9 +74,9 @@</span><br><span> </span><br><span> const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS GetBiosCallout(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS GetBiosCallout(uint32_t Func, uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- UINTN i;</span><br><span style="color: hsl(120, 100%, 40%);">+ uintptr_t i;</span><br><span> </span><br><span> for (i = 0 ; i < BiosCalloutsLen ; i++) {</span><br><span> if (BiosCallouts[i].CalloutName == Func)</span><br><span>@@ -92,17 +92,19 @@</span><br><span> return BiosCallouts[i].CalloutPtr(Func, Data, ConfigPtr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_NoopUnsupported(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_NoopUnsupported(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> return AGESA_UNSUPPORTED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_NoopSuccess(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_NoopSuccess(uint32_t Func, uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span> return AGESA_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_EmptyIdsInitData(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_EmptyIdsInitData(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> IDS_NV_ITEM *IdsPtr = ((IDS_CALLOUT_STRUCT *) ConfigPtr)->IdsNvPtr;</span><br><span> if (Data == IDS_CALLOUT_INIT)</span><br><span>@@ -110,10 +112,10 @@</span><br><span> return AGESA_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_Reset(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_Reset(uint32_t Func, uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span> AGESA_STATUS Status;</span><br><span style="color: hsl(0, 100%, 40%);">- UINTN ResetType;</span><br><span style="color: hsl(120, 100%, 40%);">+ uintptr_t ResetType;</span><br><span> AMD_CONFIG_PARAMS *StdHeader;</span><br><span> </span><br><span> ResetType = Data;</span><br><span>@@ -143,8 +145,8 @@</span><br><span> return Status;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_GfxGetVbiosImage(UINT32 Func, UINTN FchData,</span><br><span style="color: hsl(0, 100%, 40%);">- VOID *ConfigPrt)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_GfxGetVbiosImage(uint32_t Func, uintptr_t FchData,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPrt)</span><br><span> {</span><br><span> GFX_VBIOS_IMAGE_INFO *pVbiosImageInfo;</span><br><span> </span><br><span>@@ -157,16 +159,16 @@</span><br><span> return pVbiosImageInfo->ImagePtr ? AGESA_SUCCESS : AGESA_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS __weak platform_PcieSlotResetControl(UINT32 Func,</span><br><span style="color: hsl(0, 100%, 40%);">- UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS __weak platform_PcieSlotResetControl(uint32_t Func,</span><br><span style="color: hsl(120, 100%, 40%);">+ uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span> printk(BIOS_WARNING, "Warning - AGESA callout: %s not supported\n",</span><br><span> __func__);</span><br><span> return AGESA_UNSUPPORTED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_PcieSlotResetControl(UINT32 Func, UINTN Data,</span><br><span style="color: hsl(0, 100%, 40%);">- VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_PcieSlotResetControl(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> return platform_PcieSlotResetControl(Func, Data, ConfigPtr);</span><br><span> }</span><br><span>@@ -184,9 +186,9 @@</span><br><span> * Passed from the AGESA_Callout for the agesawrapper_amdlaterunaptask.</span><br><span> */</span><br><span> static struct agesa_data {</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 Func;</span><br><span style="color: hsl(0, 100%, 40%);">- UINTN Data;</span><br><span style="color: hsl(0, 100%, 40%);">- VOID *ConfigPtr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t Func;</span><br><span style="color: hsl(120, 100%, 40%);">+ uintptr_t Data;</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr;</span><br><span> } agesadata;</span><br><span> </span><br><span> /*</span><br><span>@@ -213,7 +215,7 @@</span><br><span> lapicid(), decodeAGESA_STATUS(Status));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_RunFuncOnAp(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_RunFuncOnAp(uint32_t Func, uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span> printk(BIOS_DEBUG, "%s\n", __func__);</span><br><span> </span><br><span>@@ -226,7 +228,8 @@</span><br><span> return AGESA_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_RunFcnOnAllAps(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_RunFcnOnAllAps(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> printk(BIOS_DEBUG, "%s\n", __func__);</span><br><span> </span><br><span>@@ -239,8 +242,8 @@</span><br><span> return AGESA_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_WaitForAllApsFinished(UINT32 Func, UINTN Data,</span><br><span style="color: hsl(0, 100%, 40%);">- VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_WaitForAllApsFinished(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> printk(BIOS_WARNING, "Warning - AGESA callout: %s not supported\n",</span><br><span> __func__);</span><br><span>@@ -249,7 +252,7 @@</span><br><span> return Status;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_IdleAnAp(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_IdleAnAp(uint32_t Func, uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span> printk(BIOS_WARNING, "Warning - AGESA callout: %s no supported\n",</span><br><span> __func__);</span><br><span>diff --git a/src/soc/amd/common/block/pi/heapmanager.c b/src/soc/amd/common/block/pi/heapmanager.c</span><br><span>index e6a0c46..683a572 100644</span><br><span>--- a/src/soc/amd/common/block/pi/heapmanager.c</span><br><span>+++ b/src/soc/amd/common/block/pi/heapmanager.c</span><br><span>@@ -44,7 +44,8 @@</span><br><span> * Status Indicates whether TempHeapAddress was successfully</span><br><span> * set.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_GetTempHeapBase(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_GetTempHeapBase(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> AGESA_TEMP_HEAP_BASE_PARAMS *pTempHeapBase;</span><br><span> </span><br><span>@@ -67,12 +68,12 @@</span><br><span> * Status Indicates whether HeapAddress was successfully</span><br><span> * set.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_HeapRebase(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_HeapRebase(uint32_t Func, uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span> AGESA_REBASE_PARAMS *Rebase;</span><br><span> </span><br><span> Rebase = (AGESA_REBASE_PARAMS *)ConfigPtr;</span><br><span style="color: hsl(0, 100%, 40%);">- Rebase->HeapAddress = (UINTN)agesa_heap_base();</span><br><span style="color: hsl(120, 100%, 40%);">+ Rebase->HeapAddress = (uintptr_t)agesa_heap_base();</span><br><span> if (!Rebase->HeapAddress)</span><br><span> Rebase->HeapAddress = CONFIG_PI_AGESA_CAR_HEAP_BASE;</span><br><span> </span><br><span>@@ -94,8 +95,8 @@</span><br><span> static AGESA_STATUS FindAllocatedNode(uint32_t handle,</span><br><span> BIOS_BUFFER_NODE **last_allocd_or_match)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 AllocNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT8 *BiosHeapBaseAddr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t AllocNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *BiosHeapBaseAddr;</span><br><span> BIOS_BUFFER_NODE *AllocNodePtr;</span><br><span> BIOS_HEAP_MANAGER *BiosHeapBasePtr;</span><br><span> AGESA_STATUS Status = AGESA_SUCCESS;</span><br><span>@@ -141,7 +142,8 @@</span><br><span> </span><br><span> ROMSTAGE_CBMEM_INIT_HOOK(EmptyHeap)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_AllocateBuffer (UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_AllocateBuffer(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> /*</span><br><span> * Size variables explanation:</span><br><span>@@ -155,17 +157,17 @@</span><br><span> * down into 2 nodes, once a node is selected as</span><br><span> * the best fit.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 AvailableHeapSize;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT8 *BiosHeapBaseAddr;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 CurrNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 PrevNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 FreedNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 FreedNodeSize;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 BestFitNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 BestFitNodeSize;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 BestFitPrevNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 NextFreeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 MinimumSize;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t AvailableHeapSize;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *BiosHeapBaseAddr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t CurrNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t PrevNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t FreedNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t FreedNodeSize;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t BestFitNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t BestFitNodeSize;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t BestFitPrevNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t NextFreeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t MinimumSize;</span><br><span> BIOS_BUFFER_NODE *CurrNodePtr;</span><br><span> BIOS_BUFFER_NODE *FreedNodePtr;</span><br><span> BIOS_BUFFER_NODE *BestFitNodePtr;</span><br><span>@@ -192,7 +194,7 @@</span><br><span> CurrNodePtr->BufferHandle = AllocParams->BufferHandle;</span><br><span> CurrNodePtr->BufferSize = AllocParams->BufferLength;</span><br><span> CurrNodePtr->NextNodeOffset = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- AllocParams->BufferPointer = (UINT8 *)CurrNodePtr</span><br><span style="color: hsl(120, 100%, 40%);">+ AllocParams->BufferPointer = (uint8_t *)CurrNodePtr</span><br><span> + sizeof(BIOS_BUFFER_NODE);</span><br><span> </span><br><span> /* Update the remaining free space */</span><br><span>@@ -309,22 +311,23 @@</span><br><span> BestFitNodePtr->BufferHandle = AllocParams->BufferHandle;</span><br><span> BestFitNodePtr->NextNodeOffset = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- AllocParams->BufferPointer = (UINT8 *)BestFitNodePtr +</span><br><span style="color: hsl(120, 100%, 40%);">+ AllocParams->BufferPointer = (uint8_t *)BestFitNodePtr +</span><br><span> sizeof(BIOS_BUFFER_NODE);</span><br><span> }</span><br><span> </span><br><span> return AGESA_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_DeallocateBuffer (UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_DeallocateBuffer(uint32_t Func, uintptr_t Data,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- UINT8 *BiosHeapBaseAddr;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 AllocNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 PrevNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 NextNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 FreedNodeOffset;</span><br><span style="color: hsl(0, 100%, 40%);">- UINT32 EndNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *BiosHeapBaseAddr;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t AllocNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t PrevNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t NextNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t FreedNodeOffset;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t EndNodeOffset;</span><br><span> BIOS_BUFFER_NODE *AllocNodePtr;</span><br><span> BIOS_BUFFER_NODE *PrevNodePtr;</span><br><span> BIOS_BUFFER_NODE *FreedNodePtr;</span><br><span>@@ -358,7 +361,7 @@</span><br><span> PrevNodePtr->NextNodeOffset = AllocNodePtr->NextNodeOffset;</span><br><span> </span><br><span> /* Zero out the buffer, and clear the BufferHandle */</span><br><span style="color: hsl(0, 100%, 40%);">- memset((UINT8 *)AllocNodePtr + sizeof(BIOS_BUFFER_NODE), 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ memset((uint8_t *)AllocNodePtr + sizeof(BIOS_BUFFER_NODE), 0,</span><br><span> AllocNodePtr->BufferSize);</span><br><span> AllocNodePtr->BufferHandle = 0;</span><br><span> </span><br><span>@@ -429,7 +432,7 @@</span><br><span> return AGESA_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_LocateBuffer (UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_LocateBuffer(uint32_t Func, uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span> BIOS_BUFFER_NODE *AllocNodePtr;</span><br><span> AGESA_BUFFER_PARAMS *AllocParams;</span><br><span>@@ -440,7 +443,7 @@</span><br><span> Status = FindAllocatedNode(AllocParams->BufferHandle, &AllocNodePtr);</span><br><span> </span><br><span> if (Status == AGESA_SUCCESS) {</span><br><span style="color: hsl(0, 100%, 40%);">- AllocParams->BufferPointer = (UINT8 *)((UINT8 *)AllocNodePtr</span><br><span style="color: hsl(120, 100%, 40%);">+ AllocParams->BufferPointer = (uint8_t *)((uint8_t *)AllocNodePtr</span><br><span> + sizeof(BIOS_BUFFER_NODE));</span><br><span> AllocParams->BufferLength = AllocNodePtr->BufferSize;</span><br><span> }</span><br><span>diff --git a/src/soc/amd/stoneyridge/BiosCallOuts.c b/src/soc/amd/stoneyridge/BiosCallOuts.c</span><br><span>index 5e6c899..fdef166 100644</span><br><span>--- a/src/soc/amd/stoneyridge/BiosCallOuts.c</span><br><span>+++ b/src/soc/amd/stoneyridge/BiosCallOuts.c</span><br><span>@@ -27,10 +27,10 @@</span><br><span> #include "chip.h"</span><br><span> #include <amdblocks/car.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void __weak platform_FchParams_reset(</span><br><span style="color: hsl(0, 100%, 40%);">- FCH_RESET_DATA_BLOCK *FchParams_reset) {}</span><br><span style="color: hsl(120, 100%, 40%);">+void __weak platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset) {}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_fch_initreset(UINT32 Func, UINTN FchData, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_fch_initreset(uint32_t Func, uintptr_t FchData,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> AMD_CONFIG_PARAMS *StdHeader = ConfigPtr;</span><br><span> </span><br><span>@@ -48,7 +48,8 @@</span><br><span> return AGESA_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_fch_initenv(UINT32 Func, UINTN FchData, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_fch_initenv(uint32_t Func, uintptr_t FchData,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ConfigPtr)</span><br><span> {</span><br><span> AMD_CONFIG_PARAMS *StdHeader = ConfigPtr;</span><br><span> const struct device *dev = dev_find_slot(0, SATA_DEVFN);</span><br><span>@@ -92,7 +93,7 @@</span><br><span> return AGESA_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_ReadSpd(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_ReadSpd(uint32_t Func, uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span> uint8_t spd_address;</span><br><span> int err;</span><br><span>@@ -137,7 +138,7 @@</span><br><span> return AGESA_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AGESA_STATUS agesa_HaltThisAp(UINT32 Func, UINTN Data, VOID *ConfigPtr)</span><br><span style="color: hsl(120, 100%, 40%);">+AGESA_STATUS agesa_HaltThisAp(uint32_t Func, uintptr_t Data, void *ConfigPtr)</span><br><span> {</span><br><span> AGESA_HALT_THIS_AP_PARAMS *info = ConfigPtr;</span><br><span> uint32_t flags = 0;</span><br><span>diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c</span><br><span>index d7a20a3..9c52297 100644</span><br><span>--- a/src/soc/amd/stoneyridge/northbridge.c</span><br><span>+++ b/src/soc/amd/stoneyridge/northbridge.c</span><br><span>@@ -86,7 +86,8 @@</span><br><span> res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_resource(struct device *dev, struct resource *resource, u32 nodeid)</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_resource(struct device *dev, struct resource *resource,</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 nodeid)</span><br><span> {</span><br><span> resource_t rbase, rend;</span><br><span> unsigned int reg, link_num;</span><br><span>@@ -187,12 +188,12 @@</span><br><span> addr = agesawrapper_getlateinitptr(PICK_WHEA_MCE);</span><br><span> if (addr != NULL)</span><br><span> current += acpi_create_hest_error_source(hest, current, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- (void *)((u32)addr + 2), *(UINT16 *)addr - 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ (void *)((u32)addr + 2), *(uint16_t *)addr - 2);</span><br><span> </span><br><span> addr = agesawrapper_getlateinitptr(PICK_WHEA_CMC);</span><br><span> if (addr != NULL)</span><br><span> current += acpi_create_hest_error_source(hest, current, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- (void *)((u32)addr + 2), *(UINT16 *)addr - 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ (void *)((u32)addr + 2), *(uint16_t *)addr - 2);</span><br><span> </span><br><span> return (unsigned long)current;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29520">change 29520</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/29520"/><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: Ic1bd64d6224a030a65d23decabf0e602cee02871 </div>
<div style="display:none"> Gerrit-Change-Number: 29520 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Spiegel <richard.spiegel@silverbackltd.com> </div>