1 files changed, 73 insertions, 0 deletions
diff --git a/pc-bios/bios-pq/0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch b/pc-bios/bios-pq/0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch
new file mode 100644
index 0000000000..9a2eef4c60
--- /dev/null
+++ b/pc-bios/bios-pq/0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch
@@ -0,0 +1,73 @@
+qemu: bios: use preprocessor for pci link routing (Avi Kivity)
+
+Signed-off-by: Avi Kivity <avi@qumranet.com>
+Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
+
+Index: bochs/bios/acpi-dsdt.dsl
+===================================================================
+--- bochs.orig/bios/acpi-dsdt.dsl
++++ bochs/bios/acpi-dsdt.dsl
+@@ -47,42 +47,22 @@ DefinitionBlock (
+                    section 6.2.8.1 */
+                 /* Note: we provide the same info as the PCI routing
+                    table of the Bochs BIOS */
+-
+-                // PCI Slot 0
+-                Package() {0x0000ffff, 0, LNKD, 0},
+-                Package() {0x0000ffff, 1, LNKA, 0},
+-                Package() {0x0000ffff, 2, LNKB, 0},
+-                Package() {0x0000ffff, 3, LNKC, 0},
+-
+-                // PCI Slot 1
+-                Package() {0x0001ffff, 0, LNKA, 0},
+-                Package() {0x0001ffff, 1, LNKB, 0},
+-                Package() {0x0001ffff, 2, LNKC, 0},
+-                Package() {0x0001ffff, 3, LNKD, 0},
+-
+-                // PCI Slot 2
+-                Package() {0x0002ffff, 0, LNKB, 0},
+-                Package() {0x0002ffff, 1, LNKC, 0},
+-                Package() {0x0002ffff, 2, LNKD, 0},
+-                Package() {0x0002ffff, 3, LNKA, 0},
+-
+-                // PCI Slot 3
+-                Package() {0x0003ffff, 0, LNKC, 0},
+-                Package() {0x0003ffff, 1, LNKD, 0},
+-                Package() {0x0003ffff, 2, LNKA, 0},
+-                Package() {0x0003ffff, 3, LNKB, 0},
+-
+-                // PCI Slot 4
+-                Package() {0x0004ffff, 0, LNKD, 0},
+-                Package() {0x0004ffff, 1, LNKA, 0},
+-                Package() {0x0004ffff, 2, LNKB, 0},
+-                Package() {0x0004ffff, 3, LNKC, 0},
+-
+-                // PCI Slot 5
+-                Package() {0x0005ffff, 0, LNKA, 0},
+-                Package() {0x0005ffff, 1, LNKB, 0},
+-                Package() {0x0005ffff, 2, LNKC, 0},
+-                Package() {0x0005ffff, 3, LNKD, 0},
++#define prt_slot(nr, lnk0, lnk1, lnk2, lnk3) \
++       Package() { nr##ffff, 0, lnk0, 0 }, \
++       Package() { nr##ffff, 1, lnk1, 0 }, \
++       Package() { nr##ffff, 2, lnk2, 0 }, \
++       Package() { nr##ffff, 3, lnk3, 0 }
++
++#define prt_slot0(nr) prt_slot(nr, LNKD, LNKA, LNKB, LNKC)
++#define prt_slot1(nr) prt_slot(nr, LNKA, LNKB, LNKC, LNKD)
++#define prt_slot2(nr) prt_slot(nr, LNKB, LNKC, LNKD, LNKA)
++#define prt_slot3(nr) prt_slot(nr, LNKC, LNKD, LNKA, LNKB)
++               prt_slot0(0x0000),
++               prt_slot1(0x0001),
++               prt_slot2(0x0002),
++               prt_slot3(0x0003),
++               prt_slot0(0x0004),
++               prt_slot1(0x0005),
+             })
+ 
+             Name (_CRS, ResourceTemplate ()
+
+-- 
+
+
+