Patch set updated for coreboot: 855ff15 AMD Llano, Brazos boards: Use `sizeof(var)` to get its size

[Paul Menzel]

Paul Menzel ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3248

-gerrit

commit 855ff15137ba9495ee08c379cdb2bb16ee1c52a9
Author: Paul Menzel 
Date:   Tue May 14 10:06:47 2013 +0200

AMD Llano, Brazos boards: Use `sizeof(var)` to get its size

Change `sizeof(type) * n`, where n is the number of array
    elements, to `sizeof(variable)` to directly get the size of the
    variable (struct, array). Determining the size by counting array
    elements is error prone and unnecessary.

Rudolf Marek’s patch »ASUS F2A85-M: Correct and clean up PCIe
    config« [1] contains the same change and is ported over. In
    the commit message Rudolf makes the following comment.

»Not sure why the copy is needed instead of direct reference.
    Maybe it has something to do with CAR?«

Testing on the ASRock E350M1, no regressions were noticed.

[1] http://review.coreboot.org/#/c/3194/

Change-Id: I123031b3819a10c9c85577fdca96c70d9c992e87
    Signed-off-by: Paul Menzel 
---
 src/mainboard/amd/inagua/PlatformGnbPcie.c           | 20 +++++++++-----------
 src/mainboard/amd/persimmon/PlatformGnbPcie.c        | 20 +++++++++-----------
 src/mainboard/amd/south_station/PlatformGnbPcie.c    | 20 +++++++++-----------
 src/mainboard/amd/torpedo/PlatformGnbPcie.c          | 20 +++++++++-----------
 src/mainboard/amd/union_station/PlatformGnbPcie.c    | 20 +++++++++-----------
 src/mainboard/asrock/e350m1/PlatformGnbPcie.c        | 20 +++++++++-----------
 .../lippert/frontrunner-af/PlatformGnbPcie.c         | 20 +++++++++-----------
 src/mainboard/lippert/toucan-af/PlatformGnbPcie.c    | 20 +++++++++-----------
 8 files changed, 72 insertions(+), 88 deletions(-)

