AGESA: Add agesawrapper_post_device()

NOTE: The procedure is moved across a collected timestamp
TS_WRITE_TABLES, so the delay of SPI erase/write will be accounted
for in an earlier entry in cbmem -t output.

Change-Id: I0f082e7af1769c8d7d03cdd51fdb5dacbf3402b4
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6132
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

src/cpu/amd/agesa/Makefile.inc

@@ -31,6 +31,7 @@ cpu_incs += $(src)/cpu/amd/agesa/cache_as_ram.inc
 
 romstage-y += heapmanager.c
 ramstage-y += heapmanager.c
+ramstage-y += amd_late_init.c
 
 ifeq ($(CONFIG_HAVE_ACPI_RESUME), y)
 

src/cpu/amd/agesa/amd_late_init.c

@@ -0,0 +1,51 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2012 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <arch/acpi.h>
+#include <bootstate.h>
+#include <console/console.h>
+
+#include "agesawrapper.h"
+
+void get_bus_conf(void);
+
+static void agesawrapper_post_device(void *unused)
+{
+	u32 status;
+	if (acpi_is_wakeup_s3())
+		return;
+
+	status = agesawrapper_amdinitlate();
+	if (status) {
+		printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status);
+	}
+
+	if (!acpi_s3_resume_allowed())
+		return;
+
+	status = agesawrapper_amdS3Save();
+	if (status) {
+		printk(BIOS_DEBUG, "agesawrapper_amds3save failed: %x \n", status);
+	}
+}
+
+BOOT_STATE_INIT_ENTRIES(agesa_bscb) = {
+	BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_EXIT,
+	                      agesawrapper_post_device, NULL),
+};

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

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;
 

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

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));

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 */

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;
 

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));

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_ */

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));

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;
 

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

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;
 

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_ */

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));

src/mainboard/asrock/e350m1/agesawrapper.h

@@ -84,4 +84,5 @@ UINT32 agesawrapper_amdinitcpuio (void);
 UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);
 
+static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
 #endif

src/mainboard/asrock/e350m1/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));

src/mainboard/asrock/imb-a180/get_bus_conf.c

@@ -47,13 +47,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;
@@ -64,37 +60,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 */

src/mainboard/asus/f2a85-m/get_bus_conf.c

@@ -48,13 +48,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;
@@ -64,37 +60,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;
 

src/mainboard/gizmosphere/gizmo/get_bus_conf.c

@@ -52,14 +52,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;
@@ -69,35 +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 "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
 	sbdn_sb800 = 0;
 
 	memset(bus_sb800, 0, sizeof(bus_sb800));

src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c

@@ -49,13 +49,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;
@@ -65,37 +61,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;
 

src/mainboard/jetway/nf81-t56n-lf/get_bus_conf.c

@@ -54,14 +54,9 @@ u32 sbdn_sb800;
 
 static u32 get_bus_conf_done = 0;
 
-#if CONFIG_HAVE_ACPI_RESUME
-extern u8 acpi_slp_type;
-#endif /* CONFIG_HAVE_ACPI_RESUME */
-
 void get_bus_conf(void)
 {
 	u32 apicid_base;
-	u32 status;
 
 	device_t dev;
 	int i, j;
@@ -72,39 +67,7 @@ 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 /* CONFIG_HAVE_ACPI_RESUME */
 
 	sbdn_sb800 = 0;
 

src/mainboard/lippert/frontrunner-af/get_bus_conf.c

@@ -51,14 +51,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;
@@ -68,35 +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 "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));

src/mainboard/lippert/toucan-af/get_bus_conf.c

@@ -51,14 +51,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;
@@ -68,35 +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 "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));

src/mainboard/supermicro/h8qgi/agesawrapper.h

@@ -79,4 +79,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

src/mainboard/supermicro/h8qgi/get_bus_conf.c

@@ -48,8 +48,6 @@ static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
 {
-	u32 status;
-
 	device_t dev;
 	int i, j;
 
@@ -58,26 +56,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_sp5100 = 0;
 
 	for (i = 0; i < ARRAY_SIZE(bus_sp5100); i++) {

src/mainboard/supermicro/h8scm/agesawrapper.h

@@ -79,4 +79,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

src/mainboard/supermicro/h8scm/get_bus_conf.c

@@ -48,8 +48,6 @@ static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
 {
-	u32 status;
-
 	device_t dev;
 	int i, j;
 
@@ -58,26 +56,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_sp5100 = 0;
 
 	for (i = 0; i < 0; i++) {

src/mainboard/tyan/s8226/agesawrapper.h

@@ -79,4 +79,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

src/mainboard/tyan/s8226/get_bus_conf.c

@@ -47,8 +47,6 @@ static u32 get_bus_conf_done = 0;
 
 void get_bus_conf(void)
 {
-	u32 status;
-
 	device_t dev;
 	int i, j;
 
@@ -57,26 +55,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_sp5100 = 0;
 
 	for (i = 0; i < 0; i++) {