the following patch was just integrated into master:
commit d4776c3b16bd4a62151e2a9e3e4ce558b7d3162d
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Wed Oct 15 22:58:10 2014 +0200
macbook21: Kill empty Makefile.inc
Change-Id: I2d946b9d757cc6158ff7f8927a81d7bf03a2e062
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
Reviewed-on: http://review.coreboot.org/7084
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
Tested-by: build bot (Jenkins)
See http://review.coreboot.org/7084 for details.
-gerrit
the following patch was just integrated into master:
commit 6023ca4970116b38b9708b988dc87a38ad26c6bb
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Fri Oct 17 13:28:15 2014 +0200
Kconfig: move SMBIOS related options to SMBIOS table option
Change-Id: I74943d0248f49796b9d31d6ed827c69f8cea13a5
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Reviewed-on: http://review.coreboot.org/7090
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See http://review.coreboot.org/7090 for details.
-gerrit
the following patch was just integrated into master:
commit 007dbe130fcea076c9444f8184963ace1f99a607
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Wed Oct 15 22:56:12 2014 +0200
macbook21: Kill empty smi.h
Change-Id: I387bb6154fe432ef2fc5f92faca69e67d7a6370a
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
Reviewed-on: http://review.coreboot.org/7083
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
Tested-by: build bot (Jenkins)
See http://review.coreboot.org/7083 for details.
-gerrit
the following patch was just integrated into master:
commit 58470e39b3958292e112e13251c5c811409a7a02
Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Date: Fri Oct 17 13:08:36 2014 +0200
Kconfig: clean up options in top level and device menu
Move generic options to the "General Setup" menu.
Move device specific options to the "Devices" menu.
Change-Id: I514a021305d43f026b24fd3016477300700ed401
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Reviewed-on: http://review.coreboot.org/7089
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See http://review.coreboot.org/7089 for details.
-gerrit
Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7097
-gerrit
commit 577ae587b4cdb8131812778b2358c1dc922779bc
Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Date: Thu Oct 16 20:58:47 2014 +0300
ACPI: Allocate S3 resume backup in CBMEM earlier
These allocations are not really part of write_tables() and the move
opens possibilities to use CBMEM instead of SPI Flash to restore some
parts of system state after S3 resume.
Change-Id: I0c36bcee3f1da525af077fc1d18677ee85097e4d
Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
---
src/arch/x86/boot/acpi.c | 17 +++++++++++++++++
src/arch/x86/boot/tables.c | 10 ----------
src/arch/x86/include/arch/acpi.h | 1 +
src/lib/hardwaremain.c | 2 ++
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index b9fbc81..c697e30 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -842,6 +842,23 @@ void acpi_fail_wakeup(void)
acpi_slp_type = 0;
}
+void acpi_prepare_resume_backup(void)
+{
+ if (!acpi_s3_resume_allowed())
+ return;
+
+ /* Let's prepare the ACPI S3 Resume area now already, so we can rely on
+ * it being there during reboot time. We don't need the pointer, nor
+ * the result right now. If it fails, ACPI resume will be disabled.
+ */
+
+ if (HIGH_MEMORY_SAVE)
+ cbmem_add(CBMEM_ID_RESUME, HIGH_MEMORY_SAVE);
+
+ if (HIGH_MEMORY_SCRATCH)
+ cbmem_add(CBMEM_ID_RESUME_SCRATCH, HIGH_MEMORY_SCRATCH);
+}
+
static acpi_rsdp_t *valid_rsdp(acpi_rsdp_t *rsdp)
{
if (strncmp((char *)rsdp, RSDP_SIG, sizeof(RSDP_SIG) - 1) != 0)
diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c
index e5fb43a..9f2afd4 100644
--- a/src/arch/x86/boot/tables.c
+++ b/src/arch/x86/boot/tables.c
@@ -196,16 +196,6 @@ void write_tables(void)
post_code(0x9e);
- /* Let's prepare the ACPI S3 Resume area now already, so we can rely on
- * it begin there during reboot time. We don't need the pointer, nor
- * the result right now. If it fails, ACPI resume will be disabled.
- */
- if (HIGH_MEMORY_SAVE && acpi_s3_resume_allowed())
- cbmem_add(CBMEM_ID_RESUME, HIGH_MEMORY_SAVE);
-
- if (HIGH_MEMORY_SCRATCH && acpi_s3_resume_allowed())
- cbmem_add(CBMEM_ID_RESUME_SCRATCH, HIGH_MEMORY_SCRATCH);
-
#define MAX_COREBOOT_TABLE_SIZE (32 * 1024)
post_code(0x9d);
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 34e777d..492058d 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -565,6 +565,7 @@ int acpi_is_wakeup_early(void);
void acpi_fail_wakeup(void);
void acpi_resume(void *wake_vec);
+void acpi_prepare_resume_backup(void);
void __attribute__((weak)) mainboard_suspend_resume(void);
void *acpi_find_wakeup_vector(void);
void *acpi_get_wakeup_rsdp(void);
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index 9038f57..be052b3 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -197,6 +197,8 @@ static boot_state_t bs_os_resume_check(void *arg)
boot_states[BS_OS_RESUME].arg = wake_vector;
return BS_OS_RESUME;
}
+
+ acpi_prepare_resume_backup();
#endif
timestamp_add_now(TS_CBMEM_POST);