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

rockchip: Migrate to new interfaces

Browse source 
- Migrate to new GIC interfaces.
- Migrate to bl31_early_platform_setup2().
- Use bl31_warm_entrypoint() instead of psci_entrypoint().
- Use PLAT_VIRT_ADDR_SPACE_SIZE and PLAT_PHY_ADDR_SPACE_SIZE.
- Update Makefile paths.
- Remove references to removed build options.
- Use private definition of bl31_params_t.

Change-Id: I860341594b5c868b2fcaa59d23957ee718472ef1
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
This commit is contained in:
Antonio Nino Diaz 2018-09-24 17:16:20 +01:00
parent fdcc112797
commit 2d6f1f01b1
16 changed files with 58 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plat/rockchip/common/aarch64/platform_common.c
View file

@ -5,7 +5,6 @@
*/ */
#include <arch_helpers.h> #include <arch_helpers.h>
#include <arm_gic.h>
#include <bl_common.h> #include <bl_common.h>
#include <cci.h> #include <cci.h>
#include <debug.h> #include <debug.h>

17
plat/rockchip/common/bl31_plat_setup.c
View file

@ -4,7 +4,6 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <arm_gic.h>
#include <assert.h> #include <assert.h>
#include <bl_common.h> #include <bl_common.h>
#include <console.h> #include <console.h>
@ -61,10 +60,12 @@ void params_early_setup(void *plat_param_from_bl2)
* BL2 has flushed this information to memory, so we are guaranteed to pick up * BL2 has flushed this information to memory, so we are guaranteed to pick up
* good data. * good data.
******************************************************************************/ ******************************************************************************/
void bl31_early_platform_setup(bl31_params_t *from_bl2, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
void *plat_params_from_bl2) u_register_t arg2, u_register_t arg3)
{ {
static console_16550_t console; static console_16550_t console;
struct rockchip_bl31_params *arg_from_bl2 = (struct rockchip_bl31_params *) arg0;
void *plat_params_from_bl2 = (void *) arg1;
params_early_setup(plat_params_from_bl2); params_early_setup(plat_params_from_bl2);
@ -82,13 +83,13 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
VERBOSE("bl31_setup\n"); VERBOSE("bl31_setup\n");
/* Passing a NULL context is a critical programming error */ /* Passing a NULL context is a critical programming error */
assert(from_bl2); assert(arg_from_bl2);
assert(from_bl2->h.type == PARAM_BL31); assert(arg_from_bl2->h.type == PARAM_BL31);
assert(from_bl2->h.version >= VERSION_1); assert(arg_from_bl2->h.version >= VERSION_1);
bl32_ep_info = *from_bl2->bl32_ep_info; bl32_ep_info = *arg_from_bl2->bl32_ep_info;
bl33_ep_info = *from_bl2->bl33_ep_info; bl33_ep_info = *arg_from_bl2->bl33_ep_info;
} }
/******************************************************************************* /*******************************************************************************

8
plat/rockchip/common/include/plat_private.h
View file

@ -28,6 +28,14 @@ extern uint32_t __bl31_sram_text_real_end, __bl31_sram_data_real_end;
extern uint32_t __sram_incbin_start, __sram_incbin_end; extern uint32_t __sram_incbin_start, __sram_incbin_end;
extern uint32_t __sram_incbin_real_end; extern uint32_t __sram_incbin_real_end;
struct rockchip_bl31_params {
param_header_t h;
image_info_t *bl31_image_info;
entry_point_info_t *bl32_ep_info;
image_info_t *bl32_image_info;
entry_point_info_t *bl33_ep_info;
image_info_t *bl33_image_info;
};
/****************************************************************************** /******************************************************************************
* The register have write-mask bits, it is mean, if you want to set the bits, * The register have write-mask bits, it is mean, if you want to set the bits,

1
plat/rockchip/common/params_setup.c
View file

@ -4,7 +4,6 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <arm_gic.h>
#include <assert.h> #include <assert.h>
#include <bl_common.h> #include <bl_common.h>
#include <console.h> #include <console.h>

2
plat/rockchip/common/pmusram/pmu_sram_cpus_on.S
View file

@ -48,5 +48,5 @@ ddr_resume:
#endif #endif
bl sram_restore bl sram_restore
sys_resume: sys_resume:
bl psci_entrypoint bl bl31_warm_entrypoint
endfunc pmu_cpuson_entrypoint endfunc pmu_cpuson_entrypoint

9
plat/rockchip/common/rockchip_gicv2.c
View file

@ -6,6 +6,7 @@
#include <bl_common.h> #include <bl_common.h>
#include <gicv2.h> #include <gicv2.h>
#include <interrupt_props.h>
#include <platform_def.h> #include <platform_def.h>
#include <utils.h> #include <utils.h>
@ -23,8 +24,8 @@
* 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.
*****************************************************************************/ *****************************************************************************/
const unsigned int g0_interrupt_array[] = { static const interrupt_prop_t g0_interrupt_props[] = {
PLAT_RK_G1S_IRQS, PLAT_RK_GICV2_G1S_IRQS
}; };
/* /*
@ -35,8 +36,8 @@ const unsigned int g0_interrupt_array[] = {
gicv2_driver_data_t rockchip_gic_data = { gicv2_driver_data_t rockchip_gic_data = {
.gicd_base = PLAT_RK_GICD_BASE, .gicd_base = PLAT_RK_GICD_BASE,
.gicc_base = PLAT_RK_GICC_BASE, .gicc_base = PLAT_RK_GICC_BASE,
.g0_interrupt_num = ARRAY_SIZE(g0_interrupt_array), .interrupt_props = g0_interrupt_props,
.g0_interrupt_array = g0_interrupt_array, .interrupt_props_num = ARRAY_SIZE(g0_interrupt_props),
}; };
/****************************************************************************** /******************************************************************************

18
plat/rockchip/common/rockchip_gicv3.c
View file

@ -6,6 +6,7 @@
#include <bl_common.h> #include <bl_common.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>
#include <utils.h> #include <utils.h>
@ -23,14 +24,9 @@
/* The GICv3 driver only needs to be initialized in EL3 */ /* The GICv3 driver only needs to be initialized in EL3 */
uintptr_t rdistif_base_addrs[PLATFORM_CORE_COUNT]; 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 g01s_interrupt_props[] = {
const unsigned int g1s_interrupt_array[] = { PLAT_RK_GICV3_G0_IRQS,
PLAT_RK_G1S_IRQS PLAT_RK_GICV3_G1S_IRQS
};
/* Array of Group0 interrupts to be configured by the gic driver */
const unsigned int g0_interrupt_array[] = {
PLAT_RK_G0_IRQS
}; };
static unsigned int plat_rockchip_mpidr_to_core_pos(unsigned long mpidr) static unsigned int plat_rockchip_mpidr_to_core_pos(unsigned long mpidr)
@ -41,10 +37,8 @@ static unsigned int plat_rockchip_mpidr_to_core_pos(unsigned long mpidr)
const gicv3_driver_data_t rockchip_gic_data = { const gicv3_driver_data_t rockchip_gic_data = {
.gicd_base = PLAT_RK_GICD_BASE, .gicd_base = PLAT_RK_GICD_BASE,
.gicr_base = PLAT_RK_GICR_BASE, .gicr_base = PLAT_RK_GICR_BASE,
.g0_interrupt_num = ARRAY_SIZE(g0_interrupt_array), .interrupt_props = g01s_interrupt_props,
.g1s_interrupt_num = ARRAY_SIZE(g1s_interrupt_array), .interrupt_props_num = ARRAY_SIZE(g01s_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 = plat_rockchip_mpidr_to_core_pos, .mpidr_to_core_pos = plat_rockchip_mpidr_to_core_pos,

16
plat/rockchip/rk3328/include/platform_def.h
View file

@ -11,8 +11,6 @@
#include <common_def.h> #include <common_def.h>
#include <rk3328_def.h> #include <rk3328_def.h>
#define DEBUG_XLAT_TABLE 0
/******************************************************************************* /*******************************************************************************
* Platform binary types for linking * Platform binary types for linking
******************************************************************************/ ******************************************************************************/
@ -24,9 +22,7 @@
******************************************************************************/ ******************************************************************************/
/* Size of cacheable stacks */ /* Size of cacheable stacks */
#if DEBUG_XLAT_TABLE #if defined(IMAGE_BL1)
#define PLATFORM_STACK_SIZE 0x800
#elif defined(IMAGE_BL1)
#define PLATFORM_STACK_SIZE 0x440 #define PLATFORM_STACK_SIZE 0x440
#elif defined(IMAGE_BL2) #elif defined(IMAGE_BL2)
#define PLATFORM_STACK_SIZE 0x400 #define PLATFORM_STACK_SIZE 0x400
@ -85,7 +81,8 @@
/******************************************************************************* /*******************************************************************************
* Platform specific page table and MMU setup constants * Platform specific page table and MMU setup constants
******************************************************************************/ ******************************************************************************/
#define ADDR_SPACE_SIZE (1ULL << 32) #define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32)
#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32)
#define MAX_XLAT_TABLES 9 #define MAX_XLAT_TABLES 9
#define MAX_MMAP_REGIONS 33 #define MAX_MMAP_REGIONS 33
@ -107,13 +104,6 @@
#define PLAT_RK_GICD_BASE RK3328_GICD_BASE #define PLAT_RK_GICD_BASE RK3328_GICD_BASE
#define PLAT_RK_GICC_BASE RK3328_GICC_BASE #define PLAT_RK_GICC_BASE RK3328_GICC_BASE
/*
* Define a list 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
* as Group 0 interrupts.
*/
#define PLAT_RK_G1S_IRQS RK_G1S_IRQS
#define PLAT_RK_UART_BASE RK3328_UART2_BASE #define PLAT_RK_UART_BASE RK3328_UART2_BASE
#define PLAT_RK_UART_CLOCK RK3328_UART_CLOCK #define PLAT_RK_UART_CLOCK RK3328_UART_CLOCK
#define PLAT_RK_UART_BAUDRATE RK3328_BAUDRATE #define PLAT_RK_UART_BAUDRATE RK3328_BAUDRATE

10
plat/rockchip/rk3328/platform.mk
View file

@ -27,13 +27,14 @@ RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
plat/common/plat_gicv2.c \ plat/common/plat_gicv2.c \
${RK_PLAT}/common/rockchip_gicv2.c ${RK_PLAT}/common/rockchip_gicv2.c
PLAT_BL_COMMON_SOURCES := lib/aarch64/xlat_tables.c \ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/aarch64/xlat_tables.c \
plat/common/aarch64/plat_psci_common.c lib/xlat_tables/xlat_tables_common.c \
plat/common/plat_psci_common.c
BL31_SOURCES += ${RK_GIC_SOURCES} \ BL31_SOURCES += ${RK_GIC_SOURCES} \
drivers/arm/cci/cci.c \ drivers/arm/cci/cci.c \
drivers/console/console.S \ drivers/console/aarch64/console.S \
drivers/ti/uart/16550_console.S \ drivers/ti/uart/aarch64/16550_console.S \
drivers/delay_timer/delay_timer.c \ drivers/delay_timer/delay_timer.c \
drivers/delay_timer/generic_delay_timer.c \ drivers/delay_timer/generic_delay_timer.c \
lib/cpus/aarch64/aem_generic.S \ lib/cpus/aarch64/aem_generic.S \
@ -48,7 +49,6 @@ BL31_SOURCES += ${RK_GIC_SOURCES} \
${RK_PLAT_SOC}/drivers/pmu/pmu.c \ ${RK_PLAT_SOC}/drivers/pmu/pmu.c \
${RK_PLAT_SOC}/drivers/soc/soc.c ${RK_PLAT_SOC}/drivers/soc/soc.c
ENABLE_PLAT_COMPAT := 0
MULTI_CONSOLE_API := 1 MULTI_CONSOLE_API := 1
include lib/coreboot/coreboot.mk include lib/coreboot/coreboot.mk

6
plat/rockchip/rk3328/rk3328_def.h
View file

@ -135,7 +135,11 @@
* 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 RK_G1S_IRQS RK_IRQ_SEC_PHY_TIMER, RK_IRQ_SEC_SGI_6 #define PLAT_RK_GICV2_G1S_IRQS \
INTR_PROP_DESC(RK_IRQ_SEC_PHY_TIMER, GIC_HIGHEST_SEC_PRIORITY, \
GICV2_INTR_GROUP1, GIC_INTR_CFG_LEVEL), \
INTR_PROP_DESC(RK_IRQ_SEC_SGI_6, GIC_HIGHEST_SEC_PRIORITY, \
GICV2_INTR_GROUP1, GIC_INTR_CFG_LEVEL)
#define SHARE_MEM_BASE 0x100000/* [1MB, 1MB+60K]*/ #define SHARE_MEM_BASE 0x100000/* [1MB, 1MB+60K]*/
#define SHARE_MEM_PAGE_NUM 15 #define SHARE_MEM_PAGE_NUM 15

16
plat/rockchip/rk3368/include/platform_def.h
View file

@ -12,8 +12,6 @@
#include <rk3368_def.h> #include <rk3368_def.h>
#include <utils_def.h> #include <utils_def.h>
#define DEBUG_XLAT_TABLE 0
/******************************************************************************* /*******************************************************************************
* Platform binary types for linking * Platform binary types for linking
******************************************************************************/ ******************************************************************************/
@ -25,9 +23,7 @@
******************************************************************************/ ******************************************************************************/
/* Size of cacheable stacks */ /* Size of cacheable stacks */
#if DEBUG_XLAT_TABLE #if defined(IMAGE_BL1)
#define PLATFORM_STACK_SIZE 0x800
#elif defined(IMAGE_BL1)
#define PLATFORM_STACK_SIZE 0x440 #define PLATFORM_STACK_SIZE 0x440
#elif defined(IMAGE_BL2) #elif defined(IMAGE_BL2)
#define PLATFORM_STACK_SIZE 0x400 #define PLATFORM_STACK_SIZE 0x400
@ -86,7 +82,8 @@
/******************************************************************************* /*******************************************************************************
* Platform specific page table and MMU setup constants * Platform specific page table and MMU setup constants
******************************************************************************/ ******************************************************************************/
#define ADDR_SPACE_SIZE (1ULL << 32) #define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32)
#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32)
#define MAX_XLAT_TABLES 8 #define MAX_XLAT_TABLES 8
#define MAX_MMAP_REGIONS 16 #define MAX_MMAP_REGIONS 16
@ -108,13 +105,6 @@
#define PLAT_RK_GICD_BASE RK3368_GICD_BASE #define PLAT_RK_GICD_BASE RK3368_GICD_BASE
#define PLAT_RK_GICC_BASE RK3368_GICC_BASE #define PLAT_RK_GICC_BASE RK3368_GICC_BASE
/*
* Define a list 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
* as Group 0 interrupts.
*/
#define PLAT_RK_G1S_IRQS RK_G1S_IRQS
#define PLAT_RK_UART_BASE RK3368_UART2_BASE #define PLAT_RK_UART_BASE RK3368_UART2_BASE
#define PLAT_RK_UART_CLOCK RK3368_UART_CLOCK #define PLAT_RK_UART_CLOCK RK3368_UART_CLOCK
#define PLAT_RK_UART_BAUDRATE RK3368_BAUDRATE #define PLAT_RK_UART_BAUDRATE RK3368_BAUDRATE

1
plat/rockchip/rk3368/platform.mk
View file

@ -48,7 +48,6 @@ BL31_SOURCES += ${RK_GIC_SOURCES} \
${RK_PLAT_SOC}/drivers/soc/soc.c \ ${RK_PLAT_SOC}/drivers/soc/soc.c \
${RK_PLAT_SOC}/drivers/ddr/ddr_rk3368.c \ ${RK_PLAT_SOC}/drivers/ddr/ddr_rk3368.c \
ENABLE_PLAT_COMPAT := 0
MULTI_CONSOLE_API := 1 MULTI_CONSOLE_API := 1
include lib/coreboot/coreboot.mk include lib/coreboot/coreboot.mk

4
plat/rockchip/rk3368/rk3368_def.h
View file

@ -100,6 +100,8 @@
* 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 RK_G1S_IRQS (RK_IRQ_SEC_PHY_TIMER) #define PLAT_RK_GICV2_G1S_IRQS \
INTR_PROP_DESC(RK_IRQ_SEC_PHY_TIMER, GIC_HIGHEST_SEC_PRIORITY, \
GICV2_INTR_GROUP1, GIC_INTR_CFG_LEVEL)
#endif /* __PLAT_DEF_H__ */ #endif /* __PLAT_DEF_H__ */

17
plat/rockchip/rk3399/include/platform_def.h
View file

@ -13,8 +13,6 @@
#include <rk3399_def.h> #include <rk3399_def.h>
#include <utils_def.h> #include <utils_def.h>
#define DEBUG_XLAT_TABLE 0
/******************************************************************************* /*******************************************************************************
* Platform binary types for linking * Platform binary types for linking
******************************************************************************/ ******************************************************************************/
@ -26,9 +24,7 @@
******************************************************************************/ ******************************************************************************/
/* Size of cacheable stacks */ /* Size of cacheable stacks */
#if DEBUG_XLAT_TABLE #if defined(IMAGE_BL1)
#define PLATFORM_STACK_SIZE 0x800
#elif defined(IMAGE_BL1)
#define PLATFORM_STACK_SIZE 0x440 #define PLATFORM_STACK_SIZE 0x440
#elif defined(IMAGE_BL2) #elif defined(IMAGE_BL2)
#define PLATFORM_STACK_SIZE 0x400 #define PLATFORM_STACK_SIZE 0x400
@ -69,7 +65,8 @@
/******************************************************************************* /*******************************************************************************
* Platform specific page table and MMU setup constants * Platform specific page table and MMU setup constants
******************************************************************************/ ******************************************************************************/
#define ADDR_SPACE_SIZE (1ULL << 32) #define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32)
#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32)
#define MAX_XLAT_TABLES 20 #define MAX_XLAT_TABLES 20
#define MAX_MMAP_REGIONS 25 #define MAX_MMAP_REGIONS 25
@ -92,14 +89,6 @@
#define PLAT_RK_GICR_BASE BASE_GICR_BASE #define PLAT_RK_GICR_BASE BASE_GICR_BASE
#define PLAT_RK_GICC_BASE 0 #define PLAT_RK_GICC_BASE 0
/*
* Define a list 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
* as Group 0 interrupts.
*/
#define PLAT_RK_G1S_IRQS RK3399_G1S_IRQS
#define PLAT_RK_G0_IRQS RK3399_G0_IRQS
#define PLAT_RK_UART_BASE UART2_BASE #define PLAT_RK_UART_BASE UART2_BASE
#define PLAT_RK_UART_CLOCK RK3399_UART_CLOCK #define PLAT_RK_UART_CLOCK RK3399_UART_CLOCK
#define PLAT_RK_UART_BAUDRATE RK3399_BAUDRATE #define PLAT_RK_UART_BAUDRATE RK3399_BAUDRATE

1
plat/rockchip/rk3399/platform.mk
View file

@ -65,7 +65,6 @@ BL31_SOURCES += ${RK_GIC_SOURCES} \
${RK_PLAT_SOC}/drivers/dram/dram_spec_timing.c \ ${RK_PLAT_SOC}/drivers/dram/dram_spec_timing.c \
${RK_PLAT_SOC}/drivers/dram/suspend.c ${RK_PLAT_SOC}/drivers/dram/suspend.c
ENABLE_PLAT_COMPAT := 0
MULTI_CONSOLE_API := 1 MULTI_CONSOLE_API := 1
include lib/coreboot/coreboot.mk include lib/coreboot/coreboot.mk

9
plat/rockchip/rk3399/rk3399_def.h
View file

@ -54,7 +54,12 @@
* 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 RK3399_G1S_IRQS ARM_IRQ_SEC_PHY_TIMER #define PLAT_RK_GICV3_G1S_IRQS \
#define RK3399_G0_IRQS ARM_IRQ_SEC_SGI_6 INTR_PROP_DESC(ARM_IRQ_SEC_PHY_TIMER, GIC_HIGHEST_SEC_PRIORITY, \
INTR_GROUP1S, GIC_INTR_CFG_LEVEL)
#define PLAT_RK_GICV3_G0_IRQS \
INTR_PROP_DESC(ARM_IRQ_SEC_SGI_6, GIC_HIGHEST_SEC_PRIORITY, \
INTR_GROUP0, GIC_INTR_CFG_LEVEL)
#endif /* __PLAT_DEF_H__ */ #endif /* __PLAT_DEF_H__ */