hvmloader: Reserve ioport ranges for expanded PHP
PATCH 1/1 hvmloader: Reserve ioport ranges for expanded PHP
My recent patch "Allow any unused PCI > device to be used for pass-through" and the follow-up "qemu-xen: pass-through: Allow slots 1e and 1f to be used" expand the number of PHP slots from 2 to 32. Accordingly the ioport space required has expanded by 30 bytes.
---
This patch should be appropriate for 3.4
tools/firmware/hvmloader/acpi/dsdt.asl +2 -2
@@ -123,7 +123,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, Name (_BBN, 0x00) /* - * Reserve the IO port ranges [0x10c0, 0x10c2] and [0xb044, 0xb047]. + * Reserve the IO port ranges [0x10c0, 0x10e2] and [0xb044, 0xb047]. * Or else, for a hotplugged-in device, the port IO BAR assigned * by guest OS may conflict with the ranges here. */
@@ -131,7 +131,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, { Name(_HID, EISAID("PNP0C02")) Name(_CRS, ResourceTemplate() { - IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x03) + IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x23) IO (Decode16, 0xb044, 0xb044, 0x00, 0x04) }) }
tools/firmware/hvmloader/acpi/dsdt.c +6 -6
@@ -1,11 +1,11 @@/* * * Intel ACPI Component Architecture -* ASL Optimizing Compiler version 20090220 [Mar 9 2009] -* Copyright (C) 2000 - 2009 Intel Corporation +* ASL Optimizing Compiler version 20061109 [May 18 2007] +* Copyright (C) 2000 - 2006 Intel Corporation * Supports ACPI Specification Revision 3.0a * -* Compilation of "dsdt.asl" - Tue Mar 17 10:44:21 2009 +* Compilation of "dsdt.asl" - Tue Mar 31 20:02:43 2009 * * C source code output *
@@ -13,10 +13,10 @@unsigned char AmlCode[] = {0x44 ,0x53 ,0x44 ,0x54 ,0x02 ,0x32 ,0x00 ,0x00 ,/* 00000000 "DSDT.2.." */ -0x02 ,0xC6 ,0x58 ,0x65 ,0x6E ,0x00 ,0x00 ,0x00 ,/* 00000008 "..Xen..." */ +0x02 ,0xB1 ,0x58 ,0x65 ,0x6E ,0x00 ,0x00 ,0x00 ,/* 00000008 "..Xen..." */ 0x48 ,0x56 ,0x4D ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* 00000010 "HVM....." */ 0x00 ,0x00 ,0x00 ,0x00 ,0x49 ,0x4E ,0x54 ,0x4C ,/* 00000018 "....INTL" */ -0x20 ,0x02 ,0x09 ,0x20 ,0x08 ,0x50 ,0x4D ,0x42 ,/* 00000020 " .. .PMB" */ +0x09 ,0x11 ,0x06 ,0x20 ,0x08 ,0x50 ,0x4D ,0x42 ,/* 00000020 "... .PMB" */ 0x53 ,0x0B ,0x00 ,0x0C ,0x08 ,0x50 ,0x4D ,0x4C ,/* 00000028 "S....PML" */ 0x4E ,0x0A ,0x08 ,0x08 ,0x49 ,0x4F ,0x42 ,0x31 ,/* 00000030 "N...IOB1" */ 0x00 ,0x08 ,0x49 ,0x4F ,0x4C ,0x31 ,0x00 ,0x08 ,/* 00000038 "..IOL1.." */
@@ -81,7 +81,7 @@ unsigned char AmlCode[] =0x08 ,0x5F ,0x48 ,0x49 ,0x44 ,0x0C ,0x41 ,0xD0 ,/* 00000210 "._HID.A." */ 0x0C ,0x02 ,0x08 ,0x5F ,0x43 ,0x52 ,0x53 ,0x11 ,/* 00000218 "..._CRS." */ 0x15 ,0x0A ,0x12 ,0x47 ,0x01 ,0xC0 ,0x10 ,0xC0 ,/* 00000220 "...G...." */ -0x10 ,0x00 ,0x03 ,0x47 ,0x01 ,0x44 ,0xB0 ,0x44 ,/* 00000228 "...G.D.D" */ +0x10 ,0x00 ,0x23 ,0x47 ,0x01 ,0x44 ,0xB0 ,0x44 ,/* 00000228 "..#G.D.D" */ 0xB0 ,0x00 ,0x04 ,0x79 ,0x00 ,0x14 ,0x4E ,0x0C ,/* 00000230 "...y..N." */ 0x5F ,0x43 ,0x52 ,0x53 ,0x00 ,0x08 ,0x50 ,0x52 ,/* 00000238 "_CRS..PR" */ 0x54,0x30,0x11,0x42,0x07,0x0A,0x6E,0x88, /* 00000240 "T0.B..n." */
Apologies. This patch is not quite correct. The number of registers was increased from 3 to 34. I will repost.
Quoted 80 lines · Simon Horman
My recent patch "Allow any unused PCI > device to be used for pass-through" and the follow-up "qemu-xen: pass-through: Allow slots 1e and 1f to be used" expand the number of PHP slots from 2 to 32. Accordingly the ioport space required has expanded by 30 bytes.
Cc Dexuan Cui <[email protected]>,Signed-off-by Simon Horman <[email protected]>---
This patch should be appropriate for 3.4
Index: xen-unstable.hg/tools/firmware/hvmloader/acpi/dsdt.asl
===================================================================tools/firmware/hvmloader/acpi/dsdt.asl +2
-2@@ -123,7 +123,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, Name (_BBN, 0x00) /* - * Reserve the IO port ranges [0x10c0, 0x10c2] and [0xb044, 0xb047]. + * Reserve the IO port ranges [0x10c0, 0x10e2] and [0xb044, 0xb047]. * Or else, for a hotplugged-in device, the port IO BAR assigned * by guest OS may conflict with the ranges here. */@@ -131,7 +131,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, { Name(_HID, EISAID("PNP0C02")) Name(_CRS, ResourceTemplate() { - IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x03) + IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x23) IO (Decode16, 0xb044, 0xb044, 0x00, 0x04) }) }Index:
xen-unstable.hg/tools/firmware/hvmloader/acpi/dsdt.c
===================================================================tools/firmware/hvmloader/acpi/dsdt.c +6
-6@@ -1,11 +1,11 @@/* * * Intel ACPI Component Architecture -* ASL Optimizing Compiler version 20090220 [Mar 9 2009] -* Copyright (C) 2000 - 2009 Intel Corporation +* ASL Optimizing Compiler version 20061109 [May 18 2007] +* Copyright (C) 2000 - 2006 Intel Corporation * Supports ACPI Specification Revision 3.0a * -* Compilation of "dsdt.asl" - Tue Mar 17 10:44:21 2009 +* Compilation of "dsdt.asl" - Tue Mar 31 20:02:43 2009 * * C source code output * @@ -13,10 +13,10 @@unsigned char AmlCode[] = {0x44 ,0x53 ,0x44 ,0x54 ,0x02 ,0x32 ,0x00 ,0x00 ,/* 00000000 "DSDT.2.." */ -0x02 ,0xC6 ,0x58 ,0x65 ,0x6E ,0x00 ,0x00 ,0x00 ,/* 00000008 "..Xen..." */ +0x02 ,0xB1 ,0x58 ,0x65 ,0x6E ,0x00 ,0x00 ,0x00 ,/* 00000008 "..Xen..." */ 0x48 ,0x56 ,0x4D ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* 00000010 "HVM....." */ 0x00 ,0x00 ,0x00 ,0x00 ,0x49 ,0x4E ,0x54 ,0x4C ,/* 00000018 "....INTL" */ -0x20 ,0x02 ,0x09 ,0x20 ,0x08 ,0x50 ,0x4D ,0x42 ,/* 00000020 " .. .PMB" */ +0x09 ,0x11 ,0x06 ,0x20 ,0x08 ,0x50 ,0x4D ,0x42 ,/* 00000020 "... .PMB" */ 0x53 ,0x0B ,0x00 ,0x0C ,0x08 ,0x50 ,0x4D ,0x4C ,/* 00000028 "S....PML" */ 0x4E ,0x0A ,0x08 ,0x08 ,0x49 ,0x4F ,0x42 ,0x31 ,/* 00000030 "N...IOB1" */ 0x00 ,0x08 ,0x49 ,0x4F ,0x4C ,0x31 ,0x00 ,0x08 ,/* 00000038 "..IOL1.." */ @@ -81,7 +81,7 @@ unsigned char AmlCode[] =0x08 ,0x5F ,0x48 ,0x49 ,0x44 ,0x0C ,0x41 ,0xD0 ,/* 00000210 "._HID.A." */ 0x0C ,0x02 ,0x08 ,0x5F ,0x43 ,0x52 ,0x53 ,0x11 ,/* 00000218 "..._CRS." */ 0x15 ,0x0A ,0x12 ,0x47 ,0x01 ,0xC0 ,0x10 ,0xC0 ,/* 00000220 "...G...." */ -0x10 ,0x00 ,0x03 ,0x47 ,0x01 ,0x44 ,0xB0 ,0x44 ,/* 00000228 "...G.D.D" */ +0x10 ,0x00 ,0x23 ,0x47 ,0x01 ,0x44 ,0xB0 ,0x44 ,/* 00000228 "..#G.D.D" */ 0xB0 ,0x00 ,0x04 ,0x79 ,0x00 ,0x14 ,0x4E ,0x0C ,/* 00000230 "...y..N." */ 0x5F ,0x43 ,0x52 ,0x53 ,0x00 ,0x08 ,0x50 ,0x52 ,/* 00000238 "_CRS..PR" */ 0x54,0x30,0x11,0x42,0x07,0x0A,0x6E,0x88, /* 00000240 "T0.B..n." */_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Signature · 3 lines
Simon Horman VA Linux Systems Japan K.K., Sydney, Australia Satellite Office H: www.vergenet.net/~horms/ W: www.valinux.co.jp/en
My recent patch "Allow any unused PCI > device to be used for pass-through" and the follow-up "qemu-xen: pass-through: Allow slots 1e and 1f to be used" expand the number of PHP slots from 3 to 34.
Previously there was one control register plus one register for each of the 2 PHP slots. A total of 3 registers.
Now there are two control registers plus one register for each of the 32 PHP slots. A total of 34 registers.
Accordingly the ioport space required has expanded by from 3 to 34 bytes.
---
This patch should be appropriate for 3.4
* Tue, 31 Mar 2009 20:12:39 +1100
Initial public release
* Tue, 31 Mar 2009 20:55:15 +1100
Update the number of registers in the change-log and code. There were 3. now there are 34.
tools/firmware/hvmloader/acpi/dsdt.asl +2 -2
@@ -123,7 +123,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, Name (_BBN, 0x00) /* - * Reserve the IO port ranges [0x10c0, 0x10c2] and [0xb044, 0xb047]. + * Reserve the IO port ranges [0x10c0, 0x10e1] and [0xb044, 0xb047]. * Or else, for a hotplugged-in device, the port IO BAR assigned * by guest OS may conflict with the ranges here. */
@@ -131,7 +131,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, { Name(_HID, EISAID("PNP0C02")) Name(_CRS, ResourceTemplate() { - IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x03) + IO (Decode16, 0x10c0, 0x10c0, 0x00, 0x22) IO (Decode16, 0xb044, 0xb044, 0x00, 0x04) }) }
tools/firmware/hvmloader/acpi/dsdt.c +6 -6
@@ -1,11 +1,11 @@/* * * Intel ACPI Component Architecture -* ASL Optimizing Compiler version 20090220 [Mar 9 2009] -* Copyright (C) 2000 - 2009 Intel Corporation +* ASL Optimizing Compiler version 20061109 [May 18 2007] +* Copyright (C) 2000 - 2006 Intel Corporation * Supports ACPI Specification Revision 3.0a * -* Compilation of "dsdt.asl" - Tue Mar 17 10:44:21 2009 +* Compilation of "dsdt.asl" - Tue Mar 31 20:53:03 2009 * * C source code output *
@@ -13,10 +13,10 @@unsigned char AmlCode[] = {0x44 ,0x53 ,0x44 ,0x54 ,0x02 ,0x32 ,0x00 ,0x00 ,/* 00000000 "DSDT.2.." */ -0x02 ,0xC6 ,0x58 ,0x65 ,0x6E ,0x00 ,0x00 ,0x00 ,/* 00000008 "..Xen..." */ +0x02 ,0xB2 ,0x58 ,0x65 ,0x6E ,0x00 ,0x00 ,0x00 ,/* 00000008 "..Xen..." */ 0x48 ,0x56 ,0x4D ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* 00000010 "HVM....." */ 0x00 ,0x00 ,0x00 ,0x00 ,0x49 ,0x4E ,0x54 ,0x4C ,/* 00000018 "....INTL" */ -0x20 ,0x02 ,0x09 ,0x20 ,0x08 ,0x50 ,0x4D ,0x42 ,/* 00000020 " .. .PMB" */ +0x09 ,0x11 ,0x06 ,0x20 ,0x08 ,0x50 ,0x4D ,0x42 ,/* 00000020 "... .PMB" */ 0x53 ,0x0B ,0x00 ,0x0C ,0x08 ,0x50 ,0x4D ,0x4C ,/* 00000028 "S....PML" */ 0x4E ,0x0A ,0x08 ,0x08 ,0x49 ,0x4F ,0x42 ,0x31 ,/* 00000030 "N...IOB1" */ 0x00 ,0x08 ,0x49 ,0x4F ,0x4C ,0x31 ,0x00 ,0x08 ,/* 00000038 "..IOL1.." */
@@ -81,7 +81,7 @@ unsigned char AmlCode[] =0x08 ,0x5F ,0x48 ,0x49 ,0x44 ,0x0C ,0x41 ,0xD0 ,/* 00000210 "._HID.A." */ 0x0C ,0x02 ,0x08 ,0x5F ,0x43 ,0x52 ,0x53 ,0x11 ,/* 00000218 "..._CRS." */ 0x15 ,0x0A ,0x12 ,0x47 ,0x01 ,0xC0 ,0x10 ,0xC0 ,/* 00000220 "...G...." */ -0x10 ,0x00 ,0x03 ,0x47 ,0x01 ,0x44 ,0xB0 ,0x44 ,/* 00000228 "...G.D.D" */ +0x10 ,0x00 ,0x22 ,0x47 ,0x01 ,0x44 ,0xB0 ,0x44 ,/* 00000228 ".."G.D.D" */ 0xB0 ,0x00 ,0x04 ,0x79 ,0x00 ,0x14 ,0x4E ,0x0C ,/* 00000230 "...y..N." */ 0x5F ,0x43 ,0x52 ,0x53 ,0x00 ,0x08 ,0x50 ,0x52 ,/* 00000238 "_CRS..PR" */ 0x54,0x30,0x11,0x42,0x07,0x0A,0x6E,0x88, /* 00000240 "T0.B..n." */