14 files changed, 5 insertions, 247 deletions

diff --git a/src/mainboard/amd/dinar/agesawrapper.h b/src/mainboard/amd/dinar/agesawrapper.h
index c42b2b09f7..b8b8db8620 100644
--- a/src/mainboard/amd/dinar/agesawrapper.h
+++ b/src/mainboard/amd/dinar/agesawrapper.h
@@ -95,4 +95,5 @@ UINT32 agesawrapper_amdinitmmio (void);
 void *agesawrapper_getlateinitptr (int pick);
 UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 
+static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
 #endif
diff --git a/src/mainboard/amd/dinar/get_bus_conf.c b/src/mainboard/amd/dinar/get_bus_conf.c
index a59bc437d3..a4d627b8ac 100644
--- a/src/mainboard/amd/dinar/get_bus_conf.c
+++ b/src/mainboard/amd/dinar/get_bus_conf.c
@@ -66,8 +66,6 @@ static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
 {
-	u32 status;
-
 	device_t dev;
 	int i, j;
 
@@ -77,26 +75,6 @@ void get_bus_conf(void)
 	get_bus_conf_done = 1;
 
 	printk(BIOS_DEBUG, "Mainboard - Get_bus_conf.c - get_bus_conf - Start.\n");
-	/*
-	 * This is the call to AmdInitLate.  It is really in the wrong place, conceptually,
-	 * but functionally within the coreboot model, this is the best place to make the
-	 * call.  The logically correct place to call AmdInitLate is after PCI scan is done,
-	 * after the decision about S3 resume is made, and before the system tables are
-	 * written into RAM.  The routine that is responsible for writing the tables is
-	 * "write_tables", called near the end of "main".  There is no platform
-	 * specific entry point between the S3 resume decision point and the call to
-	 * "write_tables", and the next platform specific entry points are the calls to
-	 * the ACPI table write functions.  The first of ose would seem to be the right
-	 * place, but other table write functions, e.g. the PIRQ table write function, are
-	 * called before the ACPI tables are written.  This routine is called at the beginning
-	 * of each of the write functions called prior to the ACPI write functions, so this
-	 * becomes the best place for this call.
-	 */
-	status = agesawrapper_amdinitlate();
-	if(status) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-	}
-	printk(BIOS_DEBUG, "Got past agesawrapper_amdinitlate\n");
 
 	sbdn_sb700 = 0;
 
diff --git a/src/mainboard/amd/inagua/agesawrapper.h b/src/mainboard/amd/inagua/agesawrapper.h
index 50b6a306d8..6e15a25477 100644
--- a/src/mainboard/amd/inagua/agesawrapper.h
+++ b/src/mainboard/amd/inagua/agesawrapper.h
@@ -53,4 +53,5 @@ UINT32 agesawrapper_amdinitmmio (void);
 UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);
 
+static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
 #endif
diff --git a/src/mainboard/amd/inagua/get_bus_conf.c b/src/mainboard/amd/inagua/get_bus_conf.c
index be28105577..8ab41d102d 100644
--- a/src/mainboard/amd/inagua/get_bus_conf.c
+++ b/src/mainboard/amd/inagua/get_bus_conf.c
@@ -55,7 +55,6 @@ static u32 get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	u32 status;
 
 	device_t dev;
 	int i, j;
@@ -65,26 +64,6 @@ void get_bus_conf(void)
 
 	get_bus_conf_done = 1;
 
-	/*
-	 * This is the call to AmdInitLate.  It is really in the wrong place, conceptually,
-	 * but functionally within the coreboot model, this is the best place to make the
-	 * call.  The logically correct place to call AmdInitLate is after PCI scan is done,
-	 * after the decision about S3 resume is made, and before the system tables are
-	 * written into RAM.  The routine that is responsible for writing the tables is
-	 * "write_tables", called near the end of "main".  There is no platform
-	 * specific entry point between the S3 resume decision point and the call to
-	 * "write_tables", and the next platform specific entry points are the calls to
-	 * the ACPI table write functions.  The first of ose would seem to be the right
-	 * place, but other table write functions, e.g. the PIRQ table write function, are
-	 * called before the ACPI tables are written.  This routine is called at the beginning
-	 * of each of the write functions called prior to the ACPI write functions, so this
-	 * becomes the best place for this call.
-	 */
-	status = agesawrapper_amdinitlate();
-	if(status) {
-		printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-	}
-
 	sbdn_sb800 = 0;
 
 	memset(bus_sb800, 0, sizeof(bus_sb800));
