diff options
author | Alex Nixon <alex.nixon@citrix.com> | 2010-03-18 16:31:34 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2010-10-18 10:49:35 -0400 |
commit | b5401a96b59475c1c878439caecb8c521bdfd4ad (patch) | |
tree | 1d120803720cc047445181af514357fec65e6125 /arch/x86/xen/enlighten.c | |
parent | 294ee6f89cfd629e276f632a6003a0fad7785dce (diff) |
xen/x86/PCI: Add support for the Xen PCI subsystem
The frontend stub lives in arch/x86/pci/xen.c, alongside other
sub-arch PCI init code (e.g. olpc.c).
It provides a mechanism for Xen PCI frontend to setup/destroy
legacy interrupts, MSI/MSI-X, and PCI configuration operations.
[ Impact: add core of Xen PCI support ]
[ v2: Removed the IOMMU code and only focusing on PCI.]
[ v3: removed usage of pci_scan_all_fns as that does not exist]
[ v4: introduced pci_xen value to fix compile warnings]
[ v5: squished fixes+features in one patch, changed Reviewed-by to Ccs]
[ v7: added Acked-by]
Signed-off-by: Alex Nixon <alex.nixon@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Qing He <qing.he@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 7d46c8441418..1ccfa1bf0f89 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <asm/paravirt.h> | 45 | #include <asm/paravirt.h> |
46 | #include <asm/apic.h> | 46 | #include <asm/apic.h> |
47 | #include <asm/page.h> | 47 | #include <asm/page.h> |
48 | #include <asm/xen/pci.h> | ||
48 | #include <asm/xen/hypercall.h> | 49 | #include <asm/xen/hypercall.h> |
49 | #include <asm/xen/hypervisor.h> | 50 | #include <asm/xen/hypervisor.h> |
50 | #include <asm/fixmap.h> | 51 | #include <asm/fixmap.h> |
@@ -1220,6 +1221,8 @@ asmlinkage void __init xen_start_kernel(void) | |||
1220 | add_preferred_console("xenboot", 0, NULL); | 1221 | add_preferred_console("xenboot", 0, NULL); |
1221 | add_preferred_console("tty", 0, NULL); | 1222 | add_preferred_console("tty", 0, NULL); |
1222 | add_preferred_console("hvc", 0, NULL); | 1223 | add_preferred_console("hvc", 0, NULL); |
1224 | if (pci_xen) | ||
1225 | x86_init.pci.arch_init = pci_xen_init; | ||
1223 | } else { | 1226 | } else { |
1224 | /* Make sure ACS will be enabled */ | 1227 | /* Make sure ACS will be enabled */ |
1225 | pci_request_acs(); | 1228 | pci_request_acs(); |