Commit 6583391f0de86f6bec28ea13a0c16c9ee2fa6b8f
1 parent
6515b203
PCI irq mapping fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1903 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
51 additions
and
51 deletions
hw/acpi-dsdt.dsl
@@ -63,40 +63,40 @@ DefinitionBlock ( | @@ -63,40 +63,40 @@ DefinitionBlock ( | ||
63 | table of the Bochs BIOS */ | 63 | table of the Bochs BIOS */ |
64 | 64 | ||
65 | // PCI Slot 0 | 65 | // PCI Slot 0 |
66 | - Package() {0x0000ffff, 0, LNKA, 0}, | ||
67 | - Package() {0x0000ffff, 1, LNKB, 0}, | ||
68 | - Package() {0x0000ffff, 2, LNKC, 0}, | ||
69 | - Package() {0x0000ffff, 3, LNKD, 0}, | ||
70 | - | ||
71 | - // PCI Slot 1 | ||
72 | - Package() {0x0001ffff, 0, LNKB, 0}, | ||
73 | - Package() {0x0001ffff, 1, LNKC, 0}, | ||
74 | - Package() {0x0001ffff, 2, LNKD, 0}, | ||
75 | - Package() {0x0001ffff, 3, LNKA, 0}, | 66 | + Package() {0x0000ffff, 0, LNKD, 0}, |
67 | + Package() {0x0000ffff, 1, LNKA, 0}, | ||
68 | + Package() {0x0000ffff, 2, LNKB, 0}, | ||
69 | + Package() {0x0000ffff, 3, LNKC, 0}, | ||
76 | 70 | ||
71 | + // PCI Slot 1 | ||
72 | + Package() {0x0001ffff, 0, LNKA, 0}, | ||
73 | + Package() {0x0001ffff, 1, LNKB, 0}, | ||
74 | + Package() {0x0001ffff, 2, LNKC, 0}, | ||
75 | + Package() {0x0001ffff, 3, LNKD, 0}, | ||
76 | + | ||
77 | // PCI Slot 2 | 77 | // PCI Slot 2 |
78 | - Package() {0x0002ffff, 0, LNKC, 0}, | ||
79 | - Package() {0x0002ffff, 1, LNKD, 0}, | ||
80 | - Package() {0x0002ffff, 2, LNKA, 0}, | ||
81 | - Package() {0x0002ffff, 3, LNKB, 0}, | 78 | + Package() {0x0002ffff, 0, LNKB, 0}, |
79 | + Package() {0x0002ffff, 1, LNKC, 0}, | ||
80 | + Package() {0x0002ffff, 2, LNKD, 0}, | ||
81 | + Package() {0x0002ffff, 3, LNKA, 0}, | ||
82 | 82 | ||
83 | // PCI Slot 3 | 83 | // PCI Slot 3 |
84 | - Package() {0x0003ffff, 0, LNKD, 0}, | ||
85 | - Package() {0x0003ffff, 1, LNKA, 0}, | ||
86 | - Package() {0x0003ffff, 2, LNKB, 0}, | ||
87 | - Package() {0x0003ffff, 3, LNKC, 0}, | 84 | + Package() {0x0003ffff, 0, LNKC, 0}, |
85 | + Package() {0x0003ffff, 1, LNKD, 0}, | ||
86 | + Package() {0x0003ffff, 2, LNKA, 0}, | ||
87 | + Package() {0x0003ffff, 3, LNKB, 0}, | ||
88 | 88 | ||
89 | // PCI Slot 4 | 89 | // PCI Slot 4 |
90 | - Package() {0x0004ffff, 0, LNKA, 0}, | ||
91 | - Package() {0x0004ffff, 1, LNKB, 0}, | ||
92 | - Package() {0x0004ffff, 2, LNKC, 0}, | ||
93 | - Package() {0x0004ffff, 3, LNKD, 0}, | 90 | + Package() {0x0004ffff, 0, LNKD, 0}, |
91 | + Package() {0x0004ffff, 1, LNKA, 0}, | ||
92 | + Package() {0x0004ffff, 2, LNKB, 0}, | ||
93 | + Package() {0x0004ffff, 3, LNKC, 0}, | ||
94 | 94 | ||
95 | // PCI Slot 5 | 95 | // PCI Slot 5 |
96 | - Package() {0x0005ffff, 0, LNKB, 0}, | ||
97 | - Package() {0x0005ffff, 1, LNKC, 0}, | ||
98 | - Package() {0x0005ffff, 2, LNKD, 0}, | ||
99 | - Package() {0x0005ffff, 3, LNKA, 0}, | 96 | + Package() {0x0005ffff, 0, LNKA, 0}, |
97 | + Package() {0x0005ffff, 1, LNKB, 0}, | ||
98 | + Package() {0x0005ffff, 2, LNKC, 0}, | ||
99 | + Package() {0x0005ffff, 3, LNKD, 0}, | ||
100 | }) | 100 | }) |
101 | 101 | ||
102 | Method (_CRS, 0, NotSerialized) | 102 | Method (_CRS, 0, NotSerialized) |
hw/acpi-dsdt.hex
@@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
5 | * Copyright (C) 2000 - 2006 Intel Corporation | 5 | * Copyright (C) 2000 - 2006 Intel Corporation |
6 | * Supports ACPI Specification Revision 3.0a | 6 | * Supports ACPI Specification Revision 3.0a |
7 | * | 7 | * |
8 | - * Compilation of "/usr/local/home/bellard/qemu-current/hw/acpi-dsdt.dsl" - Wed May 3 22:49:16 2006 | 8 | + * Compilation of "/usr/local/home/bellard/qemu-current/hw/acpi-dsdt.dsl" - Thu May 4 01:07:59 2006 |
9 | * | 9 | * |
10 | * C source code output | 10 | * C source code output |
11 | * | 11 | * |
@@ -33,48 +33,48 @@ unsigned char AmlCode[] = | @@ -33,48 +33,48 @@ unsigned char AmlCode[] = | ||
33 | 0x44,0x52,0x00,0x08,0x5F,0x55,0x49,0x44, /* 00000090 "DR.._UID" */ | 33 | 0x44,0x52,0x00,0x08,0x5F,0x55,0x49,0x44, /* 00000090 "DR.._UID" */ |
34 | 0x01,0x08,0x5F,0x50,0x52,0x54,0x12,0x47, /* 00000098 ".._PRT.G" */ | 34 | 0x01,0x08,0x5F,0x50,0x52,0x54,0x12,0x47, /* 00000098 ".._PRT.G" */ |
35 | 0x15,0x18,0x12,0x0B,0x04,0x0B,0xFF,0xFF, /* 000000A0 "........" */ | 35 | 0x15,0x18,0x12,0x0B,0x04,0x0B,0xFF,0xFF, /* 000000A0 "........" */ |
36 | - 0x00,0x4C,0x4E,0x4B,0x41,0x00,0x12,0x0B, /* 000000A8 ".LNKA..." */ | 36 | + 0x00,0x4C,0x4E,0x4B,0x44,0x00,0x12,0x0B, /* 000000A8 ".LNKD..." */ |
37 | 0x04,0x0B,0xFF,0xFF,0x01,0x4C,0x4E,0x4B, /* 000000B0 ".....LNK" */ | 37 | 0x04,0x0B,0xFF,0xFF,0x01,0x4C,0x4E,0x4B, /* 000000B0 ".....LNK" */ |
38 | - 0x42,0x00,0x12,0x0C,0x04,0x0B,0xFF,0xFF, /* 000000B8 "B......." */ | ||
39 | - 0x0A,0x02,0x4C,0x4E,0x4B,0x43,0x00,0x12, /* 000000C0 "..LNKC.." */ | 38 | + 0x41,0x00,0x12,0x0C,0x04,0x0B,0xFF,0xFF, /* 000000B8 "A......." */ |
39 | + 0x0A,0x02,0x4C,0x4E,0x4B,0x42,0x00,0x12, /* 000000C0 "..LNKB.." */ | ||
40 | 0x0C,0x04,0x0B,0xFF,0xFF,0x0A,0x03,0x4C, /* 000000C8 ".......L" */ | 40 | 0x0C,0x04,0x0B,0xFF,0xFF,0x0A,0x03,0x4C, /* 000000C8 ".......L" */ |
41 | - 0x4E,0x4B,0x44,0x00,0x12,0x0D,0x04,0x0C, /* 000000D0 "NKD....." */ | 41 | + 0x4E,0x4B,0x43,0x00,0x12,0x0D,0x04,0x0C, /* 000000D0 "NKC....." */ |
42 | 0xFF,0xFF,0x01,0x00,0x00,0x4C,0x4E,0x4B, /* 000000D8 ".....LNK" */ | 42 | 0xFF,0xFF,0x01,0x00,0x00,0x4C,0x4E,0x4B, /* 000000D8 ".....LNK" */ |
43 | - 0x42,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 000000E0 "B......." */ | ||
44 | - 0x01,0x00,0x01,0x4C,0x4E,0x4B,0x43,0x00, /* 000000E8 "...LNKC." */ | 43 | + 0x41,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 000000E0 "A......." */ |
44 | + 0x01,0x00,0x01,0x4C,0x4E,0x4B,0x42,0x00, /* 000000E8 "...LNKB." */ | ||
45 | 0x12,0x0E,0x04,0x0C,0xFF,0xFF,0x01,0x00, /* 000000F0 "........" */ | 45 | 0x12,0x0E,0x04,0x0C,0xFF,0xFF,0x01,0x00, /* 000000F0 "........" */ |
46 | - 0x0A,0x02,0x4C,0x4E,0x4B,0x44,0x00,0x12, /* 000000F8 "..LNKD.." */ | 46 | + 0x0A,0x02,0x4C,0x4E,0x4B,0x43,0x00,0x12, /* 000000F8 "..LNKC.." */ |
47 | 0x0E,0x04,0x0C,0xFF,0xFF,0x01,0x00,0x0A, /* 00000100 "........" */ | 47 | 0x0E,0x04,0x0C,0xFF,0xFF,0x01,0x00,0x0A, /* 00000100 "........" */ |
48 | - 0x03,0x4C,0x4E,0x4B,0x41,0x00,0x12,0x0D, /* 00000108 ".LNKA..." */ | 48 | + 0x03,0x4C,0x4E,0x4B,0x44,0x00,0x12,0x0D, /* 00000108 ".LNKD..." */ |
49 | 0x04,0x0C,0xFF,0xFF,0x02,0x00,0x00,0x4C, /* 00000110 ".......L" */ | 49 | 0x04,0x0C,0xFF,0xFF,0x02,0x00,0x00,0x4C, /* 00000110 ".......L" */ |
50 | - 0x4E,0x4B,0x43,0x00,0x12,0x0D,0x04,0x0C, /* 00000118 "NKC....." */ | 50 | + 0x4E,0x4B,0x42,0x00,0x12,0x0D,0x04,0x0C, /* 00000118 "NKB....." */ |
51 | 0xFF,0xFF,0x02,0x00,0x01,0x4C,0x4E,0x4B, /* 00000120 ".....LNK" */ | 51 | 0xFF,0xFF,0x02,0x00,0x01,0x4C,0x4E,0x4B, /* 00000120 ".....LNK" */ |
52 | - 0x44,0x00,0x12,0x0E,0x04,0x0C,0xFF,0xFF, /* 00000128 "D......." */ | ||
53 | - 0x02,0x00,0x0A,0x02,0x4C,0x4E,0x4B,0x41, /* 00000130 "....LNKA" */ | 52 | + 0x43,0x00,0x12,0x0E,0x04,0x0C,0xFF,0xFF, /* 00000128 "C......." */ |
53 | + 0x02,0x00,0x0A,0x02,0x4C,0x4E,0x4B,0x44, /* 00000130 "....LNKD" */ | ||
54 | 0x00,0x12,0x0E,0x04,0x0C,0xFF,0xFF,0x02, /* 00000138 "........" */ | 54 | 0x00,0x12,0x0E,0x04,0x0C,0xFF,0xFF,0x02, /* 00000138 "........" */ |
55 | - 0x00,0x0A,0x03,0x4C,0x4E,0x4B,0x42,0x00, /* 00000140 "...LNKB." */ | 55 | + 0x00,0x0A,0x03,0x4C,0x4E,0x4B,0x41,0x00, /* 00000140 "...LNKA." */ |
56 | 0x12,0x0D,0x04,0x0C,0xFF,0xFF,0x03,0x00, /* 00000148 "........" */ | 56 | 0x12,0x0D,0x04,0x0C,0xFF,0xFF,0x03,0x00, /* 00000148 "........" */ |
57 | - 0x00,0x4C,0x4E,0x4B,0x44,0x00,0x12,0x0D, /* 00000150 ".LNKD..." */ | 57 | + 0x00,0x4C,0x4E,0x4B,0x43,0x00,0x12,0x0D, /* 00000150 ".LNKC..." */ |
58 | 0x04,0x0C,0xFF,0xFF,0x03,0x00,0x01,0x4C, /* 00000158 ".......L" */ | 58 | 0x04,0x0C,0xFF,0xFF,0x03,0x00,0x01,0x4C, /* 00000158 ".......L" */ |
59 | - 0x4E,0x4B,0x41,0x00,0x12,0x0E,0x04,0x0C, /* 00000160 "NKA....." */ | 59 | + 0x4E,0x4B,0x44,0x00,0x12,0x0E,0x04,0x0C, /* 00000160 "NKD....." */ |
60 | 0xFF,0xFF,0x03,0x00,0x0A,0x02,0x4C,0x4E, /* 00000168 "......LN" */ | 60 | 0xFF,0xFF,0x03,0x00,0x0A,0x02,0x4C,0x4E, /* 00000168 "......LN" */ |
61 | - 0x4B,0x42,0x00,0x12,0x0E,0x04,0x0C,0xFF, /* 00000170 "KB......" */ | 61 | + 0x4B,0x41,0x00,0x12,0x0E,0x04,0x0C,0xFF, /* 00000170 "KA......" */ |
62 | 0xFF,0x03,0x00,0x0A,0x03,0x4C,0x4E,0x4B, /* 00000178 ".....LNK" */ | 62 | 0xFF,0x03,0x00,0x0A,0x03,0x4C,0x4E,0x4B, /* 00000178 ".....LNK" */ |
63 | - 0x43,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 00000180 "C......." */ | ||
64 | - 0x04,0x00,0x00,0x4C,0x4E,0x4B,0x41,0x00, /* 00000188 "...LNKA." */ | 63 | + 0x42,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 00000180 "B......." */ |
64 | + 0x04,0x00,0x00,0x4C,0x4E,0x4B,0x44,0x00, /* 00000188 "...LNKD." */ | ||
65 | 0x12,0x0D,0x04,0x0C,0xFF,0xFF,0x04,0x00, /* 00000190 "........" */ | 65 | 0x12,0x0D,0x04,0x0C,0xFF,0xFF,0x04,0x00, /* 00000190 "........" */ |
66 | - 0x01,0x4C,0x4E,0x4B,0x42,0x00,0x12,0x0E, /* 00000198 ".LNKB..." */ | 66 | + 0x01,0x4C,0x4E,0x4B,0x41,0x00,0x12,0x0E, /* 00000198 ".LNKA..." */ |
67 | 0x04,0x0C,0xFF,0xFF,0x04,0x00,0x0A,0x02, /* 000001A0 "........" */ | 67 | 0x04,0x0C,0xFF,0xFF,0x04,0x00,0x0A,0x02, /* 000001A0 "........" */ |
68 | - 0x4C,0x4E,0x4B,0x43,0x00,0x12,0x0E,0x04, /* 000001A8 "LNKC...." */ | 68 | + 0x4C,0x4E,0x4B,0x42,0x00,0x12,0x0E,0x04, /* 000001A8 "LNKB...." */ |
69 | 0x0C,0xFF,0xFF,0x04,0x00,0x0A,0x03,0x4C, /* 000001B0 ".......L" */ | 69 | 0x0C,0xFF,0xFF,0x04,0x00,0x0A,0x03,0x4C, /* 000001B0 ".......L" */ |
70 | - 0x4E,0x4B,0x44,0x00,0x12,0x0D,0x04,0x0C, /* 000001B8 "NKD....." */ | 70 | + 0x4E,0x4B,0x43,0x00,0x12,0x0D,0x04,0x0C, /* 000001B8 "NKC....." */ |
71 | 0xFF,0xFF,0x05,0x00,0x00,0x4C,0x4E,0x4B, /* 000001C0 ".....LNK" */ | 71 | 0xFF,0xFF,0x05,0x00,0x00,0x4C,0x4E,0x4B, /* 000001C0 ".....LNK" */ |
72 | - 0x42,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 000001C8 "B......." */ | ||
73 | - 0x05,0x00,0x01,0x4C,0x4E,0x4B,0x43,0x00, /* 000001D0 "...LNKC." */ | 72 | + 0x41,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 000001C8 "A......." */ |
73 | + 0x05,0x00,0x01,0x4C,0x4E,0x4B,0x42,0x00, /* 000001D0 "...LNKB." */ | ||
74 | 0x12,0x0E,0x04,0x0C,0xFF,0xFF,0x05,0x00, /* 000001D8 "........" */ | 74 | 0x12,0x0E,0x04,0x0C,0xFF,0xFF,0x05,0x00, /* 000001D8 "........" */ |
75 | - 0x0A,0x02,0x4C,0x4E,0x4B,0x44,0x00,0x12, /* 000001E0 "..LNKD.." */ | 75 | + 0x0A,0x02,0x4C,0x4E,0x4B,0x43,0x00,0x12, /* 000001E0 "..LNKC.." */ |
76 | 0x0E,0x04,0x0C,0xFF,0xFF,0x05,0x00,0x0A, /* 000001E8 "........" */ | 76 | 0x0E,0x04,0x0C,0xFF,0xFF,0x05,0x00,0x0A, /* 000001E8 "........" */ |
77 | - 0x03,0x4C,0x4E,0x4B,0x41,0x00,0x14,0x4C, /* 000001F0 ".LNKA..L" */ | 77 | + 0x03,0x4C,0x4E,0x4B,0x44,0x00,0x14,0x4C, /* 000001F0 ".LNKD..L" */ |
78 | 0x0D,0x5F,0x43,0x52,0x53,0x00,0x08,0x4D, /* 000001F8 "._CRS..M" */ | 78 | 0x0D,0x5F,0x43,0x52,0x53,0x00,0x08,0x4D, /* 000001F8 "._CRS..M" */ |
79 | 0x45,0x4D,0x50,0x11,0x42,0x07,0x0A,0x6E, /* 00000200 "EMP.B..n" */ | 79 | 0x45,0x4D,0x50,0x11,0x42,0x07,0x0A,0x6E, /* 00000200 "EMP.B..n" */ |
80 | 0x88,0x0D,0x00,0x02,0x0C,0x00,0x00,0x00, /* 00000208 "........" */ | 80 | 0x88,0x0D,0x00,0x02,0x0C,0x00,0x00,0x00, /* 00000208 "........" */ |