diff --git a/src/mainboard/amd/olivehill/get_bus_conf.c b/src/mainboard/amd/olivehill/get_bus_conf.c
index df6ebb7a6d..3addc97cf4 100644
--- a/src/mainboard/amd/olivehill/get_bus_conf.c
+++ b/src/mainboard/amd/olivehill/get_bus_conf.c
@@ -50,13 +50,9 @@ u32 sbdn_yangtze;
 
 static u32 get_bus_conf_done = 0;
 
-#if CONFIG_HAVE_ACPI_RESUME
-extern u8 acpi_slp_type;
-#endif
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	u32 status;
 	u32 value;
 
 	device_t dev;
@@ -67,37 +63,6 @@ void get_bus_conf(void)
 
 	get_bus_conf_done = 1;
 
-	/*
-	 * This is the call to AmdInitLate.  It is really in the wrong place, conceptually,
-	 * but functionally within the coreboot model, this is the best place to make the
-	 * call.  The logically correct place to call AmdInitLate is after PCI scan is done,
-	 * after the decision about S3 resume is made, and before the system tables are
-	 * written into RAM.  The routine that is responsible for writing the tables is
-	 * "write_tables", called near the end of "hardwaremain".  There is no platform
-	 * specific entry point between the S3 resume decision point and the call to
-	 * "write_tables", and the next platform specific entry points are the calls to
-	 * the ACPI table write functions.  The first of ose would seem to be the right
-	 * place, but other table write functions, e.g. the PIRQ table write function, are
-	 * called before the ACPI tables are written.  This routine is called at the beginning
-	 * of each of the write functions called prior to the ACPI write functions, so this
-	 * becomes the best place for this call.
-	 */
-#if CONFIG_HAVE_ACPI_RESUME
-	if (acpi_slp_type != 3) {
-		status = agesawrapper_amdinitlate();
-		if(status) {
-			printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-		}
-		status = agesawrapper_amdS3Save();
-		if (status) {
-			printk(BIOS_DEBUG, "agesawrapper_amds3save failed: %x \n", status);
-		}
-	}
-#else
-	status = agesawrapper_amdinitlate();
-	if (status)
-		printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-#endif
 	dev = dev_find_slot(0, PCI_DEVFN(0, 0)); /* clear IoapicSbFeatureEn */
 	pci_write_config32(dev, 0xF8, 0);
 	pci_write_config32(dev, 0xFC, 5); /* TODO: move it to dsdt.asl */
diff --git a/src/mainboard/amd/parmer/get_bus_conf.c b/src/mainboard/amd/parmer/get_bus_conf.c
index bf76fe2fe7..ce5276fb52 100644
--- a/src/mainboard/amd/parmer/get_bus_conf.c
+++ b/src/mainboard/amd/parmer/get_bus_conf.c
@@ -50,13 +50,9 @@ u32 sbdn_hudson;
 
 static u32 get_bus_conf_done = 0;
 
-#if CONFIG_HAVE_ACPI_RESUME
-extern u8 acpi_slp_type;
-#endif
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	u32 status;
 
 	device_t dev;
 	int i, j;
@@ -66,37 +62,6 @@ void get_bus_conf(void)
 
 	get_bus_conf_done = 1;
 
