Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-30 07:39:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1131 from jeenu-arm/gic-migrate

Browse source 
Migrate upstream platforms to using interrupt properties
This commit is contained in:
davidcunado-arm 2017-10-21 22:50:35 +01:00 • committed by GitHub
commit f911e229f3
11 changed files with 205 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
include/drivers/arm/gic_v2.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,6 +7,9 @@
#ifndef __GIC_V2_H__ #ifndef __GIC_V2_H__
#define __GIC_V2_H__ #define __GIC_V2_H__
/* The macros required here are additional to those in gic_common.h. */
#include <gic_common.h>
/****************************************************************************** /******************************************************************************
* THIS DRIVER IS DEPRECATED. For GICv2 systems, use the driver in gicv2.h * THIS DRIVER IS DEPRECATED. For GICv2 systems, use the driver in gicv2.h
* and for GICv3 systems, use the driver in gicv3.h. * and for GICv3 systems, use the driver in gicv3.h.
@ -19,50 +22,20 @@
#define MAX_PPIS U(14) #define MAX_PPIS U(14)
#define MAX_SGIS U(16) #define MAX_SGIS U(16)
#define MIN_SGI_ID U(0)
#define MIN_PPI_ID U(16)
#define MIN_SPI_ID U(32)
#define GRP0 U(0) #define GRP0 U(0)
#define GRP1 U(1) #define GRP1 U(1)
#define GIC_PRI_MASK U(0xff)
#define GIC_HIGHEST_SEC_PRIORITY U(0)
#define GIC_LOWEST_SEC_PRIORITY U(127)
#define GIC_HIGHEST_NS_PRIORITY U(128)
#define GIC_LOWEST_NS_PRIORITY U(254) /* 255 would disable an interrupt */
#define GIC_SPURIOUS_INTERRUPT U(1023)
#define GIC_TARGET_CPU_MASK U(0xff) #define GIC_TARGET_CPU_MASK U(0xff)
#define ENABLE_GRP0 (U(1) << 0) #define ENABLE_GRP0 (U(1) << 0)
#define ENABLE_GRP1 (U(1) << 1) #define ENABLE_GRP1 (U(1) << 1)
/* Distributor interface definitions */ /* Distributor interface definitions */
#define GICD_CTLR U(0x0)
#define GICD_TYPER U(0x4)
#define GICD_IGROUPR U(0x80)
#define GICD_ISENABLER U(0x100)
#define GICD_ICENABLER U(0x180)
#define GICD_ISPENDR U(0x200)
#define GICD_ICPENDR U(0x280)
#define GICD_ISACTIVER U(0x300)
#define GICD_ICACTIVER U(0x380)
#define GICD_IPRIORITYR U(0x400)
#define GICD_ITARGETSR U(0x800) #define GICD_ITARGETSR U(0x800)
#define GICD_ICFGR U(0xC00)
#define GICD_SGIR U(0xF00) #define GICD_SGIR U(0xF00)
#define GICD_CPENDSGIR U(0xF10) #define GICD_CPENDSGIR U(0xF10)
#define GICD_SPENDSGIR U(0xF20) #define GICD_SPENDSGIR U(0xF20)
#define IGROUPR_SHIFT U(5)
#define ISENABLER_SHIFT U(5)
#define ICENABLER_SHIFT ISENABLER_SHIFT
#define ISPENDR_SHIFT U(5)
#define ICPENDR_SHIFT ISPENDR_SHIFT
#define ISACTIVER_SHIFT U(5)
#define ICACTIVER_SHIFT ISACTIVER_SHIFT
#define IPRIORITYR_SHIFT U(2)
#define ITARGETSR_SHIFT U(2)
#define ICFGR_SHIFT U(4)
#define CPENDSGIR_SHIFT U(2) #define CPENDSGIR_SHIFT U(2)
#define SPENDSGIR_SHIFT CPENDSGIR_SHIFT #define SPENDSGIR_SHIFT CPENDSGIR_SHIFT

34
include/plat/arm/common/arm_def.h
View file

