This patch move the IO port range reservation from the dsdt.asl to mk_dsdt.
This IO port range need to be generated by mk_dsdt, because qemu-xen use
different port. The IO port for qemu-xen will be added in a later patch.
Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
tools/firmware/hvmloader/acpi/dsdt.asl | 14 --------------
tools/firmware/hvmloader/acpi/mk_dsdt.c | 14 ++++++++++++++
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/dsdt.asl
b/tools/firmware/hvmloader/acpi/dsdt.asl
index 1bcee86..0549d7b 100644
--- a/tools/firmware/hvmloader/acpi/dsdt.asl
+++ b/tools/firmware/hvmloader/acpi/dsdt.asl
@@ -100,20 +100,6 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0)
Name (_ADR, 0x00)
Name (_BBN, 0x00)
- /*
- * Reserve the IO port ranges [0x10c0, 0x1101] and [0xb044, 0xb047].
- * Or else, for a hotplugged-in device, the port IO BAR assigned
- * by guest OS may conflict with the ranges here.
- */
- Device(HP0)
- {
- Name(_HID, EISAID("PNP0C02"))
- Name(_CRS, ResourceTemplate() {
- IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x82)
- IO (Decode16, 0xb044, 0xb044, 0x00, 0x04)
- })
- }
-
/* Make cirrues VGA S3 suspend/resume work in Windows XP/2003 */
Device (VGA)
{
diff --git a/tools/firmware/hvmloader/acpi/mk_dsdt.c
b/tools/firmware/hvmloader/acpi/mk_dsdt.c
index ab8a4fb..8cab7ba 100644
--- a/tools/firmware/hvmloader/acpi/mk_dsdt.c
+++ b/tools/firmware/hvmloader/acpi/mk_dsdt.c
@@ -210,6 +210,20 @@ int main(int argc, char **argv)
/**** PCI0 start ****/
push_block("Scope", "\\_SB.PCI0");
+ /*
+ * Reserve the IO port ranges [0x10c0, 0x1101] and [0xb044, 0xb047].
+ * Or else, for a hotplugged-in device, the port IO BAR assigned
+ * by guest OS may conflict with the ranges here.
+ */
+ push_block("Device", "HP0"); {
+ stmt("Name", "_HID, EISAID(\"PNP0C02\")");
+ stmt("Name", "_CRS, ResourceTemplate() {"
+ " IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x82)"
+ " IO (Decode16, 0xb044, 0xb044, 0x00, 0x04)"
+ "}");
+ } pop_block();
+
+
/*** PCI-ISA link definitions ***/
/* BUFA: List of ISA IRQs available for linking to PCI INTx. */
stmt("Name", "BUFA, ResourceTemplate() { "
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home