-	/*
-	 * This is the call to AmdInitLate.  It is really in the wrong place, conceptually,
-	 * but functionally within the coreboot model, this is the best place to make the
-	 * call.  The logically correct place to call AmdInitLate is after PCI scan is done,
-	 * after the decision about S3 resume is made, and before the system tables are
-	 * written into RAM.  The routine that is responsible for writing the tables is
-	 * "write_tables", called near the end of "main".  There is no platform
-	 * specific entry point between the S3 resume decision point and the call to
-	 * "write_tables", and the next platform specific entry points are the calls to
-	 * the ACPI table write functions.  The first of ose would seem to be the right
-	 * place, but other table write functions, e.g. the PIRQ table write function, are
-	 * called before the ACPI tables are written.  This routine is called at the beginning
-	 * of each of the write functions called prior to the ACPI write functions, so this
-	 * becomes the best place for this call.
-	 */
-#if CONFIG_HAVE_ACPI_RESUME
-	if (acpi_slp_type != 3) {
-		status = agesawrapper_amdinitlate();
-		if(status) {
-			printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-		}
-		status = agesawrapper_amdS3Save();
-		if (status) {
-			printk(BIOS_DEBUG, "agesawrapper_amds3save failed: %x \n", status);
-		}
-	}
-#else
-	status = agesawrapper_amdinitlate();
-	if (status)
-		printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-#endif
 
 	sbdn_hudson = 0;
 
diff --git a/src/mainboard/amd/persimmon/get_bus_conf.c b/src/mainboard/amd/persimmon/get_bus_conf.c
index ac65a1dc06..15b19896ae 100644
--- a/src/mainboard/amd/persimmon/get_bus_conf.c
+++ b/src/mainboard/amd/persimmon/get_bus_conf.c
@@ -53,14 +53,9 @@ u32 sbdn_sb800;
 
 static u32 get_bus_conf_done = 0;
 
-#if CONFIG_HAVE_ACPI_RESUME
-extern u8 acpi_slp_type;
-#endif
-
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	u32 status;
 
 	device_t dev;
 	int i, j;
@@ -70,35 +65,6 @@ void get_bus_conf(void)
 
 	get_bus_conf_done = 1;
 
-/*
- * This is the call to AmdInitLate.	It is really in the wrong place, conceptually,
- * but functionally within the coreboot model, this is the best place to make the
- * call.	The logically correct place to call AmdInitLate is after PCI scan is done,
- * after the decision about S3 resume is made, and before the system tables are
- * written into RAM.	The routine that is responsible for writing the tables is
- * "write_tables", called near the end of "main".	There is no platform
- * specific entry point between the S3 resume decision point and the call to
- * "write_tables", and the next platform specific entry points are the calls to
- * the ACPI table write functions.	The first of ose would seem to be the right
- * place, but other table write functions, e.g. the PIRQ table write function, are
- * called before the ACPI tables are written.	This routine is called at the beginning
- * of each of the write functions called prior to the ACPI write functions, so this
- * becomes the best place for this call.
- */
-#if CONFIG_HAVE_ACPI_RESUME
-	if (acpi_slp_type != 3) {
-		status = agesawrapper_amdinitlate();
-		if(status)
-			printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-		status = agesawrapper_amdS3Save();
-		if(status)
-			printk(BIOS_DEBUG, "agesawrapper_amds3save failed: %x \n", status);
-	}
-#else
-	status = agesawrapper_amdinitlate();
-	if(status)
-		printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-#endif
 	sbdn_sb800 = 0;
 
 	memset(bus_sb800, 0, sizeof(bus_sb800));
diff --git a/src/mainboard/amd/south_station/agesawrapper.h b/src/mainboard/amd/south_station/agesawrapper.h
index 48ed2f13ba..47332c5285 100644
--- a/src/mainboard/amd/south_station/agesawrapper.h
+++ b/src/mainboard/amd/south_station/agesawrapper.h
@@ -53,4 +53,5 @@ UINT32 agesawrapper_amdinitmmio (void);
 UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);
 
+static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
 #endif /* _AGESAWRAPPER_H_ */
diff --git a/src/mainboard/amd/south_station/get_bus_conf.c b/src/mainboard/amd/south_station/get_bus_conf.c
index df8ce6e514..6a3d23250c 100644
--- a/src/mainboard/amd/south_station/get_bus_conf.c
+++ b/src/mainboard/amd/south_station/get_bus_conf.c
@@ -55,7 +55,6 @@ static u32 get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
   u32 apicid_base;