@ -8,6 +8,8 @@
#include <arch.h> #include <arch.h>
#include <common_def.h> #include <common_def.h>
#include <gic_common.h>
#include <interrupt_props.h>
#include <platform_def.h> #include <platform_def.h>
#include <tbbr_img_def.h> #include <tbbr_img_def.h>
#include <utils_def.h> #include <utils_def.h>
@ -152,9 +154,8 @@
#define ARM_IRQ_SEC_SGI_7 15 #define ARM_IRQ_SEC_SGI_7 15
/* /*
* Define a list of Group 1 Secure and Group 0 interrupts as per GICv3 * List of secure interrupts are deprecated, but are retained only to support
* terminology. On a GICv2 system or mode, the lists will be merged and treated * legacy configurations.
* as Group 0 interrupts.
*/ */
#define ARM_G1S_IRQS ARM_IRQ_SEC_PHY_TIMER, \ #define ARM_G1S_IRQS ARM_IRQ_SEC_PHY_TIMER, \
ARM_IRQ_SEC_SGI_1, \ ARM_IRQ_SEC_SGI_1, \
@ -167,6 +168,33 @@
#define ARM_G0_IRQS ARM_IRQ_SEC_SGI_0, \ #define ARM_G0_IRQS ARM_IRQ_SEC_SGI_0, \
ARM_IRQ_SEC_SGI_6 ARM_IRQ_SEC_SGI_6
/*
* Define a list of Group 1 Secure and Group 0 interrupt properties as per GICv3
* terminology. On a GICv2 system or mode, the lists will be merged and treated
* as Group 0 interrupts.
*/
#define ARM_G1S_IRQ_PROPS(grp) \
INTR_PROP_DESC(ARM_IRQ_SEC_PHY_TIMER, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_1, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_2, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_3, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_4, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_5, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_7, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE)
#define ARM_G0_IRQ_PROPS(grp) \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_0, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_6, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE)
#define ARM_MAP_SHARED_RAM MAP_REGION_FLAT( \ #define ARM_MAP_SHARED_RAM MAP_REGION_FLAT( \
ARM_SHARED_RAM_BASE, \ ARM_SHARED_RAM_BASE, \
ARM_SHARED_RAM_SIZE, \ ARM_SHARED_RAM_SIZE, \

23
include/plat/arm/css/common/css_def.h
View file

