|
 |
66f7090 |
From 526d703a74752b66fd54ac4a9133a3de31c90549 Mon Sep 17 00:00:00 2001
|
|
|
66f7090 |
From: Gleb Natapov <gleb@redhat.com>
|
|
|
66f7090 |
Date: Sun, 11 Sep 2011 09:05:50 +0200
|
|
|
66f7090 |
Subject: [PATCH] do not advertise S4/S3 in DSDT
|
|
|
66f7090 |
|
|
|
66f7090 |
RH-Author: Gleb Natapov <gleb@redhat.com>
|
|
|
66f7090 |
Message-id: <20110911090550.GF21417@redhat.com>
|
|
|
66f7090 |
Patchwork-id: 32631
|
|
|
66f7090 |
O-Subject: [PATCHv2 RHEL6.2 SEABIOS] do not advertise S4/S3 in DSDT
|
|
|
66f7090 |
Bugzilla: 736522
|
|
|
66f7090 |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
66f7090 |
RH-Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
66f7090 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
66f7090 |
|
|
|
66f7090 |
To compile Seabios with PM support run make "DSDT_CPP_FLAGS=-DDSDT_PM"
|
|
|
66f7090 |
|
|
|
66f7090 |
BZ: 736522
|
|
|
66f7090 |
Upstream: local patch
|
|
|
66f7090 |
|
|
|
66f7090 |
Signed-off-by: Gleb Natapov <gleb@redhat.com>
|
|
|
66f7090 |
--
|
|
|
66f7090 |
Gleb.
|
|
|
66f7090 |
|
|
|
66f7090 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
66f7090 |
---
|
|
|
66f7090 |
Makefile | 2 +-
|
|
|
66f7090 |
src/acpi-dsdt.dsl | 2 ++
|
|
|
66f7090 |
2 files changed, 3 insertions(+), 1 deletions(-)
|
|
|
66f7090 |
|
|
|
66f7090 |
diff --git a/Makefile b/Makefile
|
|
|
66f7090 |
index b185ac8..f5c7104 100644
|
|
|
66f7090 |
--- a/Makefile
|
|
|
66f7090 |
+++ b/Makefile
|
|
|
66f7090 |
@@ -186,7 +186,7 @@ $(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py
|
|
|
66f7090 |
####### dsdt build rules
|
|
|
66f7090 |
src/%.hex: src/%.dsl
|
|
|
66f7090 |
@echo "Compiling DSDT"
|
|
|
66f7090 |
- $(Q)cpp -P $< > $(OUT)$*.dsl.i
|
|
|
66f7090 |
+ $(Q)cpp $(DSDT_CPP_FLAGS) -P $< > $(OUT)$*.dsl.i
|
|
|
66f7090 |
$(Q)iasl -tc -p $(OUT)$* $(OUT)$*.dsl.i
|
|
|
66f7090 |
$(Q)cp $(OUT)$*.hex $@
|
|
|
66f7090 |
|
|
|
66f7090 |
diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl
|
|
|
66f7090 |
index b54c558..1db5ae9 100644
|
|
|
66f7090 |
--- a/src/acpi-dsdt.dsl
|
|
|
66f7090 |
+++ b/src/acpi-dsdt.dsl
|
|
|
66f7090 |
@@ -722,6 +722,7 @@ DefinitionBlock (
|
|
|
66f7090 |
}
|
|
|
66f7090 |
}
|
|
|
66f7090 |
|
|
|
66f7090 |
+#ifdef DSDT_PM
|
|
|
66f7090 |
/*
|
|
|
66f7090 |
* S3 (suspend-to-ram), S4 (suspend-to-disk) and S5 (power-off) type codes:
|
|
|
66f7090 |
* must match piix4 emulation.
|
|
|
66f7090 |
@@ -740,6 +741,7 @@ DefinitionBlock (
|
|
|
66f7090 |
Zero, /* reserved */
|
|
|
66f7090 |
Zero /* reserved */
|
|
|
66f7090 |
})
|
|
|
66f7090 |
+#endif
|
|
|
66f7090 |
Name (\_S5, Package (0x04)
|
|
|
66f7090 |
{
|
|
|
66f7090 |
Zero, /* PM1a_CNT.SLP_TYP */
|
|
|
66f7090 |
--
|
|
|
66f7090 |
1.7.4.4
|
|
|
66f7090 |
|