.. | .. |
---|
3 | 3 | #include <linux/init.h> |
---|
4 | 4 | #include <asm/pci_x86.h> |
---|
5 | 5 | #include <asm/x86_init.h> |
---|
| 6 | +#include <asm/irqdomain.h> |
---|
6 | 7 | |
---|
7 | 8 | /* arch_initcall has too random ordering, so call the initializers |
---|
8 | 9 | in the right sequence from here. */ |
---|
9 | 10 | static __init int pci_arch_init(void) |
---|
10 | 11 | { |
---|
11 | | -#ifdef CONFIG_PCI_DIRECT |
---|
12 | | - int type = 0; |
---|
| 12 | + int type, pcbios = 1; |
---|
13 | 13 | |
---|
14 | 14 | type = pci_direct_probe(); |
---|
15 | | -#endif |
---|
16 | 15 | |
---|
17 | 16 | if (!(pci_probe & PCI_PROBE_NOEARLY)) |
---|
18 | 17 | pci_mmcfg_early_init(); |
---|
19 | 18 | |
---|
20 | | - if (x86_init.pci.arch_init && !x86_init.pci.arch_init()) |
---|
| 19 | + if (x86_init.pci.arch_init) |
---|
| 20 | + pcbios = x86_init.pci.arch_init(); |
---|
| 21 | + |
---|
| 22 | + /* |
---|
| 23 | + * Must happen after x86_init.pci.arch_init(). Xen sets up the |
---|
| 24 | + * x86_init.irqs.create_pci_msi_domain there. |
---|
| 25 | + */ |
---|
| 26 | + x86_create_pci_msi_domain(); |
---|
| 27 | + |
---|
| 28 | + if (!pcbios) |
---|
21 | 29 | return 0; |
---|
22 | 30 | |
---|
23 | | -#ifdef CONFIG_PCI_BIOS |
---|
24 | 31 | pci_pcbios_init(); |
---|
25 | | -#endif |
---|
| 32 | + |
---|
26 | 33 | /* |
---|
27 | 34 | * don't check for raw_pci_ops here because we want pcbios as last |
---|
28 | 35 | * fallback, yet it's needed to run first to set pcibios_last_bus |
---|
29 | 36 | * in case legacy PCI probing is used. otherwise detecting peer busses |
---|
30 | 37 | * fails. |
---|
31 | 38 | */ |
---|
32 | | -#ifdef CONFIG_PCI_DIRECT |
---|
33 | 39 | pci_direct_init(type); |
---|
34 | | -#endif |
---|
| 40 | + |
---|
35 | 41 | if (!raw_pci_ops && !raw_pci_ext_ops) |
---|
36 | 42 | printk(KERN_ERR |
---|
37 | 43 | "PCI: Fatal: No config space access function found\n"); |
---|