@ -8,6 +8,8 @@
#define __CSS_DEF_H__ #define __CSS_DEF_H__
#include <arm_def.h> #include <arm_def.h>
#include <gic_common.h>
#include <interrupt_props.h>
#include <tzc400.h> #include <tzc400.h>
/************************************************************************* /*************************************************************************
@ -41,14 +43,21 @@
#define MHU_CPU_INTR_S_SET_OFFSET 0x308 #define MHU_CPU_INTR_S_SET_OFFSET 0x308
/* /*
* Define a list of Group 1 Secure interrupts as per GICv3 terminology. On a * Define a list of Group 1 Secure interrupt properties as per GICv3
* GICv2 system or mode, the interrupts will be treated as Group 0 interrupts. * terminology. On a GICv2 system or mode, the interrupts will be treated as
* Group 0 interrupts.
*/ */
#define CSS_G1S_IRQS CSS_IRQ_MHU, \ #define CSS_G1S_IRQ_PROPS(grp) \
CSS_IRQ_GPU_SMMU_0, \ INTR_PROP_DESC(CSS_IRQ_MHU, GIC_HIGHEST_SEC_PRIORITY, grp, \
CSS_IRQ_TZC, \ GIC_INTR_CFG_LEVEL), \
CSS_IRQ_TZ_WDOG, \ INTR_PROP_DESC(CSS_IRQ_GPU_SMMU_0, GIC_HIGHEST_SEC_PRIORITY, grp, \
CSS_IRQ_SEC_SYS_TIMER GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(CSS_IRQ_TZC, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(CSS_IRQ_TZ_WDOG, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(CSS_IRQ_SEC_SYS_TIMER, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL)
#if CSS_USE_SCMI_SDS_DRIVER #if CSS_USE_SCMI_SDS_DRIVER
/* Memory region for shared data storage */ /* Memory region for shared data storage */

9
plat/arm/board/fvp/include/platform_def.h
View file

@ -136,4 +136,13 @@
#define PLAT_ARM_G0_IRQS ARM_G0_IRQS #define PLAT_ARM_G0_IRQS ARM_G0_IRQS
#define PLAT_ARM_G1S_IRQ_PROPS(grp) \
ARM_G1S_IRQ_PROPS(grp), \
INTR_PROP_DESC(FVP_IRQ_TZ_WDOG, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(FVP_IRQ_SEC_SYS_TIMER, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL)
#define PLAT_ARM_G0_IRQ_PROPS(grp) ARM_G0_IRQ_PROPS(grp)
#endif /* __PLATFORM_DEF_H__ */ #endif /* __PLATFORM_DEF_H__ */

36
plat/arm/board/juno/include/platform_def.h
View file

@ -193,23 +193,27 @@
*/ */
#define PLAT_CSS_MAX_SCP_BL2U_SIZE 0x14000 #define PLAT_CSS_MAX_SCP_BL2U_SIZE 0x14000
/* #define PLAT_ARM_G1S_IRQ_PROPS(grp) \
* Define a list of Group 1 Secure and Group 0 interrupts as per GICv3 CSS_G1S_IRQ_PROPS(grp), \
* terminology. On a GICv2 system or mode, the lists will be merged and treated ARM_G1S_IRQ_PROPS(grp), \
* as Group 0 interrupts. INTR_PROP_DESC(JUNO_IRQ_DMA_SMMU, GIC_HIGHEST_SEC_PRIORITY, \
*/ grp, GIC_INTR_CFG_LEVEL), \
#define PLAT_ARM_G1S_IRQS CSS_G1S_IRQS, \ INTR_PROP_DESC(JUNO_IRQ_HDLCD0_SMMU, GIC_HIGHEST_SEC_PRIORITY, \
ARM_G1S_IRQS, \ grp, GIC_INTR_CFG_LEVEL), \
JUNO_IRQ_DMA_SMMU, \ INTR_PROP_DESC(JUNO_IRQ_HDLCD1_SMMU, GIC_HIGHEST_SEC_PRIORITY, \
JUNO_IRQ_HDLCD0_SMMU, \ grp, GIC_INTR_CFG_LEVEL), \
JUNO_IRQ_HDLCD1_SMMU, \ INTR_PROP_DESC(JUNO_IRQ_USB_SMMU, GIC_HIGHEST_SEC_PRIORITY, \
JUNO_IRQ_USB_SMMU, \ grp, GIC_INTR_CFG_LEVEL), \
JUNO_IRQ_THIN_LINKS_SMMU, \ INTR_PROP_DESC(JUNO_IRQ_THIN_LINKS_SMMU, GIC_HIGHEST_SEC_PRIORITY, \
JUNO_IRQ_SEC_I2C, \ grp, GIC_INTR_CFG_LEVEL), \
JUNO_IRQ_GPU_SMMU_1, \ INTR_PROP_DESC(JUNO_IRQ_SEC_I2C, GIC_HIGHEST_SEC_PRIORITY, \
JUNO_IRQ_ETR_SMMU grp, GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(JUNO_IRQ_GPU_SMMU_1, GIC_HIGHEST_SEC_PRIORITY, \
grp, GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(JUNO_IRQ_ETR_SMMU, GIC_HIGHEST_SEC_PRIORITY, \
grp, GIC_INTR_CFG_LEVEL)
#define PLAT_ARM_G0_IRQS ARM_G0_IRQS #define PLAT_ARM_G0_IRQ_PROPS(grp) ARM_G0_IRQ_PROPS(grp)
/* /*
* Required ARM CSS SoC based platform porting definitions * Required ARM CSS SoC based platform porting definitions

10
plat/arm/common/arm_gicv2.c
View file

@ -23,9 +23,9 @@
* On a GICv2 system, the Group 1 secure interrupts are treated as Group 0 * On a GICv2 system, the Group 1 secure interrupts are treated as Group 0
* interrupts. * interrupts.
*****************************************************************************/ *****************************************************************************/
static const unsigned int g0_interrupt_array[] = { static const interrupt_prop_t arm_interrupt_props[] = {
PLAT_ARM_G1S_IRQS, PLAT_ARM_G1S_IRQ_PROPS(GICV2_INTR_GROUP0),
PLAT_ARM_G0_IRQS PLAT_ARM_G0_IRQ_PROPS(GICV2_INTR_GROUP0)
}; };
static unsigned int target_mask_array[PLATFORM_CORE_COUNT]; static unsigned int target_mask_array[PLATFORM_CORE_COUNT];
@ -33,8 +33,8 @@ static unsigned int target_mask_array[PLATFORM_CORE_COUNT];
static const gicv2_driver_data_t arm_gic_data = { static const gicv2_driver_data_t arm_gic_data = {
.gicd_base = PLAT_ARM_GICD_BASE, .gicd_base = PLAT_ARM_GICD_BASE,
.gicc_base = PLAT_ARM_GICC_BASE, .gicc_base = PLAT_ARM_GICC_BASE,
.g0_interrupt_num = ARRAY_SIZE(g0_interrupt_array), .interrupt_props = arm_interrupt_props,
.g0_interrupt_array = g0_interrupt_array, .interrupt_props_num = ARRAY_SIZE(arm_interrupt_props),
.target_masks = target_mask_array, .target_masks = target_mask_array,
.target_masks_num = ARRAY_SIZE(target_mask_array), .target_masks_num = ARRAY_SIZE(target_mask_array),
}; };

18
plat/arm/common/arm_gicv3.c
View file

@ -6,6 +6,7 @@
#include <arm_def.h> #include <arm_def.h>
#include <gicv3.h> #include <gicv3.h>
#include <interrupt_props.h>
#include <plat_arm.h> #include <plat_arm.h>
#include <platform.h> #include <platform.h>
#include <platform_def.h> #include <platform_def.h>
@ -25,14 +26,9 @@
/* The GICv3 driver only needs to be initialized in EL3 */ /* The GICv3 driver only needs to be initialized in EL3 */
static uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT]; static uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT];
/* Array of Group1 secure interrupts to be configured by the gic driver */ static const interrupt_prop_t arm_interrupt_props[] = {
static const unsigned int g1s_interrupt_array[] = { PLAT_ARM_G1S_IRQ_PROPS(INTR_GROUP1S),
PLAT_ARM_G1S_IRQS PLAT_ARM_G0_IRQ_PROPS(INTR_GROUP0)
};
/* Array of Group0 interrupts to be configured by the gic driver */
static const unsigned int g0_interrupt_array[] = {
PLAT_ARM_G0_IRQS
}; };
/* /*
@ -58,10 +54,8 @@ static unsigned int arm_gicv3_mpidr_hash(u_register_t mpidr)
const gicv3_driver_data_t arm_gic_data = { const gicv3_driver_data_t arm_gic_data = {
.gicd_base = PLAT_ARM_GICD_BASE, .gicd_base = PLAT_ARM_GICD_BASE,
.gicr_base = PLAT_ARM_GICR_BASE, .gicr_base = PLAT_ARM_GICR_BASE,
.g0_interrupt_num = ARRAY_SIZE(g0_interrupt_array), .interrupt_props = arm_interrupt_props,
.g1s_interrupt_num = ARRAY_SIZE(g1s_interrupt_array), .interrupt_props_num = ARRAY_SIZE(arm_interrupt_props),
.g0_interrupt_array = g0_interrupt_array,
.g1s_interrupt_array = g1s_interrupt_array,
.rdistif_num = PLATFORM_CORE_COUNT, .rdistif_num = PLATFORM_CORE_COUNT,
.rdistif_base_addrs = rdistif_base_addrs, .rdistif_base_addrs = rdistif_base_addrs,
.mpidr_to_core_pos = arm_gicv3_mpidr_hash .mpidr_to_core_pos = arm_gicv3_mpidr_hash

44
plat/hisilicon/poplar/include/platform_def.h
View file

@ -9,6 +9,8 @@
#include <arch.h> #include <arch.h>
#include <common_def.h> #include <common_def.h>
#include <gic_common.h>
#include <interrupt_props.h>
#include <tbbr/tbbr_img_def.h> #include <tbbr/tbbr_img_def.h>
#include "hi3798cv200.h" #include "hi3798cv200.h"
#include "poplar_layout.h" /* BL memory region sizes, etc */ #include "poplar_layout.h" /* BL memory region sizes, etc */
@ -69,20 +71,34 @@
#define PLAT_ARM_GICD_BASE GICD_BASE #define PLAT_ARM_GICD_BASE GICD_BASE
#define PLAT_ARM_GICC_BASE GICC_BASE #define PLAT_ARM_GICC_BASE GICC_BASE
#define PLAT_ARM_G1S_IRQS HISI_IRQ_SEC_SGI_0, \ #define PLAT_ARM_G1S_IRQ_PROPS(grp) \
HISI_IRQ_SEC_SGI_1, \ INTR_PROP_DESC(HISI_IRQ_SEC_SGI_0, GIC_HIGHEST_SEC_PRIORITY, grp, \
HISI_IRQ_SEC_SGI_2, \ GIC_INTR_CFG_LEVEL), \
HISI_IRQ_SEC_SGI_3, \ INTR_PROP_DESC(HISI_IRQ_SEC_SGI_1, GIC_HIGHEST_SEC_PRIORITY, grp, \
HISI_IRQ_SEC_SGI_4, \ GIC_INTR_CFG_LEVEL), \
HISI_IRQ_SEC_SGI_5, \ INTR_PROP_DESC(HISI_IRQ_SEC_SGI_2, GIC_HIGHEST_SEC_PRIORITY, grp, \
HISI_IRQ_SEC_SGI_6, \ GIC_INTR_CFG_LEVEL), \
HISI_IRQ_SEC_SGI_7, \ INTR_PROP_DESC(HISI_IRQ_SEC_SGI_3, GIC_HIGHEST_SEC_PRIORITY, grp, \
HISI_IRQ_SEC_TIMER0, \ GIC_INTR_CFG_LEVEL), \
HISI_IRQ_SEC_TIMER1, \ INTR_PROP_DESC(HISI_IRQ_SEC_SGI_4, GIC_HIGHEST_SEC_PRIORITY, grp, \
HISI_IRQ_SEC_TIMER2, \ GIC_INTR_CFG_LEVEL), \
HISI_IRQ_SEC_TIMER3, \ INTR_PROP_DESC(HISI_IRQ_SEC_SGI_5, GIC_HIGHEST_SEC_PRIORITY, grp, \
HISI_IRQ_SEC_AXI GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(HISI_IRQ_SEC_SGI_6, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(HISI_IRQ_SEC_SGI_7, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(HISI_IRQ_SEC_TIMER0, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(HISI_IRQ_SEC_TIMER1, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(HISI_IRQ_SEC_TIMER2, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(HISI_IRQ_SEC_TIMER3, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(HISI_IRQ_SEC_AXI, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_LEVEL)
#define PLAT_ARM_G0_IRQS #define PLAT_ARM_G0_IRQ_PROPS(grp)
#endif /* __PLATFORM_DEF_H__ */ #endif /* __PLATFORM_DEF_H__ */

31
plat/mediatek/mt8173/include/platform_def.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,6 +7,8 @@
#ifndef __PLATFORM_DEF_H__ #ifndef __PLATFORM_DEF_H__
#define __PLATFORM_DEF_H__ #define __PLATFORM_DEF_H__
#include <gic_common.h>
#include <interrupt_props.h>
#include "mt8173_def.h" #include "mt8173_def.h"
@ -115,15 +117,24 @@
#define PLAT_ARM_GICD_BASE BASE_GICD_BASE #define PLAT_ARM_GICD_BASE BASE_GICD_BASE
#define PLAT_ARM_GICC_BASE BASE_GICC_BASE #define PLAT_ARM_GICC_BASE BASE_GICC_BASE
#define PLAT_ARM_G1S_IRQS MT_IRQ_SEC_SGI_0, \ #define PLAT_ARM_G1S_IRQ_PROPS(grp) \
MT_IRQ_SEC_SGI_1, \ INTR_PROP_DESC(MT_IRQ_SEC_SGI_0, GIC_HIGHEST_SEC_PRIORITY, grp, \
MT_IRQ_SEC_SGI_2, \ GIC_INTR_CFG_EDGE), \
MT_IRQ_SEC_SGI_3, \ INTR_PROP_DESC(MT_IRQ_SEC_SGI_1, GIC_HIGHEST_SEC_PRIORITY, grp, \
MT_IRQ_SEC_SGI_4, \ GIC_INTR_CFG_EDGE), \
MT_IRQ_SEC_SGI_5, \ INTR_PROP_DESC(MT_IRQ_SEC_SGI_2, GIC_HIGHEST_SEC_PRIORITY, grp, \
MT_IRQ_SEC_SGI_6, \ GIC_INTR_CFG_EDGE), \
MT_IRQ_SEC_SGI_7 INTR_PROP_DESC(MT_IRQ_SEC_SGI_3, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(MT_IRQ_SEC_SGI_4, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(MT_IRQ_SEC_SGI_5, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(MT_IRQ_SEC_SGI_6, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(MT_IRQ_SEC_SGI_7, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE)
#define PLAT_ARM_G0_IRQS #define PLAT_ARM_G0_IRQ_PROPS(grp)
#endif /* __PLATFORM_DEF_H__ */ #endif /* __PLATFORM_DEF_H__ */

63
plat/socionext/uniphier/uniphier_gicv3.c
View file

@ -6,6 +6,7 @@
#include <assert.h> #include <assert.h>
#include <gicv3.h> #include <gicv3.h>
#include <interrupt_props.h>
#include <platform.h> #include <platform.h>
#include <platform_def.h> #include <platform_def.h>
@ -13,19 +14,39 @@
static uintptr_t uniphier_rdistif_base_addrs[PLATFORM_CORE_COUNT]; static uintptr_t uniphier_rdistif_base_addrs[PLATFORM_CORE_COUNT];
static const unsigned int g0_interrupt_array[] = { static const interrupt_prop_t uniphier_interrupt_props[] = {
8, /* SGI0 */ /* G0 interrupts */
14, /* SGI6 */
};
static const unsigned int g1s_interrupt_array[] = { /* SGI0 */
29, /* Timer */ INTR_PROP_DESC(8, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP0,
9, /* SGI1 */ GIC_INTR_CFG_EDGE),
10, /* SGI2 */ /* SGI6 */
11, /* SGI3 */ INTR_PROP_DESC(14, GIC_HIGHEST_SEC_PRIORITY, INTR_GROUP0,
12, /* SGI4 */ GIC_INTR_CFG_EDGE),
13, /* SGI5 */
15, /* SGI7 */ /* 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 uniphier_mpidr_to_core_pos(u_register_t mpidr) static unsigned int uniphier_mpidr_to_core_pos(u_register_t mpidr)
@ -37,10 +58,8 @@ static const struct gicv3_driver_data uniphier_gic_driver_data[] = {
[UNIPHIER_SOC_LD11] = { [UNIPHIER_SOC_LD11] = {
.gicd_base = 0x5fe00000, .gicd_base = 0x5fe00000,
.gicr_base = 0x5fe40000, .gicr_base = 0x5fe40000,
.g0_interrupt_num = ARRAY_SIZE(g0_interrupt_array), .interrupt_props = uniphier_interrupt_props,
.g1s_interrupt_num = ARRAY_SIZE(g1s_interrupt_array), .interrupt_props_num = ARRAY_SIZE(uniphier_interrupt_props),
.g0_interrupt_array = g0_interrupt_array,
.g1s_interrupt_array = g1s_interrupt_array,
.rdistif_num = PLATFORM_CORE_COUNT, .rdistif_num = PLATFORM_CORE_COUNT,
.rdistif_base_addrs = uniphier_rdistif_base_addrs, .rdistif_base_addrs = uniphier_rdistif_base_addrs,
.mpidr_to_core_pos = uniphier_mpidr_to_core_pos, .mpidr_to_core_pos = uniphier_mpidr_to_core_pos,
@ -48,10 +67,8 @@ static const struct gicv3_driver_data uniphier_gic_driver_data[] = {
[UNIPHIER_SOC_LD20] = { [UNIPHIER_SOC_LD20] = {
.gicd_base = 0x5fe00000, .gicd_base = 0x5fe00000,
.gicr_base = 0x5fe80000, .gicr_base = 0x5fe80000,
.g0_interrupt_num = ARRAY_SIZE(g0_interrupt_array), .interrupt_props = uniphier_interrupt_props,
.g1s_interrupt_num = ARRAY_SIZE(g1s_interrupt_array), .interrupt_props_num = ARRAY_SIZE(uniphier_interrupt_props),
.g0_interrupt_array = g0_interrupt_array,
.g1s_interrupt_array = g1s_interrupt_array,
.rdistif_num = PLATFORM_CORE_COUNT, .rdistif_num = PLATFORM_CORE_COUNT,
.rdistif_base_addrs = uniphier_rdistif_base_addrs, .rdistif_base_addrs = uniphier_rdistif_base_addrs,
.mpidr_to_core_pos = uniphier_mpidr_to_core_pos, .mpidr_to_core_pos = uniphier_mpidr_to_core_pos,
@ -59,10 +76,8 @@ static const struct gicv3_driver_data uniphier_gic_driver_data[] = {
[UNIPHIER_SOC_PXS3] = { [UNIPHIER_SOC_PXS3] = {
.gicd_base = 0x5fe00000, .gicd_base = 0x5fe00000,
.gicr_base = 0x5fe80000, .gicr_base = 0x5fe80000,
.g0_interrupt_num = ARRAY_SIZE(g0_interrupt_array), .interrupt_props = uniphier_interrupt_props,
.g1s_interrupt_num = ARRAY_SIZE(g1s_interrupt_array), .interrupt_props_num = ARRAY_SIZE(uniphier_interrupt_props),
.g0_interrupt_array = g0_interrupt_array,
.g1s_interrupt_array = g1s_interrupt_array,
.rdistif_num = PLATFORM_CORE_COUNT, .rdistif_num = PLATFORM_CORE_COUNT,
.rdistif_base_addrs = uniphier_rdistif_base_addrs, .rdistif_base_addrs = uniphier_rdistif_base_addrs,
.mpidr_to_core_pos = uniphier_mpidr_to_core_pos, .mpidr_to_core_pos = uniphier_mpidr_to_core_pos,

36
plat/xilinx/zynqmp/include/platform_def.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -8,6 +8,8 @@
#define __PLATFORM_DEF_H__ #define __PLATFORM_DEF_H__
#include <arch.h> #include <arch.h>
#include <gic_common.h>
#include <interrupt_props.h>
#include "../zynqmp_def.h" #include "../zynqmp_def.h"
/******************************************************************************* /*******************************************************************************
@ -85,20 +87,30 @@
#define PLAT_ARM_GICD_BASE BASE_GICD_BASE #define PLAT_ARM_GICD_BASE BASE_GICD_BASE
#define PLAT_ARM_GICC_BASE BASE_GICC_BASE #define PLAT_ARM_GICC_BASE BASE_GICC_BASE
/* /*
* Define a list of Group 1 Secure and Group 0 interrupts as per GICv3 * Define properties of Group 1 Secure and Group 0 interrupts as per GICv3
* terminology. On a GICv2 system or mode, the lists will be merged and treated * terminology. On a GICv2 system or mode, the lists will be merged and treated
* as Group 0 interrupts. * as Group 0 interrupts.
*/ */
#define PLAT_ARM_G1S_IRQS ARM_IRQ_SEC_PHY_TIMER, \ #define PLAT_ARM_G1S_IRQ_PROPS(grp) \
ARM_IRQ_SEC_SGI_0, \ INTR_PROP_DESC(ARM_IRQ_SEC_PHY_TIMER, GIC_HIGHEST_SEC_PRIORITY, grp, \
ARM_IRQ_SEC_SGI_1, \ GIC_INTR_CFG_LEVEL), \
ARM_IRQ_SEC_SGI_2, \ INTR_PROP_DESC(ARM_IRQ_SEC_SGI_0, GIC_HIGHEST_SEC_PRIORITY, grp, \
ARM_IRQ_SEC_SGI_3, \ GIC_INTR_CFG_EDGE), \
ARM_IRQ_SEC_SGI_4, \ INTR_PROP_DESC(ARM_IRQ_SEC_SGI_1, GIC_HIGHEST_SEC_PRIORITY, grp, \
ARM_IRQ_SEC_SGI_5, \ GIC_INTR_CFG_EDGE), \
ARM_IRQ_SEC_SGI_6, \ INTR_PROP_DESC(ARM_IRQ_SEC_SGI_2, GIC_HIGHEST_SEC_PRIORITY, grp, \
ARM_IRQ_SEC_SGI_7 GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_3, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_4, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_5, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_6, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE), \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_7, GIC_HIGHEST_SEC_PRIORITY, grp, \
GIC_INTR_CFG_EDGE)
#define PLAT_ARM_G0_IRQS #define PLAT_ARM_G0_IRQ_PROPS(grp)
#endif /* __PLATFORM_DEF_H__ */ #endif /* __PLATFORM_DEF_H__ */