Patch set updated for coreboot: 03d26c6 AMD S3: Introduce Kconfig variable 'S3_DATA_SIZE'

[Zheng Bao]

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

-gerrit

commit 03d26c6d02caefad6b12ff5d04c9c4c4f782976e
Author: Zheng Bao 
Date:   Sun Feb 17 17:11:27 2013 +0800

AMD S3: Introduce Kconfig variable 'S3_DATA_SIZE'

Currently the size of the volatile storage for S3 reserved in the
    image is hardcoded to 32768 bytes. Make that configurable by
    introducing the Kconfig 'S3_DATA_SIZE'.

As the storage space is needed for storing non-volatile, volatile and
    MTRR data. Therefore add a check if the size is big enough.

Change-Id: I9152797cf0045c8da48109a9d760e417717686db
    Signed-off-by: Zheng Bao 
    Signed-off-by: zheng Bao 
---
 src/cpu/amd/agesa/s3_resume.h            | 4 ++++
 src/southbridge/amd/Makefile.inc         | 2 +-
 src/southbridge/amd/agesa/hudson/Kconfig | 8 ++++++++
 src/southbridge/amd/cimx/sb700/Kconfig   | 8 ++++++++
 src/southbridge/amd/cimx/sb800/Kconfig   | 8 ++++++++
 src/southbridge/amd/cimx/sb900/Kconfig   | 8 ++++++++
 6 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/cpu/amd/agesa/s3_resume.h b/src/cpu/amd/agesa/s3_resume.h
index 367cc3f..cdf41e6 100644
--- a/src/cpu/amd/agesa/s3_resume.h
+++ b/src/cpu/amd/agesa/s3_resume.h
@@ -28,6 +28,10 @@
 #define S3_DATA_MTRR_POS	(CONFIG_S3_DATA_POS + S3_DATA_VOLATILE_SIZE)
 #define S3_DATA_NONVOLATILE_POS	(CONFIG_S3_DATA_POS + S3_DATA_VOLATILE_SIZE + S3_DATA_MTRR_SIZE)

+#if (S3_DATA_VOLATILE_SIZE + S3_DATA_MTRR_SIZE + S3_DATA_NONVOLATILE_SIZE) > CONFIG_S3_DATA_SIZE
+#error "Please increase the value of S3_VOLATILE_SIZE"
+#endif
+
 typedef enum {
    S3DataTypeNonVolatile=0,            ///< NonVolatile Data Type
    S3DataTypeVolatile                  ///< Volatile Data Type
diff --git a/src/southbridge/amd/Makefile.inc b/src/southbridge/amd/Makefile.inc
index 5f54314..cce4702 100644
--- a/src/southbridge/amd/Makefile.inc
+++ b/src/southbridge/amd/Makefile.inc
@@ -22,7 +22,7 @@ ifeq ($(CONFIG_CPU_AMD_AGESA), y)
 $(obj)/coreboot_s3nv.rom: $(obj)/config.h
    echo "    S3 NVRAM   $(CONFIG_S3_DATA_POS) (S3 storage area)"
    # force C locale, so cygwin awk doesn't try to interpret the 0xff below as UTF-8 (or worse)
-	LC_ALL=C awk 'BEGIN {for (i=0; i<32768; i++) {printf "%c", 255}}' > $@.tmp
+	printf %d $(CONFIG_S3_DATA_SIZE) | LC_ALL=C awk '{for (i=0; i<$$1; i++) {printf "%c", 255}}' > $@.tmp
    mv $@.tmp $@

cbfs-files-y += s3nv
diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig
index a469970..644d356 100644
--- a/src/southbridge/amd/agesa/hudson/Kconfig
+++ b/src/southbridge/amd/agesa/hudson/Kconfig
@@ -212,6 +212,14 @@ config S3_DATA_POS
      For a system with S3 feature, the BIOS needs to save some data to
      non-volatile storage at cold boot stage.

+config S3_DATA_SIZE
+	hex "S3 volatile storage size"
+	default 0x8000
+	depends on HAVE_ACPI_RESUME
+	help
+	  For a system with S3 feature, the BIOS needs to save some data to
+	  non-volatile storage at cold boot stage.
+
 config HUDSON_LEGACY_FREE
    bool "System is legacy free"
    help
diff --git a/src/southbridge/amd/cimx/sb700/Kconfig b/src/southbridge/amd/cimx/sb700/Kconfig
index 706309d..1a88f48 100644
--- a/src/southbridge/amd/cimx/sb700/Kconfig
+++ b/src/southbridge/amd/cimx/sb700/Kconfig
@@ -68,5 +68,13 @@ config S3_DATA_POS
      For a system with S3 feature, the BIOS needs to save some data to
      non-volatile storage at cold boot stage.

+config S3_DATA_SIZE
+	hex "S3 volatile storage size"
+	default 0x8000
+	depends on HAVE_ACPI_RESUME
+	help
+	  For a system with S3 feature, the BIOS needs to save some data to
+	  non-volatile storage at cold boot stage.
+
 endif #SOUTHBRIDGE_AMD_CIMX_SB700

diff --git a/src/southbridge/amd/cimx/sb800/Kconfig b/src/southbridge/amd/cimx/sb800/Kconfig
index f56e017..a065f77 100644
--- a/src/southbridge/amd/cimx/sb800/Kconfig
+++ b/src/southbridge/amd/cimx/sb800/Kconfig
@@ -130,6 +130,14 @@ config S3_DATA_POS
      For a system with S3 feature, the BIOS needs to save some data to
      non-volatile storage at cold boot stage.

+config S3_DATA_SIZE
+	hex "S3 volatile storage size"
+	default 0x8000
+	depends on HAVE_ACPI_RESUME
+	help
+	  For a system with S3 feature, the BIOS needs to save some data to
+	  non-volatile storage at cold boot stage.
+
 config SB800_IMC_FWM
    bool "Add IMC firmware"
    default n
diff --git a/src/southbridge/amd/cimx/sb900/Kconfig b/src/southbridge/amd/cimx/sb900/Kconfig
index 3cadba1..897f0e6 100755
--- a/src/southbridge/amd/cimx/sb900/Kconfig
+++ b/src/southbridge/amd/cimx/sb900/Kconfig
@@ -61,5 +61,13 @@ config S3_DATA_POS
      For a system with S3 feature, the BIOS needs to save some data to
      non-volatile storage at cold boot stage.

+config S3_DATA_SIZE
+	hex "S3 volatile storage size"
+	default 0x8000
+	depends on HAVE_ACPI_RESUME
+	help
+	  For a system with S3 feature, the BIOS needs to save some data to
+	  non-volatile storage at cold boot stage.
+
 endif #SOUTHBRIDGE_AMD_CIMX_SB900