-  u32 status;
 
   device_t dev;
   int i, j;
@@ -65,26 +64,6 @@ void get_bus_conf(void)
 
   get_bus_conf_done = 1;
 
-/*
- * This is the call to AmdInitLate.  It is really in the wrong place, conceptually,
- * but functionally within the coreboot model, this is the best place to make the
- * call.  The logically correct place to call AmdInitLate is after PCI scan is done,
- * after the decision about S3 resume is made, and before the system tables are
- * written into RAM.  The routine that is responsible for writing the tables is
- * "write_tables", called near the end of "main".  There is no platform
- * specific entry point between the S3 resume decision point and the call to
- * "write_tables", and the next platform specific entry points are the calls to
- * the ACPI table write functions.  The first of ose would seem to be the right
- * place, but other table write functions, e.g. the PIRQ table write function, are
- * called before the ACPI tables are written.  This routine is called at the beginning
- * of each of the write functions called prior to the ACPI write functions, so this
- * becomes the best place for this call.
- */
-  status = agesawrapper_amdinitlate();
-  if(status) {
-    printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-  }
-
   sbdn_sb800 = 0;
 
   memset(bus_sb800, 0, sizeof(bus_sb800));
diff --git a/src/mainboard/amd/thatcher/get_bus_conf.c b/src/mainboard/amd/thatcher/get_bus_conf.c
index bf76fe2fe7..ce5276fb52 100644
--- a/src/mainboard/amd/thatcher/get_bus_conf.c
+++ b/src/mainboard/amd/thatcher/get_bus_conf.c
@@ -50,13 +50,9 @@ u32 sbdn_hudson;
 
 static u32 get_bus_conf_done = 0;
 
-#if CONFIG_HAVE_ACPI_RESUME
-extern u8 acpi_slp_type;
-#endif
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	u32 status;
 
 	device_t dev;
 	int i, j;
@@ -66,37 +62,6 @@ void get_bus_conf(void)
 
 	get_bus_conf_done = 1;
 
-	/*
-	 * This is the call to AmdInitLate.  It is really in the wrong place, conceptually,
-	 * but functionally within the coreboot model, this is the best place to make the
-	 * call.  The logically correct place to call AmdInitLate is after PCI scan is done,
-	 * after the decision about S3 resume is made, and before the system tables are
-	 * written into RAM.  The routine that is responsible for writing the tables is
-	 * "write_tables", called near the end of "main".  There is no platform
-	 * specific entry point between the S3 resume decision point and the call to
-	 * "write_tables", and the next platform specific entry points are the calls to
-	 * the ACPI table write functions.  The first of ose would seem to be the right
-	 * place, but other table write functions, e.g. the PIRQ table write function, are
-	 * called before the ACPI tables are written.  This routine is called at the beginning
-	 * of each of the write functions called prior to the ACPI write functions, so this
-	 * becomes the best place for this call.
-	 */
-#if CONFIG_HAVE_ACPI_RESUME
-	if (acpi_slp_type != 3) {
-		status = agesawrapper_amdinitlate();
-		if(status) {
-			printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-		}
-		status = agesawrapper_amdS3Save();
-		if (status) {
-			printk(BIOS_DEBUG, "agesawrapper_amds3save failed: %x \n", status);
-		}
-	}
-#else
-	status = agesawrapper_amdinitlate();
-	if (status)
-		printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-#endif
 
 	sbdn_hudson = 0;
 
diff --git a/src/mainboard/amd/torpedo/agesawrapper.h b/src/mainboard/amd/torpedo/agesawrapper.h
index 9883bd1b1d..5947b6b504 100644
--- a/src/mainboard/amd/torpedo/agesawrapper.h
+++ b/src/mainboard/amd/torpedo/agesawrapper.h
@@ -95,4 +95,5 @@ UINT32 agesawrapper_amdinitmmio (void);
 UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);
 
+static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
 #endif
