pc-bios/bios-pq/0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch

   1 qemu: bios: use preprocessor for pci link routing (Avi Kivity)
   2
   3 Signed-off-by: Avi Kivity <avi@qumranet.com>
   4 Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
   5
   6 Index: bochs/bios/acpi-dsdt.dsl
   7 ===================================================================
   8 --- bochs.orig/bios/acpi-dsdt.dsl
   9 +++ bochs/bios/acpi-dsdt.dsl
  10 @@ -47,42 +47,22 @@ DefinitionBlock (
  11                     section 6.2.8.1 */
  12                  /* Note: we provide the same info as the PCI routing
  13                     table of the Bochs BIOS */
  14 -
  15 -                // PCI Slot 0
  16 -                Package() {0x0000ffff, 0, LNKD, 0},
  17 -                Package() {0x0000ffff, 1, LNKA, 0},
  18 -                Package() {0x0000ffff, 2, LNKB, 0},
  19 -                Package() {0x0000ffff, 3, LNKC, 0},
  20 -
  21 -                // PCI Slot 1
  22 -                Package() {0x0001ffff, 0, LNKA, 0},
  23 -                Package() {0x0001ffff, 1, LNKB, 0},
  24 -                Package() {0x0001ffff, 2, LNKC, 0},
  25 -                Package() {0x0001ffff, 3, LNKD, 0},
  26 -
  27 -                // PCI Slot 2
  28 -                Package() {0x0002ffff, 0, LNKB, 0},
  29 -                Package() {0x0002ffff, 1, LNKC, 0},
  30 -                Package() {0x0002ffff, 2, LNKD, 0},
  31 -                Package() {0x0002ffff, 3, LNKA, 0},
  32 -
  33 -                // PCI Slot 3
  34 -                Package() {0x0003ffff, 0, LNKC, 0},
  35 -                Package() {0x0003ffff, 1, LNKD, 0},
  36 -                Package() {0x0003ffff, 2, LNKA, 0},
  37 -                Package() {0x0003ffff, 3, LNKB, 0},
  38 -
  39 -                // PCI Slot 4
  40 -                Package() {0x0004ffff, 0, LNKD, 0},
  41 -                Package() {0x0004ffff, 1, LNKA, 0},
  42 -                Package() {0x0004ffff, 2, LNKB, 0},
  43 -                Package() {0x0004ffff, 3, LNKC, 0},
  44 -
  45 -                // PCI Slot 5
  46 -                Package() {0x0005ffff, 0, LNKA, 0},
  47 -                Package() {0x0005ffff, 1, LNKB, 0},
  48 -                Package() {0x0005ffff, 2, LNKC, 0},
  49 -                Package() {0x0005ffff, 3, LNKD, 0},
  50 +#define prt_slot(nr, lnk0, lnk1, lnk2, lnk3) \
  51 +       Package() { nr##ffff, 0, lnk0, 0 }, \
  52 +       Package() { nr##ffff, 1, lnk1, 0 }, \
  53 +       Package() { nr##ffff, 2, lnk2, 0 }, \
  54 +       Package() { nr##ffff, 3, lnk3, 0 }
  55 +
  56 +#define prt_slot0(nr) prt_slot(nr, LNKD, LNKA, LNKB, LNKC)
  57 +#define prt_slot1(nr) prt_slot(nr, LNKA, LNKB, LNKC, LNKD)
  58 +#define prt_slot2(nr) prt_slot(nr, LNKB, LNKC, LNKD, LNKA)
  59 +#define prt_slot3(nr) prt_slot(nr, LNKC, LNKD, LNKA, LNKB)
  60 +               prt_slot0(0x0000),
  61 +               prt_slot1(0x0001),
  62 +               prt_slot2(0x0002),
  63 +               prt_slot3(0x0003),
  64 +               prt_slot0(0x0004),
  65 +               prt_slot1(0x0005),
  66              })
  67
  68              Name (_CRS, ResourceTemplate ()
  69
  70 --
  71
  72
  73