synquacer: Enable GICv3 support

synquacer uses GICv3 compliant GIC500. So enable proper GICv3 driver
initialization.

Signed-off-by: Sumit Garg <[email protected]>

diff --git a/plat/socionext/synquacer/include/platform_def.h b/plat/socionext/synquacer/include/platform_def.h
index 12af4ecaaed86f9c8d7a887be3065fc27c327a1f..e6cbea405157154278d69cd21768e91e4b5daa4a 100644 (file)
--- a/plat/socionext/synquacer/include/platform_def.h
+++ b/plat/socionext/synquacer/include/platform_def.h
@@ -48,4 +48,7 @@
 #define PLAT_SQ_PRIMARY_CPU_SHIFT              8
 #define PLAT_SQ_PRIMARY_CPU_BIT_WIDTH          6
 
+#define PLAT_SQ_GICD_BASE              0x30000000
+#define PLAT_SQ_GICR_BASE              0x30400000
+
 #endif /* __PLATFORM_DEF_H__ */

diff --git a/plat/socionext/synquacer/include/sq_common.h b/plat/socionext/synquacer/include/sq_common.h
index 84ef57fe4d366465ea17922500ee9ff68f99a880..b72dfa7fe9fae2a6ce76fd9d5f17e1b1da336dce 100644 (file)
--- a/plat/socionext/synquacer/include/sq_common.h
+++ b/plat/socionext/synquacer/include/sq_common.h
@@ -15,4 +15,10 @@ void plat_sq_interconnect_exit_coherency(void);
 
 unsigned int sq_calc_core_pos(u_register_t mpidr);
 
+void sq_gic_driver_init(void);
+void sq_gic_init(void);
+void sq_gic_cpuif_enable(void);
+void sq_gic_cpuif_disable(void);
+void sq_gic_pcpu_init(void);
+
 #endif /* __SQ_COMMON_H__ */

diff --git a/plat/socionext/synquacer/sq_bl31_setup.c b/plat/socionext/synquacer/sq_bl31_setup.c
index f3d58a9f9ce8fd46075abc48584d16073049fa1b..da25ff14329d075613a38ffefe2a650b3cd1fde5 100644 (file)
--- a/plat/socionext/synquacer/sq_bl31_setup.c
+++ b/plat/socionext/synquacer/sq_bl31_setup.c
@@ -99,6 +99,10 @@ void bl31_platform_setup(void)
        /* Initialize the CCN interconnect */
        plat_sq_interconnect_init();
        plat_sq_interconnect_enter_coherency();
+
+       /* Initialize the GIC driver, cpu and distributor interfaces */
+       sq_gic_driver_init();
+       sq_gic_init();
 }
 
 void bl31_plat_runtime_setup(void)

diff --git a/plat/socionext/synquacer/sq_gicv3.c b/plat/socionext/synquacer/sq_gicv3.c
new file mode 100644 (file)
index 0000000..94e5a66
--- /dev/null
+++ b/plat/socionext/synquacer/sq_gicv3.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <assert.h>
+#include <gicv3.h>
+#include <interrupt_props.h>
+#include <platform.h>
+#include <platform_def.h>
+
+#include "sq_common.h"
+
+static uintptr_t sq_rdistif_base_addrs[PLATFORM_CORE_COUNT];
+
+static const interrupt_prop_t sq_interrupt_props[] = {
+       /* G0 interrupts */
+
+       /* SGI0 */
+       INTR_PROP_DESC(8, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP0,
+                       GIC_INTR_CFG_EDGE),
+       /* SGI6 */
+       INTR_PROP_DESC(14, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP0,
+                       GIC_INTR_CFG_EDGE),
+
+       /* G1S interrupts */
+
+       /* Timer */
+       INTR_PROP_DESC(29, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP1S,
+                       GIC_INTR_CFG_LEVEL),
+       /* SGI1 */
+       INTR_PROP_DESC(9, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP1S,
+                       GIC_INTR_CFG_EDGE),
+       /* SGI2 */
+       INTR_PROP_DESC(10, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP1S,
+                       GIC_INTR_CFG_EDGE),
+       /* SGI3 */
+       INTR_PROP_DESC(11, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP1S,
+                       GIC_INTR_CFG_EDGE),
+       /* SGI4 */
+       INTR_PROP_DESC(12, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP1S,
+                       GIC_INTR_CFG_EDGE),
+       /* SGI5 */
+       INTR_PROP_DESC(13, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP1S,
+                       GIC_INTR_CFG_EDGE),
+       /* SGI7 */
+       INTR_PROP_DESC(15, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP1S,
+                       GIC_INTR_CFG_EDGE)
+};
+
+static unsigned int sq_mpidr_to_core_pos(u_register_t mpidr)
+{
+       return plat_core_pos_by_mpidr(mpidr);
+}
+
+static const struct gicv3_driver_data sq_gic_driver_data = {
+               .gicd_base = PLAT_SQ_GICD_BASE,
+               .gicr_base = PLAT_SQ_GICR_BASE,
+               .interrupt_props = sq_interrupt_props,
+               .interrupt_props_num = ARRAY_SIZE(sq_interrupt_props),
+               .rdistif_num = PLATFORM_CORE_COUNT,
+               .rdistif_base_addrs = sq_rdistif_base_addrs,
+               .mpidr_to_core_pos = sq_mpidr_to_core_pos,
+};
+
+void sq_gic_driver_init(void)
+{
+       gicv3_driver_init(&sq_gic_driver_data);
+}
+
+void sq_gic_init(void)
+{
+       gicv3_distif_init();
+       gicv3_rdistif_init(plat_my_core_pos());
+       gicv3_cpuif_enable(plat_my_core_pos());
+}
+
+void sq_gic_cpuif_enable(void)
+{
+       gicv3_cpuif_enable(plat_my_core_pos());
+}
+
+void sq_gic_cpuif_disable(void)
+{
+       gicv3_cpuif_disable(plat_my_core_pos());
+}
+
+void sq_gic_pcpu_init(void)
+{
+       gicv3_rdistif_init(plat_my_core_pos());
+}