Patch set updated for coreboot: Port Fam14 northbridge code to 64bit

[Stefan Reinauer]

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

-gerrit

commit e7634e8e974f9a4525142a143e133eff2dc8ab0d
Author: Stefan Reinauer 
Date:   Thu Jun 18 01:18:09 2015 -0700

Port Fam14 northbridge code to 64bit

Change-Id: I694b739a29e9d82d153d9fb3b729dc250bd4901e
    Signed-off-by: Stefan Reinauer 
    Signed-off-by: Scott Duplichan 
---
 src/northbridge/amd/agesa/family14/northbridge.c | 8 +++++---
 src/northbridge/amd/agesa/oem_s3.c               | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index fcc0d87..7a0294b 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -529,7 +529,7 @@ static void setup_uma_memory(void)
 static void domain_set_resources(device_t dev)
 {
    printk(BIOS_DEBUG, "\nFam14h - %s\n", __func__);
-	printk(BIOS_DEBUG, "  amsr - incoming dev = %08x\n", (u32) dev);
+	printk(BIOS_DEBUG, "  amsr - incoming dev = %p\n", dev);

unsigned long mmio_basek;
    u32 pci_tolm;
@@ -741,11 +741,13 @@ static unsigned long acpi_fill_hest(acpi_hest_t *hest)

addr = agesawrapper_getlateinitptr(PICK_WHEA_MCE);
    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,
+				addr + 2, *(UINT16 *)addr - 2);

addr = agesawrapper_getlateinitptr(PICK_WHEA_CMC);
    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,
+				addr + 2, *(UINT16 *)addr - 2);

return (unsigned long)current;
 }
diff --git a/src/northbridge/amd/agesa/oem_s3.c b/src/northbridge/amd/agesa/oem_s3.c
index 77bab67..5f02815 100644
--- a/src/northbridge/amd/agesa/oem_s3.c
+++ b/src/northbridge/amd/agesa/oem_s3.c
@@ -39,7 +39,7 @@ typedef enum {
 #error "Please increase the value of S3_DATA_SIZE"
 #endif

-static void get_s3nv_data(S3_DATA_TYPE S3DataType, u32 *pos, u32 *len)
+static void get_s3nv_data(S3_DATA_TYPE S3DataType, uintptr_t *pos, uintptr_t *len)
 {
    /* FIXME: Find file from CBFS. */
    u32 s3_data = CONFIG_S3_DATA_POS;
@@ -65,7 +65,7 @@ static void get_s3nv_data(S3_DATA_TYPE S3DataType, u32 *pos, u32 *len)
 AGESA_STATUS OemInitResume(AMD_RESUME_PARAMS *ResumeParams)
 {
    AMD_S3_PARAMS *dataBlock = &ResumeParams->S3DataBlock;
-	u32 pos, size;
+	uintptr_t pos, size;

get_s3nv_data(S3DataTypeNonVolatile, &pos, &size);

@@ -126,7 +126,7 @@ AGESA_STATUS OemS3Save(void *vS3SaveParams)
 #endif
    u8 MTRRStorage[S3_DATA_MTRR_SIZE];
    u32 MTRRStorageSize = 0;
-	u32 pos, size;
+	uintptr_t pos, size;

if (HIGH_ROMSTAGE_STACK_SIZE)
    	cbmem_add(CBMEM_ID_ROMSTAGE_RAM_STACK, HIGH_ROMSTAGE_STACK_SIZE);
@@ -157,7 +157,7 @@ AGESA_STATUS OemS3Save(void *vS3SaveParams)

const void *OemS3Saved_MTRR_Storage(void)
 {
-	u32 pos, size;
+	uintptr_t pos, size;
    get_s3nv_data(S3DataTypeMTRR, &pos, &size);
    if (!size)
    	return NULL;