The new VGIC will need to know the hypervisor base address at some
point, which is private to the hardware facing part of the VGIC so far.
Add a parameter to vgic_v2_setup_hw() to pass this address on, so a VGIC
implementation can make use of it.
The current VGIC ignores this new parameter.
TODO: add proper value for GICv2 on GICv3 emulation!
Signed-off-by: Andre Przywara
---
xen/arch/arm/gic-v2.c | 3 ++-
xen/arch/arm/gic-v3.c | 3 ++-
xen/arch/arm/vgic-v2.c | 3 ++-
xen/include/asm-arm/vgic.h | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 2b271ba322..7a18abecfa 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -1207,7 +1207,8 @@ static int __init gicv2_init(void)
if ( !gicv2.map_hbase )
panic("GICv2: Failed to ioremap for GIC Virtual interface\n");
-vgic_v2_setup_hw(dbase, cbase, csize, vbase, aliased_offset);
+vgic_v2_setup_hw(dbase, cbase, csize, vbase, gicv2.map_hbase,
+ aliased_offset);
/* Global settings: interrupt distributor */
spin_lock_init();
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index ea14ab4028..08d4703687 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -1238,7 +1238,8 @@ static void __init gicv3_init_v2(void)
printk("GICv3 compatible with GICv2 cbase %#"PRIpaddr" vbase
%#"PRIpaddr"\n",
cbase, vbase);
-vgic_v2_setup_hw(dbase, cbase, csize, vbase, 0);
+/* TODO: provide the proper HBASE address! */
+vgic_v2_setup_hw(dbase, cbase, csize, vbase, NULL, 0);
}
static void __init gicv3_ioremap_distributor(paddr_t dist_paddr)
diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c
index 646d1f3d12..96d543c005 100644
--- a/xen/arch/arm/vgic-v2.c
+++ b/xen/arch/arm/vgic-v2.c
@@ -47,7 +47,8 @@ static struct {
} vgic_v2_hw;
void vgic_v2_setup_hw(paddr_t dbase, paddr_t cbase, paddr_t csize,
- paddr_t vbase, uint32_t aliased_offset)
+ paddr_t vbase, void __iomem *hbase,
+ uint32_t aliased_offset)
{
vgic_v2_hw.enabled = true;
vgic_v2_hw.dbase = dbase;
diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
index 8c39ff1402..85ad2aca79 100644
--- a/xen/include/asm-arm/vgic.h
+++ b/xen/include/asm-arm/vgic.h
@@ -302,7 +302,8 @@ extern bool vgic_to_sgi(struct vcpu *v, register_t sgir,
extern bool vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int
irq);
void vgic_v2_setup_hw(paddr_t dbase, paddr_t cbase, paddr_t csize,
- paddr_t vbase, uint32_t aliased_offset);
+ paddr_t vbase, void __iomem *hbase,
+ uint32_t aliased_offset);
#ifdef CONFIG_HAS_GICV3
struct rdist_region;
--
2.14.1
___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel