[coreboot-gerrit] Patch set updated for coreboot: 077599a jetway/nf81-t56n-lf: Use std memset/memcpy func over AGESA

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Fri Apr 11 15:04:01 CEST 2014


Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5484

-gerrit

commit 077599a37214f06b28e6c57c4ae8069acc56f614
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Fri Apr 11 12:56:13 2014 +1000

    jetway/nf81-t56n-lf: Use std memset/memcpy func over AGESA
    
    NOTFORMERGE.
    
    Replace usage of AGESA poor reinvention of memset/memcpy functions with
    the usual standard ones.
    
    Change-Id: Ibfe9ee253d57140b06a4fca6b47b2051308ad012
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 .../jetway/nf81-t56n-lf/PlatformGnbPcie.c          | 26 +++-----
 src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c   | 76 ++++++++--------------
 2 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c b/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c
index f60bc8f..f44bc49 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c
@@ -21,6 +21,8 @@
 #include "PlatformGnbPcieComplex.h"
 #include "BiosCallOuts.h"
 
+#include <assert.h>
+#include <string.h>
 #include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
 
 #define FILECODE PROC_RECOVERY_MEM_NB_ON_MRNON_FILECODE
@@ -167,25 +169,15 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {
 	AllocHeapParams.BufferPtr += sizeof(PortList);
 	BrazosPcieDdiPtr = (PCIe_DDI_DESCRIPTOR *) AllocHeapParams.BufferPtr;
 
-	LibAmdMemFill(BrazosPcieComplexListPtr,
-				 0,
-				 sizeof(Brazos),
-				 &InitEarly->StdHeader);
+	ASSERT(&(InitEarly->StdHeader) != NULL);
 
-	LibAmdMemFill(BrazosPciePortPtr,
-				 0,
-				 sizeof(PortList),
-				 &InitEarly->StdHeader);
-
-	LibAmdMemFill(BrazosPcieDdiPtr,
-				 0,
-				 sizeof(DdiList),
-				 &InitEarly->StdHeader);
-
-	LibAmdMemCopy(BrazosPcieComplexListPtr, &Brazos, sizeof(Brazos), &InitEarly->StdHeader);
-	LibAmdMemCopy(BrazosPciePortPtr, &PortList[0], sizeof(PortList), &InitEarly->StdHeader);
-	LibAmdMemCopy(BrazosPcieDdiPtr, &DdiList[0], sizeof(DdiList), &InitEarly->StdHeader);
+	memset(&BrazosPcieComplexListPtr, 0, sizeof(Brazos));
+	memset(&BrazosPciePortPtr, 0, sizeof(PortList));
+	memset(&BrazosPcieDdiPtr, 0, sizeof(DdiList));
 
+	memcpy(BrazosPcieComplexListPtr, &Brazos, sizeof(Brazos));
+	memcpy(BrazosPciePortPtr, &PortList[0], sizeof(PortList));
+	memcpy(BrazosPcieDdiPtr, &DdiList, sizeof(DdiList));
 
 	((PCIe_COMPLEX_DESCRIPTOR *) BrazosPcieComplexListPtr)->PciePortList = \
 		(PCIe_PORT_DESCRIPTOR *) BrazosPciePortPtr;
diff --git a/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c b/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c
index 4a5d9c1..2754170 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c
@@ -25,6 +25,7 @@
 
 #include <arch/acpi.h>
 #include <arch/io.h>
+#include <assert.h>
 #include <cbmem.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
@@ -142,15 +143,11 @@ agesawrapper_amdinitreset (
 	AMD_INTERFACE_PARAMS AmdParamStruct;
 	AMD_RESET_PARAMS AmdResetParams;
 
-	LibAmdMemFill (&AmdParamStruct,
-					0,
-					sizeof (AMD_INTERFACE_PARAMS),
-					&(AmdParamStruct.StdHeader));
+	ASSERT(&(AmdParamStruct.StdHeader) != NULL);
+	memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
 
-	LibAmdMemFill (&AmdResetParams,
-					0,
-					sizeof (AMD_RESET_PARAMS),
-					&(AmdResetParams.StdHeader));
+	ASSERT(&(AmdResetParams.StdHeader) != NULL);
+	memset(&AmdResetParams, 0, sizeof(AMD_RESET_PARAMS));
 
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_RESET;
 	AmdParamStruct.AllocationMethod = ByHost;
@@ -176,12 +173,10 @@ agesawrapper_amdinitearly (
 {
 	AGESA_STATUS status;
 	AMD_INTERFACE_PARAMS AmdParamStruct;
-	AMD_EARLY_PARAMS		 *AmdEarlyParamsPtr;
+	AMD_EARLY_PARAMS *AmdEarlyParamsPtr;
 
-	LibAmdMemFill (&AmdParamStruct,
-					0,
-					sizeof (AMD_INTERFACE_PARAMS),
-					&(AmdParamStruct.StdHeader));
+	ASSERT(&(AmdParamStruct.StdHeader) != NULL);
+	memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
 
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_EARLY;
 	AmdParamStruct.AllocationMethod = PreMemHeap;
@@ -229,10 +224,8 @@ agesawrapper_amdinitpost (
 	AMD_INTERFACE_PARAMS	AmdParamStruct;
 	BIOS_HEAP_MANAGER		*BiosManagerPtr;
 
-	LibAmdMemFill (&AmdParamStruct,
-					0,
-					sizeof (AMD_INTERFACE_PARAMS),
-					&(AmdParamStruct.StdHeader));
+	ASSERT(&(AmdParamStruct.StdHeader) != NULL);
+	memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
 
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_POST;
 	AmdParamStruct.AllocationMethod = PreMemHeap;
@@ -270,10 +263,8 @@ agesawrapper_amdinitenv (
 	PCI_ADDR			 PciAddress;
 	UINT32				 PciValue;
 
-	LibAmdMemFill (&AmdParamStruct,
-					0,
-					sizeof (AMD_INTERFACE_PARAMS),
-					&(AmdParamStruct.StdHeader));
+	ASSERT(&(AmdParamStruct.StdHeader) != NULL);
+	memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
 
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_ENV;
 	AmdParamStruct.AllocationMethod = PostMemDram;
@@ -397,10 +388,8 @@ agesawrapper_amdinitmid (
 	/* Enable MMIO on AMD CPU Address Map Controller */
 	agesawrapper_amdinitcpuio ();
 
-	LibAmdMemFill (&AmdParamStruct,
-					0,
-					sizeof (AMD_INTERFACE_PARAMS),
-					&(AmdParamStruct.StdHeader));
+	ASSERT(&(AmdParamStruct.StdHeader) != NULL);
+	memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
 
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_MID;
 	AmdParamStruct.AllocationMethod = PostMemDram;
@@ -427,10 +416,8 @@ agesawrapper_amdinitlate (
 	AMD_INTERFACE_PARAMS AmdParamStruct;
 	AMD_LATE_PARAMS * AmdLateParamsPtr;
 
-	LibAmdMemFill (&AmdParamStruct,
-		       0,
-		       sizeof (AMD_INTERFACE_PARAMS),
-		       &(AmdParamStruct.StdHeader));
+	ASSERT(&(AmdParamStruct.StdHeader) != NULL);
+	memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
 
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_LATE;
 	AmdParamStruct.AllocationMethod = PostMemDram;
@@ -482,10 +469,8 @@ agesawrapper_amdinitresume (
 	AMD_RESUME_PARAMS     *AmdResumeParamsPtr;
 	S3_DATA_TYPE            S3DataType;
 
-	LibAmdMemFill (&AmdParamStruct,
-		       0,
-		       sizeof (AMD_INTERFACE_PARAMS),
-		       &(AmdParamStruct.StdHeader));
+	ASSERT(&(AmdParamStruct.StdHeader) != NULL);
+	memset(&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS));
 
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_RESUME;
 	AmdParamStruct.AllocationMethod = PreMemHeap;
@@ -524,10 +509,9 @@ agesawrapper_amds3laterestore (
 	AMD_S3LATE_PARAMS       *AmdS3LateParamsPtr;
 	S3_DATA_TYPE          S3DataType;
 
-	LibAmdMemFill (&AmdS3LateParams,
-		       0,
-		       sizeof (AMD_S3LATE_PARAMS),
-		       &(AmdS3LateParams.StdHeader));
+	ASSERT(&(AmdS3LateParams.StdHeader) != NULL);
+	memset(&AmdS3LateParams, 0, sizeof(AMD_S3LATE_PARAMS));
+
 	AmdInterfaceParams.StdHeader.ImageBasePtr = 0;
 	AmdInterfaceParams.AllocationMethod = ByHost;
 	AmdInterfaceParams.AgesaFunctionName = AMD_S3LATE_RESTORE;
@@ -565,10 +549,8 @@ agesawrapper_amdS3Save (
 	AMD_INTERFACE_PARAMS  AmdInterfaceParams;
 	S3_DATA_TYPE          S3DataType;
 
-	LibAmdMemFill (&AmdInterfaceParams,
-		       0,
-		       sizeof (AMD_INTERFACE_PARAMS),
-		       &(AmdInterfaceParams.StdHeader));
+	ASSERT(&(AmdInterfaceParams.StdHeader) != NULL);
+	memset(&AmdInterfaceParams, 0, sizeof(AMD_INTERFACE_PARAMS));
 
 	AmdInterfaceParams.StdHeader.ImageBasePtr = 0;
 	AmdInterfaceParams.StdHeader.HeapStatus = HEAP_SYSTEM_MEM;
@@ -623,10 +605,8 @@ agesawrapper_amdlaterunaptask (
 	AGESA_STATUS Status;
 	AP_EXE_PARAMS ApExeParams;
 
-	LibAmdMemFill (&ApExeParams,
-					0,
-					sizeof (AP_EXE_PARAMS),
-					&(ApExeParams.StdHeader));
+	ASSERT(&(ApExeParams.StdHeader) != NULL);
+	memset(&ApExeParams, 0, sizeof(AP_EXE_PARAMS));
 
 	ApExeParams.StdHeader.AltImageBasePtr = 0;
 	ApExeParams.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
@@ -652,10 +632,8 @@ agesawrapper_amdreadeventlog (
 	AGESA_STATUS Status;
 	EVENT_PARAMS AmdEventParams;
 
-	LibAmdMemFill (&AmdEventParams,
-					0,
-					sizeof (EVENT_PARAMS),
-					&(AmdEventParams.StdHeader));
+	ASSERT(&(AmdEventParams.StdHeader) != NULL);
+	memset(&AmdEventParams, 0, sizeof(EVENT_PARAMS));
 
 	AmdEventParams.StdHeader.AltImageBasePtr = 0;
 	AmdEventParams.StdHeader.CalloutPtr = NULL;



More information about the coreboot-gerrit mailing list