aboutsummaryrefslogtreecommitdiffstats
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
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>
-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 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}
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 239b011ef56f..32269bcbd88c 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)
623 623
624 /* If we are a PV guest, we don't have GSIs (no ACPI passed). Therefore 624 /* If we are a PV guest, we don't have GSIs (no ACPI passed). Therefore
625 * we are using the !xen_initial_domain() to drop in the function.*/ 625 * we are using the !xen_initial_domain() to drop in the function.*/
626 if (identity_mapped_irq(gsi) || !xen_initial_domain()) { 626 if (identity_mapped_irq(gsi) || (!xen_initial_domain() &&
627 xen_pv_domain())) {
627 irq = gsi; 628 irq = gsi;
628 irq_alloc_desc_at(irq, 0); 629 irq_alloc_desc_at(irq, 0);
629 } else 630 } else
@@ -1397,6 +1398,9 @@ void __init xen_init_IRQ(void)
1397 if (xen_hvm_domain()) { 1398 if (xen_hvm_domain()) {
1398 xen_callback_vector(); 1399 xen_callback_vector();
1399 native_init_IRQ(); 1400 native_init_IRQ();
1401 /* pci_xen_hvm_init must be called after native_init_IRQ so that
1402 * __acpi_register_gsi can point at the right function */
1403 pci_xen_hvm_init();
1400 } else { 1404 } else {
1401 irq_ctx_init(smp_processor_id()); 1405 irq_ctx_init(smp_processor_id());
1402 } 1406 }
diff --git a/include/xen/interface/features.h b/include/xen/interface/features.h
index 70d2563ab166..b6ca39a069d8 100644
--- a/include/xen/interface/features.h
+++ b/include/xen/interface/features.h
@@ -47,6 +47,9 @@
47/* x86: pvclock algorithm is safe to use on HVM */ 47/* x86: pvclock algorithm is safe to use on HVM */
48#define XENFEAT_hvm_safe_pvclock 9 48#define XENFEAT_hvm_safe_pvclock 9
49 49
50/* x86: pirq can be used by HVM guests */
51#define XENFEAT_hvm_pirqs 10
52
50#define XENFEAT_NR_SUBMAPS 1 53#define XENFEAT_NR_SUBMAPS 1
51 54
52#endif /* __XEN_PUBLIC_FEATURES_H__ */ 55#endif /* __XEN_PUBLIC_FEATURES_H__ */