diff --git a/src/mainboard/amd/inagua/PlatformGnbPcie.c b/src/mainboard/amd/inagua/PlatformGnbPcie.c
index c1fc77f..c64e523 100644
--- a/src/mainboard/amd/inagua/PlatformGnbPcie.c
+++ b/src/mainboard/amd/inagua/PlatformGnbPcie.c
@@ -108,9 +108,7 @@ OemCustomizeInitEarly (
    //
    // Allocate buffer for PCIe_COMPLEX_DESCRIPTOR , PCIe_PORT_DESCRIPTOR and PCIe_DDI_DESCRIPTOR
    //
-	AllocHeapParams.RequestedBufferSize = sizeof (PCIe_COMPLEX_DESCRIPTOR)  +
-			sizeof (PCIe_PORT_DESCRIPTOR) * 4 +
-			sizeof (PCIe_DDI_DESCRIPTOR) * 2;
+	AllocHeapParams.RequestedBufferSize = sizeof(Brazos) + sizeof(PortList) + sizeof(DdiList);

AllocHeapParams.BufferHandle = AMD_MEM_MISC_HANDLES_START;
    AllocHeapParams.Persist = HEAP_LOCAL_CACHE;
@@ -123,30 +121,30 @@ OemCustomizeInitEarly (

BrazosPcieComplexListPtr  =  (PCIe_COMPLEX_DESCRIPTOR *) AllocHeapParams.BufferPtr;

-	AllocHeapParams.BufferPtr += sizeof (PCIe_COMPLEX_DESCRIPTOR);
+	AllocHeapParams.BufferPtr += sizeof(Brazos);
    BrazosPciePortPtr         =  (PCIe_PORT_DESCRIPTOR *)AllocHeapParams.BufferPtr;

-	AllocHeapParams.BufferPtr += sizeof (PCIe_PORT_DESCRIPTOR) * 4;
+	AllocHeapParams.BufferPtr += sizeof(PortList);
    BrazosPcieDdiPtr          =  (PCIe_DDI_DESCRIPTOR *) AllocHeapParams.BufferPtr;

LibAmdMemFill (BrazosPcieComplexListPtr,
    		0,
-			sizeof (PCIe_COMPLEX_DESCRIPTOR),
+			sizeof(Brazos),
    		&InitEarly->StdHeader);

LibAmdMemFill (BrazosPciePortPtr,
    		0,
-			sizeof (PCIe_PORT_DESCRIPTOR) * 4,
+			sizeof(PortList),
    		&InitEarly->StdHeader);

LibAmdMemFill (BrazosPcieDdiPtr,
    		0,
-			sizeof (PCIe_DDI_DESCRIPTOR) * 2,
+			sizeof(DdiList),
    		&InitEarly->StdHeader);

-	LibAmdMemCopy  (BrazosPcieComplexListPtr, &Brazos, sizeof (PCIe_COMPLEX_DESCRIPTOR), &InitEarly->StdHeader);
-	LibAmdMemCopy  (BrazosPciePortPtr, &PortList[0], sizeof (PCIe_PORT_DESCRIPTOR) * 4, &InitEarly->StdHeader);
-	LibAmdMemCopy  (BrazosPcieDdiPtr, &DdiList[0], sizeof (PCIe_DDI_DESCRIPTOR) *2, &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);

((PCIe_COMPLEX_DESCRIPTOR*)BrazosPcieComplexListPtr)->PciePortList =  (PCIe_PORT_DESCRIPTOR*)BrazosPciePortPtr;
diff --git a/src/mainboard/amd/persimmon/PlatformGnbPcie.c b/src/mainboard/amd/persimmon/PlatformGnbPcie.c
index fa909d2..3cd69f1 100644
--- a/src/mainboard/amd/persimmon/PlatformGnbPcie.c
+++ b/src/mainboard/amd/persimmon/PlatformGnbPcie.c
@@ -117,9 +117,7 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {
    //
    // Allocate buffer for PCIe_COMPLEX_DESCRIPTOR , PCIe_PORT_DESCRIPTOR and PCIe_DDI_DESCRIPTOR
    //
-	AllocHeapParams.RequestedBufferSize = sizeof (PCIe_COMPLEX_DESCRIPTOR)	+
-										 sizeof (PCIe_PORT_DESCRIPTOR) * 5 +
-										 sizeof (PCIe_DDI_DESCRIPTOR) * 2;
+	AllocHeapParams.RequestedBufferSize = sizeof(Brazos) + sizeof(PortList) + sizeof(DdiList);

AllocHeapParams.BufferHandle = AMD_MEM_MISC_HANDLES_START;
    AllocHeapParams.Persist = HEAP_LOCAL_CACHE;
@@ -132,30 +130,30 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {

BrazosPcieComplexListPtr	=	(PCIe_COMPLEX_DESCRIPTOR *) AllocHeapParams.BufferPtr;

-	AllocHeapParams.BufferPtr += sizeof (PCIe_COMPLEX_DESCRIPTOR);
+	AllocHeapParams.BufferPtr += sizeof(Brazos);
    BrazosPciePortPtr		 =	(PCIe_PORT_DESCRIPTOR *)AllocHeapParams.BufferPtr;

-	AllocHeapParams.BufferPtr += sizeof (PCIe_PORT_DESCRIPTOR) * 5;
+	AllocHeapParams.BufferPtr += sizeof(PortList);
    BrazosPcieDdiPtr			=	(PCIe_DDI_DESCRIPTOR *) AllocHeapParams.BufferPtr;

LibAmdMemFill (BrazosPcieComplexListPtr,
    				 0,
-					 sizeof (PCIe_COMPLEX_DESCRIPTOR),
+					 sizeof(Brazos),
    				 &InitEarly->StdHeader);

LibAmdMemFill (BrazosPciePortPtr,
    				 0,
-					 sizeof (PCIe_PORT_DESCRIPTOR) * 5,
+					 sizeof(PortList),
    				 &InitEarly->StdHeader);

LibAmdMemFill (BrazosPcieDdiPtr,
    				 0,
-					 sizeof (PCIe_DDI_DESCRIPTOR) * 2,
+					 sizeof(DdiList),
    				 &InitEarly->StdHeader);

-	LibAmdMemCopy	(BrazosPcieComplexListPtr, &Brazos, sizeof (PCIe_COMPLEX_DESCRIPTOR), &InitEarly->StdHeader);
-	LibAmdMemCopy	(BrazosPciePortPtr, &PortList[0], sizeof (PCIe_PORT_DESCRIPTOR) * 5, &InitEarly->StdHeader);
-	LibAmdMemCopy	(BrazosPcieDdiPtr, &DdiList[0], sizeof (PCIe_DDI_DESCRIPTOR) *2, &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);

((PCIe_COMPLEX_DESCRIPTOR*)BrazosPcieComplexListPtr)->PciePortList =	(PCIe_PORT_DESCRIPTOR*)BrazosPciePortPtr;
diff --git a/src/mainboard/amd/south_station/PlatformGnbPcie.c b/src/mainboard/amd/south_station/PlatformGnbPcie.c
index d0fd71b..a8511ea 100644
--- a/src/mainboard/amd/south_station/PlatformGnbPcie.c
+++ b/src/mainboard/amd/south_station/PlatformGnbPcie.c
@@ -116,9 +116,7 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {
   //
   // Allocate buffer for PCIe_COMPLEX_DESCRIPTOR , PCIe_PORT_DESCRIPTOR and PCIe_DDI_DESCRIPTOR
   //
-  AllocHeapParams.RequestedBufferSize = sizeof (PCIe_COMPLEX_DESCRIPTOR)  +
-                                        sizeof (PCIe_PORT_DESCRIPTOR) * 5 +
-                                        sizeof (PCIe_DDI_DESCRIPTOR) * 2;
+  AllocHeapParams.RequestedBufferSize = sizeof(Brazos) + sizeof(PortList) + sizeof(DdiList);

AllocHeapParams.BufferHandle = AMD_MEM_MISC_HANDLES_START;
   AllocHeapParams.Persist = HEAP_LOCAL_CACHE;
@@ -131,30 +129,30 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {

BrazosPcieComplexListPtr  =  (PCIe_COMPLEX_DESCRIPTOR *) AllocHeapParams.BufferPtr;

-  AllocHeapParams.BufferPtr += sizeof (PCIe_COMPLEX_DESCRIPTOR);
+  AllocHeapParams.BufferPtr += sizeof(Brazos);
   BrazosPciePortPtr         =  (PCIe_PORT_DESCRIPTOR *)AllocHeapParams.BufferPtr;

-  AllocHeapParams.BufferPtr += sizeof (PCIe_PORT_DESCRIPTOR) * 5;
+  AllocHeapParams.BufferPtr += sizeof(PortList);
   BrazosPcieDdiPtr          =  (PCIe_DDI_DESCRIPTOR *) AllocHeapParams.BufferPtr;

LibAmdMemFill (BrazosPcieComplexListPtr,
                    0,
-                   sizeof (PCIe_COMPLEX_DESCRIPTOR),
+                   sizeof(Brazos),
                    &InitEarly->StdHeader);

LibAmdMemFill (BrazosPciePortPtr,
                    0,
-                   sizeof (PCIe_PORT_DESCRIPTOR) * 5,
+                   sizeof(PortList),
                    &InitEarly->StdHeader);

LibAmdMemFill (BrazosPcieDdiPtr,
                    0,
-                   sizeof (PCIe_DDI_DESCRIPTOR) * 2,
+                   sizeof(DdiList),
                    &InitEarly->StdHeader);

-  LibAmdMemCopy  (BrazosPcieComplexListPtr, &Brazos, sizeof (PCIe_COMPLEX_DESCRIPTOR), &InitEarly->StdHeader);
-  LibAmdMemCopy  (BrazosPciePortPtr, &PortList[0], sizeof (PCIe_PORT_DESCRIPTOR) * 5, &InitEarly->StdHeader);
-  LibAmdMemCopy  (BrazosPcieDdiPtr, &DdiList[0], sizeof (PCIe_DDI_DESCRIPTOR) *2, &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);

((PCIe_COMPLEX_DESCRIPTOR*)BrazosPcieComplexListPtr)->PciePortList =  (PCIe_PORT_DESCRIPTOR*)BrazosPciePortPtr;
diff --git a/src/mainboard/amd/torpedo/PlatformGnbPcie.c b/src/mainboard/amd/torpedo/PlatformGnbPcie.c
index a42d056..1639393 100644
--- a/src/mainboard/amd/torpedo/PlatformGnbPcie.c
+++ b/src/mainboard/amd/torpedo/PlatformGnbPcie.c
@@ -126,9 +126,7 @@ OemCustomizeInitEarly (
   //
   // Allocate buffer for PCIe_COMPLEX_DESCRIPTOR , PCIe_PORT_DESCRIPTOR and PCIe_DDI_DESCRIPTOR
   //
-  AllocHeapParams.RequestedBufferSize = sizeof (PCIe_COMPLEX_DESCRIPTOR)  +
-                                        sizeof (PCIe_PORT_DESCRIPTOR) * 7 +
-                                        sizeof (PCIe_DDI_DESCRIPTOR) * 6;
+  AllocHeapParams.RequestedBufferSize = sizeof(Llano) + sizeof(PortList) + sizeof(DdiList);

AllocHeapParams.BufferHandle = AMD_MEM_MISC_HANDLES_START;
   AllocHeapParams.Persist = HEAP_LOCAL_CACHE;
@@ -141,30 +139,30 @@ OemCustomizeInitEarly (

LlanoPcieComplexListPtr  =  (PCIe_COMPLEX_DESCRIPTOR *) AllocHeapParams.BufferPtr;

-  AllocHeapParams.BufferPtr += sizeof (PCIe_COMPLEX_DESCRIPTOR);
+  AllocHeapParams.BufferPtr += sizeof(Llano);
   LlanoPciePortPtr         =  (PCIe_PORT_DESCRIPTOR *)AllocHeapParams.BufferPtr;

-  AllocHeapParams.BufferPtr += sizeof (PCIe_PORT_DESCRIPTOR) * 7;
+  AllocHeapParams.BufferPtr += sizeof(PortList);
   LlanoPcieDdiPtr          =  (PCIe_DDI_DESCRIPTOR *) AllocHeapParams.BufferPtr;

LibAmdMemFill (LlanoPcieComplexListPtr,
                    0,
-                   sizeof (PCIe_COMPLEX_DESCRIPTOR),
+                   sizeof(Llano),
                    &InitEarly->StdHeader);

LibAmdMemFill (LlanoPciePortPtr,
                    0,
-                   sizeof (PCIe_PORT_DESCRIPTOR) * 7,
+                   sizeof(PortList),
                    &InitEarly->StdHeader);

LibAmdMemFill (LlanoPcieDdiPtr,
                    0,
-                   sizeof (PCIe_DDI_DESCRIPTOR) * 6,
+                   sizeof(DdiList),
                    &InitEarly->StdHeader);

-  LibAmdMemCopy  (LlanoPcieComplexListPtr, &Llano, sizeof (PCIe_COMPLEX_DESCRIPTOR), &InitEarly->StdHeader);
-  LibAmdMemCopy  (LlanoPciePortPtr, &PortList[0], sizeof (PCIe_PORT_DESCRIPTOR) * 7, &InitEarly->StdHeader);
-  LibAmdMemCopy  (LlanoPcieDdiPtr, &DdiList[0], sizeof (PCIe_DDI_DESCRIPTOR) * 6, &InitEarly->StdHeader);
+  LibAmdMemCopy  (LlanoPcieComplexListPtr, &Llano, sizeof(Llano), &InitEarly->StdHeader);
+  LibAmdMemCopy  (LlanoPciePortPtr, &PortList[0], sizeof(PortList), &InitEarly->StdHeader);
+  LibAmdMemCopy  (LlanoPcieDdiPtr, &DdiList[0], sizeof(DdiList), &InitEarly->StdHeader);

((PCIe_COMPLEX_DESCRIPTOR*)LlanoPcieComplexListPtr)->PciePortList =  (PCIe_PORT_DESCRIPTOR*)LlanoPciePortPtr;
diff --git a/src/mainboard/amd/union_station/PlatformGnbPcie.c b/src/mainboard/amd/union_station/PlatformGnbPcie.c
index 98dd995..829b6c9 100644
--- a/src/mainboard/amd/union_station/PlatformGnbPcie.c
+++ b/src/mainboard/amd/union_station/PlatformGnbPcie.c
@@ -118,9 +118,7 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {
   //
   // Allocate buffer for PCIe_COMPLEX_DESCRIPTOR , PCIe_PORT_DESCRIPTOR and PCIe_DDI_DESCRIPTOR
   //
-  AllocHeapParams.RequestedBufferSize = sizeof (PCIe_COMPLEX_DESCRIPTOR)  +
-                                        sizeof (PCIe_PORT_DESCRIPTOR) * 5 +
-                                        sizeof (PCIe_DDI_DESCRIPTOR) * 2;
+  AllocHeapParams.RequestedBufferSize = sizeof(Brazos) + sizeof(PortList) + sizeof(DdiList);

AllocHeapParams.BufferHandle = AMD_MEM_MISC_HANDLES_START;
   AllocHeapParams.Persist = HEAP_LOCAL_CACHE;
@@ -133,30 +131,30 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {

BrazosPcieComplexListPtr  =  (PCIe_COMPLEX_DESCRIPTOR *) AllocHeapParams.BufferPtr;

-  AllocHeapParams.BufferPtr += sizeof (PCIe_COMPLEX_DESCRIPTOR);
+  AllocHeapParams.BufferPtr += sizeof(Brazos);
   BrazosPciePortPtr         =  (PCIe_PORT_DESCRIPTOR *)AllocHeapParams.BufferPtr;

-  AllocHeapParams.BufferPtr += sizeof (PCIe_PORT_DESCRIPTOR) * 5;
+  AllocHeapParams.BufferPtr += sizeof(PortList);
   BrazosPcieDdiPtr          =  (PCIe_DDI_DESCRIPTOR *) AllocHeapParams.BufferPtr;

LibAmdMemFill (BrazosPcieComplexListPtr,
                    0,
-                   sizeof (PCIe_COMPLEX_DESCRIPTOR),
+                   sizeof(Brazos),
                    &InitEarly->StdHeader);

LibAmdMemFill (BrazosPciePortPtr,
                    0,
-                   sizeof (PCIe_PORT_DESCRIPTOR) * 5,
+                   sizeof(PortList),
                    &InitEarly->StdHeader);

LibAmdMemFill (BrazosPcieDdiPtr,
                    0,
-                   sizeof (PCIe_DDI_DESCRIPTOR) * 2,
+                   sizeof(DdiList),
                    &InitEarly->StdHeader);

-  LibAmdMemCopy  (BrazosPcieComplexListPtr, &Brazos, sizeof (PCIe_COMPLEX_DESCRIPTOR), &InitEarly->StdHeader);
-  LibAmdMemCopy  (BrazosPciePortPtr, &PortList[0], sizeof (PCIe_PORT_DESCRIPTOR) * 5, &InitEarly->StdHeader);
-  LibAmdMemCopy  (BrazosPcieDdiPtr, &DdiList[0], sizeof (PCIe_DDI_DESCRIPTOR) *2, &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);

((PCIe_COMPLEX_DESCRIPTOR*)BrazosPcieComplexListPtr)->PciePortList =  (PCIe_PORT_DESCRIPTOR*)BrazosPciePortPtr;
diff --git a/src/mainboard/asrock/e350m1/PlatformGnbPcie.c b/src/mainboard/asrock/e350m1/PlatformGnbPcie.c
index ee25ac9..50a8db9 100644
--- a/src/mainboard/asrock/e350m1/PlatformGnbPcie.c
+++ b/src/mainboard/asrock/e350m1/PlatformGnbPcie.c
@@ -118,9 +118,7 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {
   //
   // Allocate buffer for PCIe_COMPLEX_DESCRIPTOR , PCIe_PORT_DESCRIPTOR and PCIe_DDI_DESCRIPTOR
   //
-  AllocHeapParams.RequestedBufferSize = sizeof (PCIe_COMPLEX_DESCRIPTOR)  +
-                                        sizeof (PCIe_PORT_DESCRIPTOR) * 5 +
-                                        sizeof (PCIe_DDI_DESCRIPTOR) * 2;
+  AllocHeapParams.RequestedBufferSize = sizeof(Brazos) + sizeof(PortList) + sizeof(DdiList);

AllocHeapParams.BufferHandle = AMD_MEM_MISC_HANDLES_START;
   AllocHeapParams.Persist = HEAP_LOCAL_CACHE;
@@ -133,30 +131,30 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {

BrazosPcieComplexListPtr  =  (PCIe_COMPLEX_DESCRIPTOR *) AllocHeapParams.BufferPtr;

-  AllocHeapParams.BufferPtr += sizeof (PCIe_COMPLEX_DESCRIPTOR);
+  AllocHeapParams.BufferPtr += sizeof(Brazos);
   BrazosPciePortPtr         =  (PCIe_PORT_DESCRIPTOR *)AllocHeapParams.BufferPtr;

-  AllocHeapParams.BufferPtr += sizeof (PCIe_PORT_DESCRIPTOR) * 5;
+  AllocHeapParams.BufferPtr += sizeof(PortList);
   BrazosPcieDdiPtr          =  (PCIe_DDI_DESCRIPTOR *) AllocHeapParams.BufferPtr;

LibAmdMemFill (BrazosPcieComplexListPtr,
                    0,
-                   sizeof (PCIe_COMPLEX_DESCRIPTOR),
+                   sizeof(Brazos),
                    &InitEarly->StdHeader);

LibAmdMemFill (BrazosPciePortPtr,
                    0,
-                   sizeof (PCIe_PORT_DESCRIPTOR) * 5,
+                   sizeof(PortList),
                    &InitEarly->StdHeader);

LibAmdMemFill (BrazosPcieDdiPtr,
                    0,
-                   sizeof (PCIe_DDI_DESCRIPTOR) * 2,
+                   sizeof(DdiList),
                    &InitEarly->StdHeader);

-  LibAmdMemCopy  (BrazosPcieComplexListPtr, &Brazos, sizeof (PCIe_COMPLEX_DESCRIPTOR), &InitEarly->StdHeader);
-  LibAmdMemCopy  (BrazosPciePortPtr, &PortList[0], sizeof (PCIe_PORT_DESCRIPTOR) * 5, &InitEarly->StdHeader);
-  LibAmdMemCopy  (BrazosPcieDdiPtr, &DdiList[0], sizeof (PCIe_DDI_DESCRIPTOR) *2, &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);

((PCIe_COMPLEX_DESCRIPTOR*)BrazosPcieComplexListPtr)->PciePortList =  (PCIe_PORT_DESCRIPTOR*)BrazosPciePortPtr;
diff --git a/src/mainboard/lippert/frontrunner-af/PlatformGnbPcie.c b/src/mainboard/lippert/frontrunner-af/PlatformGnbPcie.c
index 9bd9958..9724be1 100644
--- a/src/mainboard/lippert/frontrunner-af/PlatformGnbPcie.c
+++ b/src/mainboard/lippert/frontrunner-af/PlatformGnbPcie.c
@@ -117,9 +117,7 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {
    //
    // Allocate buffer for PCIe_COMPLEX_DESCRIPTOR , PCIe_PORT_DESCRIPTOR and PCIe_DDI_DESCRIPTOR
    //
-	AllocHeapParams.RequestedBufferSize = sizeof (PCIe_COMPLEX_DESCRIPTOR)	+
-										 sizeof (PCIe_PORT_DESCRIPTOR) * 5 +
-										 sizeof (PCIe_DDI_DESCRIPTOR) * 2;
+	AllocHeapParams.RequestedBufferSize = sizeof(Brazos) + sizeof(PortList) + sizeof(DdiList);

AllocHeapParams.BufferHandle = AMD_MEM_MISC_HANDLES_START;
    AllocHeapParams.Persist = HEAP_LOCAL_CACHE;
@@ -132,30 +130,30 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {

BrazosPcieComplexListPtr	=	(PCIe_COMPLEX_DESCRIPTOR *) AllocHeapParams.BufferPtr;

-	AllocHeapParams.BufferPtr += sizeof (PCIe_COMPLEX_DESCRIPTOR);
+	AllocHeapParams.BufferPtr += sizeof(Brazos);
    BrazosPciePortPtr		 =	(PCIe_PORT_DESCRIPTOR *)AllocHeapParams.BufferPtr;

-	AllocHeapParams.BufferPtr += sizeof (PCIe_PORT_DESCRIPTOR) * 5;
+	AllocHeapParams.BufferPtr += sizeof(PortList);
    BrazosPcieDdiPtr			=	(PCIe_DDI_DESCRIPTOR *) AllocHeapParams.BufferPtr;

LibAmdMemFill (BrazosPcieComplexListPtr,
    				 0,
-					 sizeof (PCIe_COMPLEX_DESCRIPTOR),
+					 sizeof(Brazos),
    				 &InitEarly->StdHeader);

LibAmdMemFill (BrazosPciePortPtr,
    				 0,
-					 sizeof (PCIe_PORT_DESCRIPTOR) * 5,
+					 sizeof(PortList),
    				 &InitEarly->StdHeader);

LibAmdMemFill (BrazosPcieDdiPtr,
    				 0,
-					 sizeof (PCIe_DDI_DESCRIPTOR) * 2,
+					 sizeof(DdiList),
    				 &InitEarly->StdHeader);

-	LibAmdMemCopy	(BrazosPcieComplexListPtr, &Brazos, sizeof (PCIe_COMPLEX_DESCRIPTOR), &InitEarly->StdHeader);
-	LibAmdMemCopy	(BrazosPciePortPtr, &PortList[0], sizeof (PCIe_PORT_DESCRIPTOR) * 5, &InitEarly->StdHeader);
-	LibAmdMemCopy	(BrazosPcieDdiPtr, &DdiList[0], sizeof (PCIe_DDI_DESCRIPTOR) *2, &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);

((PCIe_COMPLEX_DESCRIPTOR*)BrazosPcieComplexListPtr)->PciePortList =	(PCIe_PORT_DESCRIPTOR*)BrazosPciePortPtr;
diff --git a/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c b/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c
index 772ea53..61318b1 100644
--- a/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c
+++ b/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c
@@ -117,9 +117,7 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {
    //
    // Allocate buffer for PCIe_COMPLEX_DESCRIPTOR , PCIe_PORT_DESCRIPTOR and PCIe_DDI_DESCRIPTOR
    //
-	AllocHeapParams.RequestedBufferSize = sizeof (PCIe_COMPLEX_DESCRIPTOR)	+
-										 sizeof (PCIe_PORT_DESCRIPTOR) * 5 +
-										 sizeof (PCIe_DDI_DESCRIPTOR) * 2;
+	AllocHeapParams.RequestedBufferSize = sizeof(Brazos) + sizeof(PortList) + sizeof(DdiList);

AllocHeapParams.BufferHandle = AMD_MEM_MISC_HANDLES_START;
    AllocHeapParams.Persist = HEAP_LOCAL_CACHE;
@@ -132,30 +130,30 @@ PCIe_COMPLEX_DESCRIPTOR Brazos = {

BrazosPcieComplexListPtr	=	(PCIe_COMPLEX_DESCRIPTOR *) AllocHeapParams.BufferPtr;

-	AllocHeapParams.BufferPtr += sizeof (PCIe_COMPLEX_DESCRIPTOR);
+	AllocHeapParams.BufferPtr += sizeof(Brazos);
    BrazosPciePortPtr		 =	(PCIe_PORT_DESCRIPTOR *)AllocHeapParams.BufferPtr;

-	AllocHeapParams.BufferPtr += sizeof (PCIe_PORT_DESCRIPTOR) * 5;
+	AllocHeapParams.BufferPtr += sizeof(PortList);
    BrazosPcieDdiPtr			=	(PCIe_DDI_DESCRIPTOR *) AllocHeapParams.BufferPtr;

LibAmdMemFill (BrazosPcieComplexListPtr,
    				 0,
-					 sizeof (PCIe_COMPLEX_DESCRIPTOR),
+					 sizeof(Brazos),
    				 &InitEarly->StdHeader);

LibAmdMemFill (BrazosPciePortPtr,
    				 0,
-					 sizeof (PCIe_PORT_DESCRIPTOR) * 5,
+					 sizeof(PortList),
    				 &InitEarly->StdHeader);

LibAmdMemFill (BrazosPcieDdiPtr,
    				 0,
-					 sizeof (PCIe_DDI_DESCRIPTOR) * 2,
+					 sizeof(DdiList),
    				 &InitEarly->StdHeader);

-	LibAmdMemCopy	(BrazosPcieComplexListPtr, &Brazos, sizeof (PCIe_COMPLEX_DESCRIPTOR), &InitEarly->StdHeader);
-	LibAmdMemCopy	(BrazosPciePortPtr, &PortList[0], sizeof (PCIe_PORT_DESCRIPTOR) * 5, &InitEarly->StdHeader);
-	LibAmdMemCopy	(BrazosPcieDdiPtr, &DdiList[0], sizeof (PCIe_DDI_DESCRIPTOR) *2, &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);

((PCIe_COMPLEX_DESCRIPTOR*)BrazosPcieComplexListPtr)->PciePortList =	(PCIe_PORT_DESCRIPTOR*)BrazosPciePortPtr;