[2/2] Partially revert 21550029f709072aacf3b90edd574e7d3021b400

Commit Message

Stefano Stabellini Oct. 25, 2016, 10:46 p.m. UTC

Commit 21550029f709072aacf3b90edd574e7d3021b400 removed the
PLATFORM_QUIRK_GIC_64K_STRIDE quirk and introduced a way to
automatically detect that the two GICC pages have a 64K stride.

However the heuristic requires that the device tree for the platform
reports a GICC size == 128K, which is not the case for some versions of
XGene.

Fix the issue by partially reverting
21550029f709072aacf3b90edd574e7d3021b400:

- reintroduce PLATFORM_QUIRK_GIC_64K_STRIDE for XGene
- force csize to SZ_128K for mapping if PLATFORM_QUIRK_GIC_64K_STRIDE

Signed-off-by: Stefano Stabellini <[e-mail]>
---
 xen/arch/arm/gic-v2.c                | 10 ++++++++--
 xen/arch/arm/platforms/xgene-storm.c |  6 ++++++
 xen/include/asm-arm/platform.h       |  6 ++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

Comments

Wei Liu Oct. 26, 2016, 11:27 a.m. UTC | #1

On Tue, Oct 25, 2016 at 03:46:55PM -0700, Stefano Stabellini wrote:
> Commit 21550029f709072aacf3b90edd574e7d3021b400 removed the
> PLATFORM_QUIRK_GIC_64K_STRIDE quirk and introduced a way to
> automatically detect that the two GICC pages have a 64K stride.
> 
> However the heuristic requires that the device tree for the platform
> reports a GICC size == 128K, which is not the case for some versions of
> XGene.
> 
> Fix the issue by partially reverting
> 21550029f709072aacf3b90edd574e7d3021b400:
> 
> - reintroduce PLATFORM_QUIRK_GIC_64K_STRIDE for XGene
> - force csize to SZ_128K for mapping if PLATFORM_QUIRK_GIC_64K_STRIDE
> 
> Signed-off-by: Stefano Stabellini <[e-mail]>

Sounds like a reasonable approach to me.

Code-wise also looks good.

Patch

diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 9bd9d0b..2c6b8f1 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -1146,6 +1146,7 @@  static int gicv2_make_hwdom_madt(const struct domain *d, u32 offset)
 static int __init gicv2_init(void)
 {
     uint32_t aliased_offset = 0;
+    paddr_t csize_map;
 
     if ( acpi_disabled )
         gicv2_dt_init();
@@ -1165,15 +1166,20 @@  static int __init gicv2_init(void)
          (hbase & ~PAGE_MASK) || (vbase & ~PAGE_MASK) )
         panic("GICv2 interfaces not page aligned");
 
+    if ( platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) )
+        csize_map = SZ_128K;
+    else
+        csize_map = csize;
+
     gicv2.map_dbase = ioremap_nocache(dbase, PAGE_SIZE);
     if ( !gicv2.map_dbase )
         panic("GICv2: Failed to ioremap for GIC distributor\n");
 
-    gicv2.map_cbase = ioremap_nocache(cbase, csize);
+    gicv2.map_cbase = ioremap_nocache(cbase, csize_map);
     if ( !gicv2.map_cbase )
         panic("GICv2: Failed to ioremap for GIC CPU interface\n");
 
-    if ( gicv2_is_aliased(cbase, csize) )
+    if ( gicv2_is_aliased(cbase, csize_map) )
     {
         /*
          * Move the base up by 60kB, so that we have a 8kB contiguous
diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c
index 686b19b..c795a95 100644
--- a/xen/arch/arm/platforms/xgene-storm.c
+++ b/xen/arch/arm/platforms/xgene-storm.c
@@ -67,6 +67,11 @@  static void __init xgene_check_pirq_eoi(void)
               "Please upgrade your firmware to the latest version");
 }
 
+static uint32_t xgene_storm_quirks(void)
+{
+    return PLATFORM_QUIRK_GIC_64K_STRIDE;
+}
+
 static void xgene_storm_reset(void)
 {
     void __iomem *addr;
@@ -116,6 +121,7 @@  PLATFORM_START(xgene_storm, "APM X-GENE STORM")
     .compatible = xgene_storm_dt_compat,
     .init = xgene_storm_init,
     .reset = xgene_storm_reset,
+    .quirks = xgene_storm_quirks,
 PLATFORM_END
 
 /*
diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h
index c6e5010..2ea9d61 100644
--- a/xen/include/asm-arm/platform.h
+++ b/xen/include/asm-arm/platform.h
@@ -39,6 +39,12 @@  struct platform_desc {
     const struct dt_device_match *blacklist_dev;
 };
 
+/*
+ * Quirk for platforms where the 4K GIC register ranges are placed at
+ * 64K stride.
+ */
+#define PLATFORM_QUIRK_GIC_64K_STRIDE (1 << 0)
+
 void __init platform_init(void);
 int __init platform_init_time(void);
 int __init platform_specific_mapping(struct domain *d);