diff --git a/src/mainboard/amd/torpedo/get_bus_conf.c b/src/mainboard/amd/torpedo/get_bus_conf.c
index 2b4e9fa73a..5404941c10 100644
--- a/src/mainboard/amd/torpedo/get_bus_conf.c
+++ b/src/mainboard/amd/torpedo/get_bus_conf.c
@@ -59,8 +59,6 @@ static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
 {
-	u32 status;
-
 	device_t dev;
 	int i, j;
 
@@ -70,27 +68,6 @@ void get_bus_conf(void)
 	get_bus_conf_done = 1;
 
 	printk(BIOS_DEBUG, "Mainboard - %s - %s - Start.\n", __FILE__, __func__);
-/*
- * This is the call to AmdInitLate.  It is really in the wrong place, conceptually,
- * but functionally within the coreboot model, this is the best place to make the
- * call.  The logically correct place to call AmdInitLate is after PCI scan is done,
- * after the decision about S3 resume is made, and before the system tables are
- * written into RAM.  The routine that is responsible for writing the tables is
- * "write_tables", called near the end of "main".  There is no platform
- * specific entry point between the S3 resume decision point and the call to
- * "write_tables", and the next platform specific entry points are the calls to
- * the ACPI table write functions.  The first of ose would seem to be the right
- * place, but other table write functions, e.g. the PIRQ table write function, are
- * called before the ACPI tables are written.  This routine is called at the beginning
- * of each of the write functions called prior to the ACPI write functions, so this
- * becomes the best place for this call.
- */
-	printk(BIOS_DEBUG, "agesawrapper_amdinitlate ");
-	status = agesawrapper_amdinitlate();
-	if (status)
-		printk(BIOS_DEBUG, "error level: %x \n", status);
-	else
-		printk(BIOS_DEBUG, "passed.\n");
 
 	sbdn_sb900 = 0;
 
diff --git a/src/mainboard/amd/union_station/agesawrapper.h b/src/mainboard/amd/union_station/agesawrapper.h
index 48ed2f13ba..47332c5285 100644
--- a/src/mainboard/amd/union_station/agesawrapper.h
+++ b/src/mainboard/amd/union_station/agesawrapper.h
@@ -53,4 +53,5 @@ UINT32 agesawrapper_amdinitmmio (void);
 UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);
 
+static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
 #endif /* _AGESAWRAPPER_H_ */
diff --git a/src/mainboard/amd/union_station/get_bus_conf.c b/src/mainboard/amd/union_station/get_bus_conf.c
index df8ce6e514..6a3d23250c 100644
--- a/src/mainboard/amd/union_station/get_bus_conf.c
+++ b/src/mainboard/amd/union_station/get_bus_conf.c
@@ -55,7 +55,6 @@ static u32 get_bus_conf_done = 0;
 void get_bus_conf(void)
 {
   u32 apicid_base;
-  u32 status;
 
   device_t dev;
   int i, j;
@@ -65,26 +64,6 @@ void get_bus_conf(void)
 
   get_bus_conf_done = 1;
 
-/*
- * This is the call to AmdInitLate.  It is really in the wrong place, conceptually,
- * but functionally within the coreboot model, this is the best place to make the
- * call.  The logically correct place to call AmdInitLate is after PCI scan is done,
- * after the decision about S3 resume is made, and before the system tables are
- * written into RAM.  The routine that is responsible for writing the tables is
- * "write_tables", called near the end of "main".  There is no platform
- * specific entry point between the S3 resume decision point and the call to
- * "write_tables", and the next platform specific entry points are the calls to
- * the ACPI table write functions.  The first of ose would seem to be the right
- * place, but other table write functions, e.g. the PIRQ table write function, are
- * called before the ACPI tables are written.  This routine is called at the beginning
- * of each of the write functions called prior to the ACPI write functions, so this
- * becomes the best place for this call.
- */
-  status = agesawrapper_amdinitlate();
-  if(status) {
-    printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
-  }
-
   sbdn_sb800 = 0;
 
   memset(bus_sb800, 0, sizeof(bus_sb800));