[PATCH v2] arm/gic-v3: Fix ACPI probe fail on GICv4 hardware

[Shanker Donthineni <shankerd@codeaurora.org>]

The current driver ACPI probe fails on hardware which has GICv4
version, even though it is fully compatible to GICv3. This patch
fixes the issue by registering the same probe function for GICv4
hardware.

Signed-off-by: Shanker Donthineni <shankerd@codeaurora.org>
---
Changes since v1:
   - Edit commit text.
   - Fix BUG() in xen/arch/arm/domain.c

This patch tested on Qualcomm Technologies on QDF2XXX platforms.

 xen/arch/arm/domain.c     |  5 +++++
 xen/arch/arm/gic-v3.c     | 13 +++++++++++++
 xen/include/asm-arm/gic.h |  1 +
 3 files changed, 19 insertions(+)

diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 1365b4a..5647b80 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -571,6 +571,11 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags,
             d->arch.vgic.version = GIC_V3;
             break;
 
+	case GIC_V4:
+            config->gic_version = XEN_DOMCTL_CONFIG_GIC_V3;
+            d->arch.vgic.version = GIC_V3;
+            break;
+
         default:
             BUG();
         }
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index a095064..594cf6e 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -1604,10 +1604,23 @@ static int __init gicv3_acpi_preinit(const void *data)
     return 0;
 }
 
+static int __init gicv4_acpi_preinit(const void *data)
+{
+    gicv3_info.hw_version = GIC_V4;
+    register_gic_ops(&gicv3_ops);
+
+    return 0;
+}
+
 ACPI_DEVICE_START(agicv3, "GICv3", DEVICE_GIC)
         .class_type = ACPI_MADT_GIC_VERSION_V3,
         .init = gicv3_acpi_preinit,
 ACPI_DEVICE_END
+
+ACPI_DEVICE_START(agicv4, "GICv4", DEVICE_GIC)
+        .class_type = ACPI_MADT_GIC_VERSION_V4,
+        .init = gicv4_acpi_preinit,
+ACPI_DEVICE_END
 #endif
 
 /*
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index cd97bb2..5be814a 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -218,6 +218,7 @@ struct gic_lr {
 enum gic_version {
     GIC_V2,
     GIC_V3,
+    GIC_V4,
 };
 
 extern enum gic_version gic_hw_version(void);
-- 
Qualcomm Technologies, Inc. on behalf of Qualcomm Innovation Center, Inc. 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, 
a Linux Foundation Collaborative Project


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel