aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-06-24 12:50:18 -0400
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-10-22 16:25:42 -0400
commit3942b740e5183caad47a4a3fcb37a4509ce7af83 (patch)
tree7051ecaaca2eadbc68743b4697add53f64d9401d /arch
parent90f6881e6430ea7b38b9e0f9837719b1935616e0 (diff)
xen: support GSI -> pirq remapping in PV on HVM guests
Disable pcifront when running on HVM: it is meant to be used with pv guests that don't have PCI bus. Use acpi_register_gsi_xen_hvm to remap GSIs into pirqs. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/xen/pci.h5
-rw-r--r--arch/x86/pci/xen.c16
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
index 449c82f71677..f89a42aff284 100644
--- a/arch/x86/include/asm/xen/pci.h
+++ b/arch/x86/include/asm/xen/pci.h
@@ -3,10 +3,15 @@
3 3
4#if defined(CONFIG_PCI_XEN) 4#if defined(CONFIG_PCI_XEN)
5extern int __init pci_xen_init(void); 5extern int __init pci_xen_init(void);
6extern int __init pci_xen_hvm_init(void);
6#define pci_xen 1 7#define pci_xen 1
7#else 8#else
8#define pci_xen 0 9#define pci_xen 0
9#define pci_xen_init (0) 10#define pci_xen_init (0)
11static inline int pci_xen_hvm_init(void)
12{
13 return -1;
14}
10#endif 15#endif
11 16
12#if defined(CONFIG_PCI_MSI) 17#if defined(CONFIG_PCI_MSI)
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 3a4ab0b4dcca..d5284c491aef 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -14,6 +14,7 @@
14 14
15#include <asm/xen/hypervisor.h> 15#include <asm/xen/hypervisor.h>
16 16
17#include <xen/features.h>
17#include <xen/events.h> 18#include <xen/events.h>
18#include <asm/xen/pci.h> 19#include <asm/xen/pci.h>
19 20
@@ -184,3 +185,18 @@ int __init pci_xen_init(void)
184#endif 185#endif
185 return 0; 186 return 0;
186} 187}
188
189int __init pci_xen_hvm_init(void)
190{
191 if (!xen_feature(XENFEAT_hvm_pirqs))
192 return 0;
193
194#ifdef CONFIG_ACPI
195 /*
196 * We don't want to change the actual ACPI delivery model,
197 * just how GSIs get registered.
198 */
199 __acpi_register_gsi = acpi_register_gsi_xen_hvm;
200#endif
201 return 0;
202}