sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jetway/nf81-t56n-lf: Replace AGESA types with stdint types

Browse Source 
Try to use void and uint*_t type specifiers in place of VOID and UINT*
respectively. Use const in place of CONST type modifier. Remove some
useless type casts.
A few unneeded comments containing the AGESA redefenied types are also
removed.

Change-Id: I4bff96a222507fc35333488331c3f35ef1158132
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: http://review.coreboot.org/5486
Tested-by: build bot (Jenkins)
This commit is contained in:
Edward O'Callaghan 2014-04-12 04:12:14 +10:00 committed by Alexandru Gagniuc
parent e2f3bfc5b3
commit c21bd8839b
8 changed files with 186 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
View File

@ -24,6 +24,7 @@
#include <northbridge/amd/agesa/family14/dimmSpd.h> #include <northbridge/amd/agesa/family14/dimmSpd.h>
#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h> #include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
#include <vendorcode/amd/cimx/sb800/SB800.h> #include <vendorcode/amd/cimx/sb800/SB800.h>
#include <stdint.h>
STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] = STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
{ {
@ -76,11 +77,11 @@ STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
}, },
}; };
AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS GetBiosCallout (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
UINTN i; size_t i;
AGESA_STATUS CalloutStatus; AGESA_STATUS CalloutStatus;
UINTN CallOutCount = sizeof (BiosCallouts) / sizeof (BiosCallouts [0]); size_t CallOutCount = sizeof (BiosCallouts) / sizeof (BiosCallouts [0]);
/* /*
* printk(BIOS_SPEW,"%s function: %x\n", __func__, (u32) Func); * printk(BIOS_SPEW,"%s function: %x\n", __func__, (u32) Func);
@ -98,16 +99,16 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
return CalloutStatus; return CalloutStatus;
} }
AGESA_STATUS BiosAllocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosAllocateBuffer (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
UINT32 AvailableHeapSize; uint32_t AvailableHeapSize;
UINT8 *BiosHeapBaseAddr; uint8_t *BiosHeapBaseAddr;
UINT32 CurrNodeOffset; uint32_t CurrNodeOffset;
UINT32 PrevNodeOffset; uint32_t PrevNodeOffset;
UINT32 FreedNodeOffset; uint32_t FreedNodeOffset;
UINT32 BestFitNodeOffset; uint32_t BestFitNodeOffset;
UINT32 BestFitPrevNodeOffset; uint32_t BestFitPrevNodeOffset;
UINT32 NextFreeOffset; uint32_t NextFreeOffset;
BIOS_BUFFER_NODE *CurrNodePtr; BIOS_BUFFER_NODE *CurrNodePtr;
BIOS_BUFFER_NODE *FreedNodePtr; BIOS_BUFFER_NODE *FreedNodePtr;
BIOS_BUFFER_NODE *BestFitNodePtr; BIOS_BUFFER_NODE *BestFitNodePtr;
@ -120,7 +121,7 @@ AGESA_STATUS BiosAllocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
AllocParams->BufferPointer = NULL; AllocParams->BufferPointer = NULL;
AvailableHeapSize = BIOS_HEAP_SIZE - sizeof (BIOS_HEAP_MANAGER); AvailableHeapSize = BIOS_HEAP_SIZE - sizeof (BIOS_HEAP_MANAGER);
BiosHeapBaseAddr = (UINT8 *) GetHeapBase(&(AllocParams->StdHeader)); BiosHeapBaseAddr = (uint8_t *) GetHeapBase(&(AllocParams->StdHeader));
BiosHeapBasePtr = (BIOS_HEAP_MANAGER *) BiosHeapBaseAddr; BiosHeapBasePtr = (BIOS_HEAP_MANAGER *) BiosHeapBaseAddr;
printk(BIOS_SPEW, "%s BiosHeapBaseAddr: %x\n", __func__, (u32) BiosHeapBaseAddr); printk(BIOS_SPEW, "%s BiosHeapBaseAddr: %x\n", __func__, (u32) BiosHeapBaseAddr);
@ -132,7 +133,7 @@ AGESA_STATUS BiosAllocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
CurrNodePtr->BufferHandle = AllocParams->BufferHandle; CurrNodePtr->BufferHandle = AllocParams->BufferHandle;
CurrNodePtr->BufferSize = AllocParams->BufferLength; CurrNodePtr->BufferSize = AllocParams->BufferLength;
CurrNodePtr->NextNodeOffset = 0; CurrNodePtr->NextNodeOffset = 0;
AllocParams->BufferPointer = (UINT8 *) CurrNodePtr + sizeof (BIOS_BUFFER_NODE); AllocParams->BufferPointer = (uint8_t *) CurrNodePtr + sizeof (BIOS_BUFFER_NODE);
/* Update the remaining free space */ /* Update the remaining free space */
FreedNodeOffset = CurrNodeOffset + CurrNodePtr->BufferSize + sizeof (BIOS_BUFFER_NODE); FreedNodeOffset = CurrNodeOffset + CurrNodePtr->BufferSize + sizeof (BIOS_BUFFER_NODE);
@ -222,22 +223,22 @@ AGESA_STATUS BiosAllocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
BestFitNodePtr->NextNodeOffset = 0; BestFitNodePtr->NextNodeOffset = 0;
/* Remove BestFitNode from list of Freed nodes */ /* Remove BestFitNode from list of Freed nodes */
AllocParams->BufferPointer = (UINT8 *) BestFitNodePtr + sizeof (BIOS_BUFFER_NODE); AllocParams->BufferPointer = (uint8_t *) BestFitNodePtr + sizeof (BIOS_BUFFER_NODE);
} }
} }
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }
AGESA_STATUS BiosDeallocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosDeallocateBuffer (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
UINT8 *BiosHeapBaseAddr; uint8_t *BiosHeapBaseAddr;
UINT32 AllocNodeOffset; uint32_t AllocNodeOffset;
UINT32 PrevNodeOffset; uint32_t PrevNodeOffset;
UINT32 NextNodeOffset; uint32_t NextNodeOffset;
UINT32 FreedNodeOffset; uint32_t FreedNodeOffset;
UINT32 EndNodeOffset; uint32_t EndNodeOffset;
BIOS_BUFFER_NODE *AllocNodePtr; BIOS_BUFFER_NODE *AllocNodePtr;
BIOS_BUFFER_NODE *PrevNodePtr; BIOS_BUFFER_NODE *PrevNodePtr;
BIOS_BUFFER_NODE *FreedNodePtr; BIOS_BUFFER_NODE *FreedNodePtr;
@ -247,7 +248,7 @@ AGESA_STATUS BiosDeallocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
AllocParams = (AGESA_BUFFER_PARAMS *) ConfigPtr; AllocParams = (AGESA_BUFFER_PARAMS *) ConfigPtr;
BiosHeapBaseAddr = (UINT8 *) GetHeapBase(&(AllocParams->StdHeader)); BiosHeapBaseAddr = (uint8_t *) GetHeapBase(&(AllocParams->StdHeader));
BiosHeapBasePtr = (BIOS_HEAP_MANAGER *) BiosHeapBaseAddr; BiosHeapBasePtr = (BIOS_HEAP_MANAGER *) BiosHeapBaseAddr;
/* Find target node to deallocate in list of allocated nodes. /* Find target node to deallocate in list of allocated nodes.
@ -271,7 +272,7 @@ AGESA_STATUS BiosDeallocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
PrevNodePtr->NextNodeOffset = AllocNodePtr->NextNodeOffset; PrevNodePtr->NextNodeOffset = AllocNodePtr->NextNodeOffset;
/* Zero out the buffer, and clear the BufferHandle */ /* Zero out the buffer, and clear the BufferHandle */
LibAmdMemFill ((UINT8 *)AllocNodePtr + sizeof (BIOS_BUFFER_NODE), 0, AllocNodePtr->BufferSize, &(AllocParams->StdHeader)); LibAmdMemFill ((uint8_t *)AllocNodePtr + sizeof (BIOS_BUFFER_NODE), 0, AllocNodePtr->BufferSize, &(AllocParams->StdHeader));
AllocNodePtr->BufferHandle = 0; AllocNodePtr->BufferHandle = 0;
AllocNodePtr->BufferSize += sizeof (BIOS_BUFFER_NODE); AllocNodePtr->BufferSize += sizeof (BIOS_BUFFER_NODE);
@ -348,17 +349,17 @@ AGESA_STATUS BiosDeallocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }
AGESA_STATUS BiosLocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosLocateBuffer (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
UINT32 AllocNodeOffset; uint32_t AllocNodeOffset;
UINT8 *BiosHeapBaseAddr; uint8_t *BiosHeapBaseAddr;
BIOS_BUFFER_NODE *AllocNodePtr; BIOS_BUFFER_NODE *AllocNodePtr;
BIOS_HEAP_MANAGER *BiosHeapBasePtr; BIOS_HEAP_MANAGER *BiosHeapBasePtr;
AGESA_BUFFER_PARAMS *AllocParams; AGESA_BUFFER_PARAMS *AllocParams;
AllocParams = (AGESA_BUFFER_PARAMS *) ConfigPtr; AllocParams = (AGESA_BUFFER_PARAMS *) ConfigPtr;
BiosHeapBaseAddr = (UINT8 *) GetHeapBase(&(AllocParams->StdHeader)); BiosHeapBaseAddr = (uint8_t *) GetHeapBase(&(AllocParams->StdHeader));
BiosHeapBasePtr = (BIOS_HEAP_MANAGER *) BiosHeapBaseAddr; BiosHeapBasePtr = (BIOS_HEAP_MANAGER *) BiosHeapBaseAddr;
AllocNodeOffset = BiosHeapBasePtr->StartOfAllocatedNodes; AllocNodeOffset = BiosHeapBasePtr->StartOfAllocatedNodes;
@ -375,14 +376,14 @@ AGESA_STATUS BiosLocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
} }
} }
AllocParams->BufferPointer = (UINT8 *) ((UINT8 *) AllocNodePtr + sizeof (BIOS_BUFFER_NODE)); AllocParams->BufferPointer = (uint8_t *) ((uint8_t *) AllocNodePtr + sizeof (BIOS_BUFFER_NODE));
AllocParams->BufferLength = AllocNodePtr->BufferSize; AllocParams->BufferLength = AllocNodePtr->BufferSize;
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }
AGESA_STATUS BiosRunFuncOnAp (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosRunFuncOnAp (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
AGESA_STATUS Status; AGESA_STATUS Status;
@ -390,11 +391,11 @@ AGESA_STATUS BiosRunFuncOnAp (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
return Status; return Status;
} }
AGESA_STATUS BiosReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosReset (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
AGESA_STATUS Status; AGESA_STATUS Status;
UINT8 Value; uint8_t Value;
UINTN ResetType; uint32_t ResetType;
AMD_CONFIG_PARAMS *StdHeader; AMD_CONFIG_PARAMS *StdHeader;
ResetType = Data; ResetType = Data;
@ -426,7 +427,7 @@ AGESA_STATUS BiosReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
return Status; return Status;
} }
AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosReadSpd (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
AGESA_STATUS Status; AGESA_STATUS Status;
#ifdef __PRE_RAM__ #ifdef __PRE_RAM__
@ -438,17 +439,19 @@ AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
return Status; return Status;
} }
AGESA_STATUS BiosDefaultRet (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosDefaultRet (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
return AGESA_UNSUPPORTED; return AGESA_UNSUPPORTED;
} }
/* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeDQSTraining (UINT32 Func, UINT32 Data, VOID *ConfigPtr) /* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeDQSTraining (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }
/* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr) /* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeDramInit (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
// Unlike e.g. AMD Inagua, Persimmon is unable to vary the RAM voltage. // Unlike e.g. AMD Inagua, Persimmon is unable to vary the RAM voltage.
// Make sure the right speed settings are selected. // Make sure the right speed settings are selected.
@ -456,28 +459,28 @@ AGESA_STATUS BiosHookBeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }
/* Call the host environment interface to provide a user hook opportunity. */ /* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeDramInitRecovery (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosHookBeforeDramInitRecovery (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }
/* Call the host environment interface to provide a user hook opportunity. */ /* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeExitSelfRefresh (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosHookBeforeExitSelfRefresh (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }
/* PCIE slot reset control */ /* PCIE slot reset control */
AGESA_STATUS BiosGnbPcieSlotReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr) AGESA_STATUS BiosGnbPcieSlotReset (uint32_t Func, uint32_t Data, void *ConfigPtr)
{ {
AGESA_STATUS Status; AGESA_STATUS Status;
UINTN FcnData; uint32_t FcnData;
PCIe_SLOT_RESET_INFO *ResetInfo; PCIe_SLOT_RESET_INFO *ResetInfo;
UINT32 GpioMmioAddr; uint32_t GpioMmioAddr;
UINT32 AcpiMmioAddr; uint32_t AcpiMmioAddr;
UINT8 Data8; uint8_t Data8;
UINT16 Data16; uint16_t Data16;
FcnData = Data; FcnData = Data;
ResetInfo = ConfigPtr; ResetInfo = ConfigPtr;
@ -488,7 +491,7 @@ AGESA_STATUS BiosGnbPcieSlotReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
WriteIo8(0xCD6, 0x26); WriteIo8(0xCD6, 0x26);
Data8 = ReadIo8(0xCD7); Data8 = ReadIo8(0xCD7);
Data16|=Data8; Data16|=Data8;
AcpiMmioAddr = (UINT32)Data16 << 16; AcpiMmioAddr = (uint32_t)Data16 << 16;
Status = AGESA_UNSUPPORTED; Status = AGESA_UNSUPPORTED;
GpioMmioAddr = AcpiMmioAddr + GPIO_BASE; GpioMmioAddr = AcpiMmioAddr + GPIO_BASE;
switch (ResetInfo->ResetId) switch (ResetInfo->ResetId)
@ -497,7 +500,7 @@ AGESA_STATUS BiosGnbPcieSlotReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
switch (ResetInfo->ResetControl) { switch (ResetInfo->ResetControl) {
case AssertSlotReset: case AssertSlotReset:
Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG50); Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG50);
Data8 &= ~(UINT8)BIT6 ; Data8 &= ~(uint8_t)BIT6 ;
Write64Mem8(GpioMmioAddr+SB_GPIO_REG50, Data8); Write64Mem8(GpioMmioAddr+SB_GPIO_REG50, Data8);
Status = AGESA_SUCCESS; Status = AGESA_SUCCESS;
break; break;

54
src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.h
View File

@ -23,51 +23,53 @@
#include "Porting.h" #include "Porting.h"
#include "AGESA.h" #include "AGESA.h"
#include <stdint.h>
#define BIOS_HEAP_START_ADDRESS 0x10000 /* HEAP during cold boot */ #define BIOS_HEAP_START_ADDRESS 0x10000 /* HEAP during cold boot */
#define BIOS_HEAP_SIZE 0x20000 #define BIOS_HEAP_SIZE 0x20000
#define BSP_STACK_BASE_ADDR 0x30000 #define BSP_STACK_BASE_ADDR 0x30000
typedef struct _BIOS_HEAP_MANAGER { typedef struct _BIOS_HEAP_MANAGER {
//UINT32 AvailableSize; //uint32_t AvailableSize;
UINT32 StartOfAllocatedNodes; uint32_t StartOfAllocatedNodes;
UINT32 StartOfFreedNodes; uint32_t StartOfFreedNodes;
} BIOS_HEAP_MANAGER; } BIOS_HEAP_MANAGER;
typedef struct _BIOS_BUFFER_NODE { typedef struct _BIOS_BUFFER_NODE {
UINT32 BufferHandle; uint32_t BufferHandle;
UINT32 BufferSize; uint32_t BufferSize;
UINT32 NextNodeOffset; uint32_t NextNodeOffset;
} BIOS_BUFFER_NODE; } BIOS_BUFFER_NODE;
/* /*
* CALLOUTS * CALLOUTS
*/ */
AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS GetBiosCallout (uint32_t Func, uint32_t Data, void *ConfigPtr);
/* REQUIRED CALLOUTS /* REQUIRED CALLOUTS
* AGESA ADVANCED CALLOUTS - CPU * AGESA ADVANCED CALLOUTS - CPU
*/ */
AGESA_STATUS BiosAllocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosAllocateBuffer (uint32_t Func, uint32_t Data, void *ConfigPtr);
AGESA_STATUS BiosDeallocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosDeallocateBuffer (uint32_t Func, uint32_t Data, void *ConfigPtr);
AGESA_STATUS BiosLocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosLocateBuffer (uint32_t Func, uint32_t Data, void *ConfigPtr);
AGESA_STATUS BiosRunFuncOnAp (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosRunFuncOnAp (uint32_t Func, uint32_t Data, void *ConfigPtr);
AGESA_STATUS BiosReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosReset (uint32_t Func, uint32_t Data, void *ConfigPtr);
AGESA_STATUS BiosGetIdsInitData (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosGetIdsInitData (uint32_t Func, uint32_t Data, void *ConfigPtr);
/* AGESA ADVANCED CALLOUTS - MEMORY */ /* AGESA Advanced Callouts - Memory */
AGESA_STATUS BiosReadSpd (UINT32 Func,UINT32 Data,VOID *ConfigPtr); AGESA_STATUS BiosReadSpd (uint32_t Func,uint32_t Data,void *ConfigPtr);
/* BIOS DEFAULT RET */ /* BIOS default RET */
AGESA_STATUS BiosDefaultRet (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosDefaultRet (uint32_t Func, uint32_t Data, void *ConfigPtr);
/* Call the host environment interface to provide a user hook opportunity. */ /* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeDQSTraining (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosHookBeforeDQSTraining (uint32_t Func, uint32_t Data, void *ConfigPtr);
/* Call the host environment interface to provide a user hook opportunity. */ /* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosHookBeforeDramInit (uint32_t Func, uint32_t Data, void *ConfigPtr);
/* Call the host environment interface to provide a user hook opportunity. */ /* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeDramInitRecovery (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosHookBeforeDramInitRecovery (uint32_t Func, uint32_t Data, void *ConfigPtr);
/* Call the host environment interface to provide a user hook opportunity. */ /* Call the host environment interface to provide a user hook opportunity. */
AGESA_STATUS BiosHookBeforeExitSelfRefresh (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosHookBeforeExitSelfRefresh (uint32_t Func, uint32_t Data, void *ConfigPtr);
/* PCIE slot reset control */ /* PCIE slot reset control */
AGESA_STATUS BiosGnbPcieSlotReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS BiosGnbPcieSlotReset (uint32_t Func, uint32_t Data, void *ConfigPtr);
#endif //_BIOS_CALLOUT_H_ #endif //_BIOS_CALLOUT_H_

16
src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c
View File

@ -38,19 +38,13 @@
* @param[in] **PeiServices * @param[in] **PeiServices
* @param[in] *InitEarly * @param[in] *InitEarly
* *
* @retval VOID
*
**/ **/
/*---------------------------------------------------------------------------------------*/ void OemCustomizeInitEarly (IN OUT AMD_EARLY_PARAMS *InitEarly)
VOID
OemCustomizeInitEarly (
IN OUT AMD_EARLY_PARAMS *InitEarly
)
{ {
AGESA_STATUS Status; AGESA_STATUS Status;
VOID *BrazosPcieComplexListPtr; void *BrazosPcieComplexListPtr;
VOID *BrazosPciePortPtr; void *BrazosPciePortPtr;
VOID *BrazosPcieDdiPtr; void *BrazosPcieDdiPtr;
ALLOCATE_HEAP_PARAMS AllocHeapParams; ALLOCATE_HEAP_PARAMS AllocHeapParams;

5
src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcieComplex.h
View File

@ -63,9 +63,6 @@
//3:Half-swing(-3.5db) 4:extended length (-6db) 5:extended length(-8db) //3:Half-swing(-3.5db) 4:extended length (-6db) 5:extended length(-8db)
#define GNB_GPP_PORT8_HOTPLUG_SUPPORT 0 //0:Disable 1:Basic 3:Enhanced #define GNB_GPP_PORT8_HOTPLUG_SUPPORT 0 //0:Disable 1:Basic 3:Enhanced
VOID void OemCustomizeInitEarly (IN OUT AMD_EARLY_PARAMS *InitEarly);
OemCustomizeInitEarly (
IN OUT AMD_EARLY_PARAMS *InitEarly
);
#endif //_PLATFORM_GNB_PCIE_COMPLEX_H #endif //_PLATFORM_GNB_PCIE_COMPLEX_H

4
src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
View File

@ -113,11 +113,11 @@ unsigned long acpi_fill_hest(acpi_hest_t *hest)
addr = agesawrapper_getlateinitptr(PICK_WHEA_MCE); addr = agesawrapper_getlateinitptr(PICK_WHEA_MCE);
if (addr != NULL) if (addr != NULL)
current += acpi_create_hest_error_source(hest, current, 0, (void *)((u32)addr + 2), *(UINT16 *)addr - 2); current += acpi_create_hest_error_source(hest, current, 0, (void *)((u32)addr + 2), *(uint16_t *)addr - 2);
addr = agesawrapper_getlateinitptr(PICK_WHEA_CMC); addr = agesawrapper_getlateinitptr(PICK_WHEA_CMC);
if (addr != NULL) if (addr != NULL)
current += acpi_create_hest_error_source(hest, current, 1, (void *)((u32)addr + 2), *(UINT16 *)addr - 2); current += acpi_create_hest_error_source(hest, current, 1, (void *)((u32)addr + 2), *(uint16_t *)addr - 2);
return (unsigned long)current; return (unsigned long)current;
} }

188
src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c
View File

@ -49,14 +49,14 @@
#define MMCONF_ENABLE 1 #define MMCONF_ENABLE 1
/* ACPI table pointers returned by AmdInitLate */ /* ACPI table pointers returned by AmdInitLate */
VOID *DmiTable = NULL; void *DmiTable = NULL;
VOID *AcpiPstate = NULL; void *AcpiPstate = NULL;
VOID *AcpiSrat = NULL; void *AcpiSrat = NULL;
VOID *AcpiSlit = NULL; void *AcpiSlit = NULL;
VOID *AcpiWheaMce = NULL; void *AcpiWheaMce = NULL;
VOID *AcpiWheaCmc = NULL; void *AcpiWheaCmc = NULL;
VOID *AcpiAlib = NULL; void *AcpiAlib = NULL;
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* T Y P E D E F S A N D S T R U C T U R E S * T Y P E D E F S A N D S T R U C T U R E S
@ -77,7 +77,7 @@ VOID *AcpiAlib = NULL;
* L O C A L F U N C T I O N S * L O C A L F U N C T I O N S
*------------------------------------------------------------------------------ *------------------------------------------------------------------------------
*/ */
uint32_t agesawrapper_amdinitcpuio(void) AGESA_STATUS agesawrapper_amdinitcpuio(void)
{ {
pci_devfn_t dev; pci_devfn_t dev;
msr_t msr; msr_t msr;
@ -112,25 +112,21 @@ uint32_t agesawrapper_amdinitcpuio(void)
return AGESA_SUCCESS; return AGESA_SUCCESS;
} }
UINT32 AGESA_STATUS agesawrapper_amdinitmmio(void)
agesawrapper_amdinitmmio (
VOID
)
{ {
AGESA_STATUS Status; uint64_t MsrReg;
UINT64 MsrReg; uint32_t PciData;
UINT32 PciData;
PCI_ADDR PciAddress; PCI_ADDR PciAddress;
AMD_CONFIG_PARAMS StdHeader; AMD_CONFIG_PARAMS StdHeader;
UINT8 BusRangeVal = 0; uint8_t BusRangeVal = 0;
UINT8 BusNum; uint8_t BusNum;
UINT8 Index; uint8_t Index;
/* /*
Set the MMIO Configuration Base Address and Bus Range onto MMIO configuration base * Set the MMIO Configuration Base Address and Bus Range onto MMIO
Address MSR register. * configuration base Address MSR register.
*/ */
for (Index = 0; Index < 8; Index++) { for (Index = 0; Index < 8; Index++) {
BusNum = CONFIG_MMCONF_BUS_NUMBER >> Index; BusNum = CONFIG_MMCONF_BUS_NUMBER >> Index;
@ -140,7 +136,7 @@ agesawrapper_amdinitmmio (
} }
} }
MsrReg = (CONFIG_MMCONF_BASE_ADDRESS | (UINT64)(BusRangeVal << 2) | MMCONF_ENABLE); MsrReg = (CONFIG_MMCONF_BASE_ADDRESS | (uint64_t)(BusRangeVal << 2) | MMCONF_ENABLE);
LibAmdMsrWrite (0xC0010058, &MsrReg, &StdHeader); LibAmdMsrWrite (0xC0010058, &MsrReg, &StdHeader);
/* /*
@ -158,14 +154,10 @@ agesawrapper_amdinitmmio (
PciData = (AMD_APU_SSID<<0x10)|AMD_APU_SVID; PciData = (AMD_APU_SSID<<0x10)|AMD_APU_SVID;
LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader); LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
Status = AGESA_SUCCESS; return AGESA_SUCCESS;
return (UINT32)Status;
} }
UINT32 AGESA_STATUS agesawrapper_amdinitreset(void)
agesawrapper_amdinitreset (
VOID
)
{ {
AGESA_STATUS status; AGESA_STATUS status;
AMD_INTERFACE_PARAMS AmdParamStruct; AMD_INTERFACE_PARAMS AmdParamStruct;
@ -188,17 +180,15 @@ agesawrapper_amdinitreset (
status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr); status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
AmdReleaseStruct (&AmdParamStruct); AmdReleaseStruct (&AmdParamStruct);
return (UINT32)status;
return status;
} }
UINT32 AGESA_STATUS agesawrapper_amdinitearly(void)
agesawrapper_amdinitearly (
VOID
)
{ {
AGESA_STATUS status; AGESA_STATUS status;
AMD_INTERFACE_PARAMS AmdParamStruct; AMD_INTERFACE_PARAMS AmdParamStruct;
AMD_EARLY_PARAMS *AmdEarlyParamsPtr; AMD_EARLY_PARAMS *AmdEarlyParamsPtr;
memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS)); memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
@ -217,19 +207,19 @@ agesawrapper_amdinitearly (
if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
AmdReleaseStruct (&AmdParamStruct); AmdReleaseStruct (&AmdParamStruct);
return (UINT32)status; return status;
} }
UINT32 GetHeapBase( uint32_t GetHeapBase(
AMD_CONFIG_PARAMS *StdHeader AMD_CONFIG_PARAMS *StdHeader
) )
{ {
UINT32 heap; uint32_t heap;
#if CONFIG_HAVE_ACPI_RESUME #if CONFIG_HAVE_ACPI_RESUME
/* Both romstage and ramstage has this S3 detect. */ /* Both romstage and ramstage has this S3 detect. */
if (acpi_get_sleep_type() == 3) if (acpi_get_sleep_type() == 3)
heap = (UINT32)cbmem_find(CBMEM_ID_RESUME_SCRATCH) + (CONFIG_HIGH_SCRATCH_MEMORY_SIZE - BIOS_HEAP_SIZE); /* himem_heap_base + high_stack_size */ heap = (uint32_t)cbmem_find(CBMEM_ID_RESUME_SCRATCH) + (CONFIG_HIGH_SCRATCH_MEMORY_SIZE - BIOS_HEAP_SIZE); /* himem_heap_base + high_stack_size */
else else
#endif #endif
heap = BIOS_HEAP_START_ADDRESS; /* low mem */ heap = BIOS_HEAP_START_ADDRESS; /* low mem */
@ -237,14 +227,11 @@ UINT32 GetHeapBase(
return heap; return heap;
} }
UINT32 AGESA_STATUS agesawrapper_amdinitpost(void)
agesawrapper_amdinitpost (
VOID
)
{ {
AGESA_STATUS status; AGESA_STATUS status;
UINT16 i; uint16_t i;
UINT32 *HeadPtr; uint32_t *HeadPtr;
AMD_INTERFACE_PARAMS AmdParamStruct; AMD_INTERFACE_PARAMS AmdParamStruct;
BIOS_HEAP_MANAGER *BiosManagerPtr; BIOS_HEAP_MANAGER *BiosManagerPtr;
@ -265,7 +252,7 @@ agesawrapper_amdinitpost (
/* Initialize heap space */ /* Initialize heap space */
BiosManagerPtr = (BIOS_HEAP_MANAGER *)GetHeapBase(&AmdParamStruct.StdHeader); BiosManagerPtr = (BIOS_HEAP_MANAGER *)GetHeapBase(&AmdParamStruct.StdHeader);
HeadPtr = (UINT32 *) ((UINT8 *) BiosManagerPtr + sizeof (BIOS_HEAP_MANAGER)); HeadPtr = (uint32_t *) ((uint8_t *) BiosManagerPtr + sizeof (BIOS_HEAP_MANAGER));
for (i = 0; i < ((BIOS_HEAP_SIZE/4) - (sizeof (BIOS_HEAP_MANAGER)/4)); i++) { for (i = 0; i < ((BIOS_HEAP_SIZE/4) - (sizeof (BIOS_HEAP_MANAGER)/4)); i++) {
*HeadPtr = 0x00000000; *HeadPtr = 0x00000000;
HeadPtr++; HeadPtr++;
@ -273,18 +260,15 @@ agesawrapper_amdinitpost (
BiosManagerPtr->StartOfAllocatedNodes = 0; BiosManagerPtr->StartOfAllocatedNodes = 0;
BiosManagerPtr->StartOfFreedNodes = 0; BiosManagerPtr->StartOfFreedNodes = 0;
return (UINT32)status; return status;
} }
UINT32 AGESA_STATUS agesawrapper_amdinitenv(void)
agesawrapper_amdinitenv (
VOID
)
{ {
AGESA_STATUS status; AGESA_STATUS status;
AMD_INTERFACE_PARAMS AmdParamStruct; AMD_INTERFACE_PARAMS AmdParamStruct;
PCI_ADDR PciAddress; PCI_ADDR PciAddress;
UINT32 PciValue; uint32_t PciValue;
memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS)); memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
@ -371,13 +355,10 @@ agesawrapper_amdinitenv (
LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader);
AmdReleaseStruct (&AmdParamStruct); AmdReleaseStruct (&AmdParamStruct);
return (UINT32)status; return status;
} }
VOID * void * agesawrapper_getlateinitptr(int pick)
agesawrapper_getlateinitptr (
int pick
)
{ {
switch (pick) { switch (pick) {
case PICK_DMI: case PICK_DMI:
@ -399,10 +380,7 @@ agesawrapper_getlateinitptr (
} }
} }
UINT32 AGESA_STATUS agesawrapper_amdinitmid(void)
agesawrapper_amdinitmid (
VOID
)
{ {
AGESA_STATUS status; AGESA_STATUS status;
AMD_INTERFACE_PARAMS AmdParamStruct; AMD_INTERFACE_PARAMS AmdParamStruct;
@ -425,15 +403,12 @@ agesawrapper_amdinitmid (
if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
AmdReleaseStruct (&AmdParamStruct); AmdReleaseStruct (&AmdParamStruct);
return (UINT32)status; return status;
} }
UINT32 AGESA_STATUS agesawrapper_amdinitlate(void)
agesawrapper_amdinitlate (
VOID
)
{ {
AGESA_STATUS Status; AGESA_STATUS status;
AMD_INTERFACE_PARAMS AmdParamStruct; AMD_INTERFACE_PARAMS AmdParamStruct;
AMD_LATE_PARAMS * AmdLateParamsPtr; AMD_LATE_PARAMS * AmdLateParamsPtr;
@ -451,10 +426,10 @@ agesawrapper_amdinitlate (
printk (BIOS_DEBUG, "agesawrapper_amdinitlate: AmdLateParamsPtr = %X\n", (u32)AmdLateParamsPtr); printk (BIOS_DEBUG, "agesawrapper_amdinitlate: AmdLateParamsPtr = %X\n", (u32)AmdLateParamsPtr);
Status = AmdInitLate (AmdLateParamsPtr); status = AmdInitLate (AmdLateParamsPtr);
if (Status != AGESA_SUCCESS) { if (status != AGESA_SUCCESS) {
agesawrapper_amdreadeventlog(); agesawrapper_amdreadeventlog();
ASSERT(Status == AGESA_SUCCESS); ASSERT(status == AGESA_SUCCESS);
} }
DmiTable = AmdLateParamsPtr->DmiTable; DmiTable = AmdLateParamsPtr->DmiTable;
@ -475,14 +450,11 @@ agesawrapper_amdinitlate (
* AmdReleaseStruct (&AmdLateParams); * AmdReleaseStruct (&AmdLateParams);
*/ */
return (UINT32)Status; return status;
} }
#if CONFIG_HAVE_ACPI_RESUME #if CONFIG_HAVE_ACPI_RESUME
UINT32 AGESA_STATUS agesawrapper_amdinitresume(void)
agesawrapper_amdinitresume (
VOID
)
{ {
AGESA_STATUS status; AGESA_STATUS status;
AMD_INTERFACE_PARAMS AmdParamStruct; AMD_INTERFACE_PARAMS AmdParamStruct;
@ -514,15 +486,12 @@ agesawrapper_amdinitresume (
if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
AmdReleaseStruct (&AmdParamStruct); AmdReleaseStruct (&AmdParamStruct);
return (UINT32)status; return status;
} }
UINT32 AGESA_STATUS agesawrapper_amds3laterestore(void)
agesawrapper_amds3laterestore (
VOID
)
{ {
AGESA_STATUS Status; AGESA_STATUS status;
AMD_INTERFACE_PARAMS AmdInterfaceParams; AMD_INTERFACE_PARAMS AmdInterfaceParams;
AMD_S3LATE_PARAMS AmdS3LateParams; AMD_S3LATE_PARAMS AmdS3LateParams;
AMD_S3LATE_PARAMS *AmdS3LateParamsPtr; AMD_S3LATE_PARAMS *AmdS3LateParamsPtr;
@ -547,22 +516,19 @@ agesawrapper_amds3laterestore (
(u32 *) &AmdS3LateParamsPtr->S3DataBlock.VolatileStorageSize, (u32 *) &AmdS3LateParamsPtr->S3DataBlock.VolatileStorageSize,
(void **) &AmdS3LateParamsPtr->S3DataBlock.VolatileStorage); (void **) &AmdS3LateParamsPtr->S3DataBlock.VolatileStorage);
Status = AmdS3LateRestore (AmdS3LateParamsPtr); status = AmdS3LateRestore (AmdS3LateParamsPtr);
if (Status != AGESA_SUCCESS) { if (status != AGESA_SUCCESS) {
agesawrapper_amdreadeventlog(); agesawrapper_amdreadeventlog();
ASSERT(Status == AGESA_SUCCESS); ASSERT(status == AGESA_SUCCESS);
} }
return (UINT32)Status; return status;
} }
#ifndef __PRE_RAM__ #ifndef __PRE_RAM__
UINT32 AGESA_STATUS agesawrapper_amdS3Save(void)
agesawrapper_amdS3Save (
VOID
)
{ {
AGESA_STATUS Status; AGESA_STATUS status;
AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr; AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr;
AMD_INTERFACE_PARAMS AmdInterfaceParams; AMD_INTERFACE_PARAMS AmdInterfaceParams;
S3_DATA_TYPE S3DataType; S3_DATA_TYPE S3DataType;
@ -581,15 +547,15 @@ agesawrapper_amdS3Save (
AmdS3SaveParamsPtr = (AMD_S3SAVE_PARAMS *)AmdInterfaceParams.NewStructPtr; AmdS3SaveParamsPtr = (AMD_S3SAVE_PARAMS *)AmdInterfaceParams.NewStructPtr;
AmdS3SaveParamsPtr->StdHeader = AmdInterfaceParams.StdHeader; AmdS3SaveParamsPtr->StdHeader = AmdInterfaceParams.StdHeader;
Status = AmdS3Save (AmdS3SaveParamsPtr); status = AmdS3Save (AmdS3SaveParamsPtr);
if (Status != AGESA_SUCCESS) { if (status != AGESA_SUCCESS) {
agesawrapper_amdreadeventlog(); agesawrapper_amdreadeventlog();
ASSERT(Status == AGESA_SUCCESS); ASSERT(status == AGESA_SUCCESS);
} }
S3DataType = S3DataTypeNonVolatile; S3DataType = S3DataTypeNonVolatile;
Status = OemAgesaSaveS3Info ( status = OemAgesaSaveS3Info (
S3DataType, S3DataType,
AmdS3SaveParamsPtr->S3DataBlock.NvStorageSize, AmdS3SaveParamsPtr->S3DataBlock.NvStorageSize,
AmdS3SaveParamsPtr->S3DataBlock.NvStorage); AmdS3SaveParamsPtr->S3DataBlock.NvStorage);
@ -597,7 +563,7 @@ agesawrapper_amdS3Save (
if (AmdS3SaveParamsPtr->S3DataBlock.VolatileStorageSize != 0) { if (AmdS3SaveParamsPtr->S3DataBlock.VolatileStorageSize != 0) {
S3DataType = S3DataTypeVolatile; S3DataType = S3DataTypeVolatile;
Status = OemAgesaSaveS3Info ( status = OemAgesaSaveS3Info (
S3DataType, S3DataType,
AmdS3SaveParamsPtr->S3DataBlock.VolatileStorageSize, AmdS3SaveParamsPtr->S3DataBlock.VolatileStorageSize,
AmdS3SaveParamsPtr->S3DataBlock.VolatileStorage AmdS3SaveParamsPtr->S3DataBlock.VolatileStorage
@ -607,19 +573,18 @@ agesawrapper_amdS3Save (
OemAgesaSaveMtrr(); OemAgesaSaveMtrr();
AmdReleaseStruct (&AmdInterfaceParams); AmdReleaseStruct (&AmdInterfaceParams);
return (UINT32)Status; return status;
} }
#endif /* #ifndef __PRE_RAM__ */ #endif /* #ifndef __PRE_RAM__ */
#endif /* CONFIG_HAVE_ACPI_RESUME */ #endif /* CONFIG_HAVE_ACPI_RESUME */
UINT32 AGESA_STATUS agesawrapper_amdlaterunaptask (
agesawrapper_amdlaterunaptask ( uint32_t Func,
UINT32 Func, uint32_t Data,
UINT32 Data, void *ConfigPtr
VOID *ConfigPtr
) )
{ {
AGESA_STATUS Status; AGESA_STATUS status;
AP_EXE_PARAMS ApExeParams; AP_EXE_PARAMS ApExeParams;
memset(&ApExeParams, 0, sizeof(AP_EXE_PARAMS)); memset(&ApExeParams, 0, sizeof(AP_EXE_PARAMS));
@ -631,21 +596,18 @@ agesawrapper_amdlaterunaptask (
ApExeParams.FunctionNumber = Func; ApExeParams.FunctionNumber = Func;
ApExeParams.RelatedDataBlock = ConfigPtr; ApExeParams.RelatedDataBlock = ConfigPtr;
Status = AmdLateRunApTask (&ApExeParams); status = AmdLateRunApTask (&ApExeParams);
if (Status != AGESA_SUCCESS) { if (status != AGESA_SUCCESS) {
agesawrapper_amdreadeventlog(); agesawrapper_amdreadeventlog();
ASSERT(Status == AGESA_SUCCESS); ASSERT(status == AGESA_SUCCESS);
} }
return (UINT32)Status; return status;
} }
UINT32 AGESA_STATUS agesawrapper_amdreadeventlog(void)
agesawrapper_amdreadeventlog (
VOID
)
{ {
AGESA_STATUS Status; AGESA_STATUS status;
EVENT_PARAMS AmdEventParams; EVENT_PARAMS AmdEventParams;
memset(&AmdEventParams, 0, sizeof(EVENT_PARAMS)); memset(&AmdEventParams, 0, sizeof(EVENT_PARAMS));
@ -654,13 +616,13 @@ agesawrapper_amdreadeventlog (
AmdEventParams.StdHeader.CalloutPtr = NULL; AmdEventParams.StdHeader.CalloutPtr = NULL;
AmdEventParams.StdHeader.Func = 0; AmdEventParams.StdHeader.Func = 0;
AmdEventParams.StdHeader.ImageBasePtr = 0; AmdEventParams.StdHeader.ImageBasePtr = 0;
Status = AmdReadEventLog (&AmdEventParams); status = AmdReadEventLog (&AmdEventParams);
while (AmdEventParams.EventClass != 0) { while (AmdEventParams.EventClass != 0) {
printk(BIOS_DEBUG,"\nEventLog: EventClass = %lx, EventInfo = %lx.\n",AmdEventParams.EventClass,AmdEventParams.EventInfo); printk(BIOS_DEBUG,"\nEventLog: EventClass = %lx, EventInfo = %lx.\n",AmdEventParams.EventClass,AmdEventParams.EventInfo);
printk(BIOS_DEBUG," Param1 = %lx, Param2 = %lx.\n",AmdEventParams.DataParam1,AmdEventParams.DataParam2); printk(BIOS_DEBUG," Param1 = %lx, Param2 = %lx.\n",AmdEventParams.DataParam1,AmdEventParams.DataParam2);
printk(BIOS_DEBUG," Param3 = %lx, Param4 = %lx.\n",AmdEventParams.DataParam3,AmdEventParams.DataParam4); printk(BIOS_DEBUG," Param3 = %lx, Param4 = %lx.\n",AmdEventParams.DataParam3,AmdEventParams.DataParam4);
Status = AmdReadEventLog (&AmdEventParams); status = AmdReadEventLog (&AmdEventParams);
} }
return (UINT32)Status; return status;
} }

34
src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h
View File

@ -54,8 +54,8 @@ enum {
*/ */
typedef struct { typedef struct {
UINT32 CalloutName; uint32_t CalloutName;
AGESA_STATUS (*CalloutPtr) (UINT32 Func, UINT32 Data, VOID* ConfigPtr); AGESA_STATUS (*CalloutPtr) (uint32_t Func, uint32_t Data, void* ConfigPtr);
} BIOS_CALLOUT_STRUCT; } BIOS_CALLOUT_STRUCT;
/*---------------------------------------------------------------------------------------- /*----------------------------------------------------------------------------------------
@ -73,23 +73,23 @@ typedef struct {
*--------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------
*/ */
UINT32 agesawrapper_amdinitreset (void); AGESA_STATUS agesawrapper_amdinitreset(void);
UINT32 agesawrapper_amdinitearly (void); AGESA_STATUS agesawrapper_amdinitearly(void);
UINT32 agesawrapper_amdinitenv (void); AGESA_STATUS agesawrapper_amdinitenv(void);
UINT32 agesawrapper_amdinitlate (void); AGESA_STATUS agesawrapper_amdinitlate(void);
UINT32 agesawrapper_amdinitpost (void); AGESA_STATUS agesawrapper_amdinitpost(void);
UINT32 agesawrapper_amdinitmid (void); AGESA_STATUS agesawrapper_amdinitmid(void);
UINT32 agesawrapper_amdreadeventlog (void); AGESA_STATUS agesawrapper_amdreadeventlog(void);
uint32_t agesawrapper_amdinitcpuio (void); AGESA_STATUS agesawrapper_amdinitcpuio(void);
UINT32 agesawrapper_amdinitmmio (void); AGESA_STATUS agesawrapper_amdinitmmio(void);
UINT32 agesawrapper_amdinitresume (void); AGESA_STATUS agesawrapper_amdinitresume(void);
UINT32 agesawrapper_amdS3Save (void); AGESA_STATUS agesawrapper_amdS3Save(void);
UINT32 agesawrapper_amds3laterestore (void); AGESA_STATUS agesawrapper_amds3laterestore(void);
UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS agesawrapper_amdlaterunaptask(uint32_t, uint32_t, void *);
void *agesawrapper_getlateinitptr (int pick); void * agesawrapper_getlateinitptr(int);
UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader); uint32_t GetHeapBase(AMD_CONFIG_PARAMS *StdHeader);
#endif #endif

22
src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
View File

@ -240,7 +240,7 @@
*/ */
/* The fixed MTRR values to be set after memory initialization. */ /* The fixed MTRR values to be set after memory initialization. */
CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] = const AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
{ {
{ AMD_AP_MTRR_FIX64k_00000, 0x1E1E1E1E1E1E1E1Eull }, { AMD_AP_MTRR_FIX64k_00000, 0x1E1E1E1E1E1E1E1Eull },
{ AMD_AP_MTRR_FIX16k_80000, 0x1E1E1E1E1E1E1E1Eull }, { AMD_AP_MTRR_FIX16k_80000, 0x1E1E1E1E1E1E1E1Eull },
@ -327,7 +327,7 @@ CONST AP_MTRR_SETTINGS ROMDATA OntarioApMtrrSettingsList[] =
* is populated, AGESA will base its settings on the data from the table. Otherwise, it will * is populated, AGESA will base its settings on the data from the table. Otherwise, it will
* use its default conservative settings. * use its default conservative settings.
*/ */
CONST PSO_ENTRY ROMDATA DefaultPlatformMemoryConfiguration[] = { const PSO_ENTRY ROMDATA DefaultPlatformMemoryConfiguration[] = {
// //
// The following macros are supported (use comma to separate macros): // The following macros are supported (use comma to separate macros):
// //
@ -391,7 +391,7 @@ CONST PSO_ENTRY ROMDATA DefaultPlatformMemoryConfiguration[] = {
//DA Customer table //DA Customer table
CONST UINT8 AGESA_MEM_TABLE_ON[][sizeof (MEM_TABLE_ALIAS)] = const uint8_t AGESA_MEM_TABLE_ON[][sizeof (MEM_TABLE_ALIAS)] =
{ {
// Hardcoded Memory Training Values // Hardcoded Memory Training Values
@ -433,18 +433,4 @@ CONST UINT8 AGESA_MEM_TABLE_ON[][sizeof (MEM_TABLE_ALIAS)] =
// TABLE END // TABLE END
NBACCESS (MTEnd, 0, 0, 0, 0, 0), // End of Table NBACCESS (MTEnd, 0, 0, 0, 0, 0), // End of Table
}; };
CONST UINT8 SizeOfTableON = sizeof (AGESA_MEM_TABLE_ON) / sizeof (AGESA_MEM_TABLE_ON[0]); const uint8_t SizeOfTableON = sizeof (AGESA_MEM_TABLE_ON) / sizeof (AGESA_MEM_TABLE_ON[0]);
/* ***************************************************************************
* Optional User code to be included into the AGESA build
* These may be 32-bit call-out routines...
*/
//AGESA_STATUS
//AgesaReadSpd (
// IN UINTN FcnData,
// IN OUT AGESA_READ_SPD_PARAMS *ReadSpd
// )
//{
// /* platform code to read an SPD... */
// return Status;
//}