aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-06-24 17:50:18 +0100
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-10-22 21:25:42 +0100
commit3942b740e5183caad47a4a3fcb37a4509ce7af83 (patch)
tree7051ecaaca2eadbc68743b4697add53f64d9401d
parent90f6881e6430ea7b38b9e0f9837719b1935616e0 (diff)
downloadmrst-s0i3-test-3942b740e5183caad47a4a3fcb37a4509ce7af83.tar.gz
mrst-s0i3-test-3942b740e5183caad47a4a3fcb37a4509ce7af83.tar.xz
mrst-s0i3-test-3942b740e5183caad47a4a3fcb37a4509ce7af83.zip
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>
-rw-r--r--arch/x86/include/asm/xen/pci.h5
-rw-r--r--arch/x86/pci/xen.c16
-rw-r--r--drivers/xen/events.c6
-rw-r--r--include/xen/interface/features.h3
4 files changed, 29 insertions, 1 deletions
diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
index 449c82f7167..f89a42aff28 100644
--- a/arch/x86/include/asm/xen/pci.h
+++ b/arch/x86/include/asm/xen/pci.h
@@ -3,10 +3,15 @@
#if defined(CONFIG_PCI_XEN)
extern int __init pci_xen_init(void);
+extern int __init pci_xen_hvm_init(void);
#define pci_xen 1
#else
#define pci_xen 0
#define pci_xen_init (0)
+static inline int pci_xen_hvm_init(void)
+{
+ return -1;
+}
#endif
#if defined(CONFIG_PCI_MSI)
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 3a4ab0b4dcc..d5284c491ae 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -14,6 +14,7 @@
#include <asm/xen/hypervisor.h>
+#include <xen/features.h>
#include <xen/events.h>
#include <asm/xen/pci.h>
@@ -184,3 +185,18 @@ int __init pci_xen_init(void)
#endif
return 0;
}
+
+int __init pci_xen_hvm_init(void)
+{
+ if (!xen_feature(XENFEAT_hvm_pirqs))
+ return 0;
+
+#ifdef CONFIG_ACPI
+ /*
+ * We don't want to change the actual ACPI delivery model,
+ * just how GSIs get registered.
+ */
+ __acpi_register_gsi = acpi_register_gsi_xen_hvm;
+#endif
+ return 0;
+}
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 239b011ef56..32269bcbd88 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -623,7 +623,8 @@ int xen_map_pirq_gsi(unsigned pirq, unsigned gsi, int shareable, char *name)
/* If we are a PV guest, we don't have GSIs (no ACPI passed). Therefore
* we are using the !xen_initial_domain() to drop in the function.*/
- if (identity_mapped_irq(gsi) || !xen_initial_domain()) {
+ if (identity_mapped_irq(gsi) || (!xen_initial_domain() &&
+ xen_pv_domain())) {
irq = gsi;
irq_alloc_desc_at(irq, 0);
} else
@@ -1397,6 +1398,9 @@ void __init xen_init_IRQ(void)
if (xen_hvm_domain()) {
xen_callback_vector();
native_init_IRQ();
+ /* pci_xen_hvm_init must be called after native_init_IRQ so that
+ * __acpi_register_gsi can point at the right function */
+ pci_xen_hvm_init();
} else {
irq_ctx_init(smp_processor_id());
}
diff --git a/include/xen/interface/features.h b/include/xen/interface/features.h
index 70d2563ab16..b6ca39a069d 100644
--- a/include/xen/interface/features.h
+++ b/include/xen/interface/features.h
@@ -47,6 +47,9 @@
/* x86: pvclock algorithm is safe to use on HVM */
#define XENFEAT_hvm_safe_pvclock 9
+/* x86: pirq can be used by HVM guests */
+#define XENFEAT_hvm_pirqs 10
+
#define XENFEAT_NR_SUBMAPS 1
#endif /* __XEN_PUBLIC_FEATURES_H__ */