projects
/
coreboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't re-init EBDA in S3 resume path.
[coreboot.git]
/
src
/
arch
/
x86
/
lib
/
ebda.c
diff --git
a/src/arch/x86/lib/ebda.c
b/src/arch/x86/lib/ebda.c
index faf1451a2f14fb3c17ec952db0ef4e92f30ae4f2..fb407b6ac8e50abae2e790b159aa6d73b9a80371 100644
(file)
--- a/
src/arch/x86/lib/ebda.c
+++ b/
src/arch/x86/lib/ebda.c
@@
-23,9
+23,18
@@
#include <string.h>
#include <arch/io.h>
#include <arch/ebda.h>
#include <string.h>
#include <arch/io.h>
#include <arch/ebda.h>
+#if CONFIG_HAVE_ACPI_RESUME
+#include <arch/acpi.h>
+#endif
void setup_ebda(u32 low_memory_size, u16 ebda_segment, u16 ebda_size)
{
void setup_ebda(u32 low_memory_size, u16 ebda_segment, u16 ebda_size)
{
+#if CONFIG_HAVE_ACPI_RESUME
+ /* Skip in S3 resume path */
+ if (acpi_slp_type == 3)
+ return;
+#endif
+
if (!low_memory_size || !ebda_segment || !ebda_size)
return;
if (!low_memory_size || !ebda_segment || !ebda_size)
return;