summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-06-24 16:50:18 (GMT)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-10-22 20:25:42 (GMT)
commit3942b740e5183caad47a4a3fcb37a4509ce7af83 (patch)
tree7051ecaaca2eadbc68743b4697add53f64d9401d /drivers/xen
parent90f6881e6430ea7b38b9e0f9837719b1935616e0 (diff)
downloadlinux-3942b740e5183caad47a4a3fcb37a4509ce7af83.tar.xz
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 'drivers/xen')
-rw-r--r--drivers/xen/events.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 239b011..32269bc 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());
}