diff --git a/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c b/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c index 3ee396c91..fe521a9fa 100644 --- a/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c +++ b/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c @@ -57,8 +57,8 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { { .image_id = TOS_FW_CONFIG_ID, .image_info.image_base = CORSTONE1000_TOS_FW_CONFIG_BASE, - .image_info.image_max_size = CORSTONE1000_TOS_FW_CONFIG_LIMIT - \ - CORSTONE1000_TOS_FW_CONFIG_BASE, + .image_info.image_max_size = (CORSTONE1000_TOS_FW_CONFIG_LIMIT - + CORSTONE1000_TOS_FW_CONFIG_BASE), SET_STATIC_PARAM_HEAD(ep_info, PARAM_IMAGE_BINARY, VERSION_2, entry_point_info_t, SECURE | NON_EXECUTABLE), SET_STATIC_PARAM_HEAD(image_info, PARAM_IMAGE_BINARY, diff --git a/plat/arm/board/corstone1000/common/corstone1000_plat.c b/plat/arm/board/corstone1000/common/corstone1000_plat.c index a96baae06..0235f8b84 100644 --- a/plat/arm/board/corstone1000/common/corstone1000_plat.c +++ b/plat/arm/board/corstone1000/common/corstone1000_plat.c @@ -34,12 +34,13 @@ static void set_fip_image_source(void) { const struct plat_io_policy *policy; /* - * metadata for firmware update is written at 0x0000 offset of the flash. - * PLAT_ARM_BOOT_BANK_FLAG contains the boot bank that TF-M is booted. - * As per firmware update spec, at a given point of time, only one bank is active. - * This means, TF-A should boot from the same bank as TF-M. - */ + * metadata for firmware update is written at 0x0000 offset of the flash. + * PLAT_ARM_BOOT_BANK_FLAG contains the boot bank that TF-M is booted. + * As per firmware update spec, at a given point of time, only one bank + * is active. This means, TF-A should boot from the same bank as TF-M. + */ volatile uint32_t *boot_bank_flag = (uint32_t *)(PLAT_ARM_BOOT_BANK_FLAG); + if (*boot_bank_flag > 1) { VERBOSE("Boot_bank is set higher than possible values"); } diff --git a/plat/arm/board/corstone1000/common/corstone1000_pm.c b/plat/arm/board/corstone1000/common/corstone1000_pm.c index 98dea7963..4b0a791e7 100644 --- a/plat/arm/board/corstone1000/common/corstone1000_pm.c +++ b/plat/arm/board/corstone1000/common/corstone1000_pm.c @@ -21,8 +21,8 @@ static void __dead2 corstone1000_system_reset(void) *(watchdog_val_reg) = SECURE_WATCHDOG_COUNTDOWN_VAL; *watchdog_ctrl_reg = SECURE_WATCHDOG_MASK_ENABLE; while (1) { - wfi(); - } + wfi(); + } } plat_psci_ops_t plat_arm_psci_pm_ops = { diff --git a/plat/arm/board/corstone1000/common/corstone1000_trusted_boot.c b/plat/arm/board/corstone1000/common/corstone1000_trusted_boot.c index cec733270..7e8fbb2d6 100644 --- a/plat/arm/board/corstone1000/common/corstone1000_trusted_boot.c +++ b/plat/arm/board/corstone1000/common/corstone1000_trusted_boot.c @@ -38,8 +38,8 @@ int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, */ int plat_get_nv_ctr(void *cookie, unsigned int *nv_ctr) { - *nv_ctr = CORSTONE1000_FW_NVCTR_VAL; - return 0; + *nv_ctr = CORSTONE1000_FW_NVCTR_VAL; + return 0; } /* @@ -49,5 +49,5 @@ int plat_get_nv_ctr(void *cookie, unsigned int *nv_ctr) */ int plat_set_nv_ctr(void *cookie, unsigned int nv_ctr) { - return 0; + return 0; } diff --git a/plat/arm/board/corstone1000/common/include/platform_def.h b/plat/arm/board/corstone1000/common/include/platform_def.h index 2523d72b9..584d485f3 100644 --- a/plat/arm/board/corstone1000/common/include/platform_def.h +++ b/plat/arm/board/corstone1000/common/include/platform_def.h @@ -16,11 +16,11 @@ #include #include -#define ARM_ROTPK_HEADER_LEN 19 -#define ARM_ROTPK_HASH_LEN 32 +#define ARM_ROTPK_HEADER_LEN 19 +#define ARM_ROTPK_HASH_LEN 32 /* Special value used to verify platform parameters from BL2 to BL31 */ -#define ARM_BL31_PLAT_PARAM_VAL ULL(0x0f1e2d3c4b5a6978) +#define ARM_BL31_PLAT_PARAM_VAL ULL(0x0f1e2d3c4b5a6978) /* PL011 UART related constants */ #ifdef V2M_IOFPGA_UART0_CLK_IN_HZ @@ -31,368 +31,324 @@ #undef V2M_IOFPGA_UART1_CLK_IN_HZ #endif -#define V2M_IOFPGA_UART0_CLK_IN_HZ 50000000 -#define V2M_IOFPGA_UART1_CLK_IN_HZ 50000000 +#define V2M_IOFPGA_UART0_CLK_IN_HZ 50000000 +#define V2M_IOFPGA_UART1_CLK_IN_HZ 50000000 /* Core/Cluster/Thread counts for corstone1000 */ -#define CORSTONE1000_CLUSTER_COUNT U(1) -#define CORSTONE1000_MAX_CPUS_PER_CLUSTER U(4) -#define CORSTONE1000_MAX_PE_PER_CPU U(1) -#define CORSTONE1000_PRIMARY_CPU U(0) +#define CORSTONE1000_CLUSTER_COUNT U(1) +#define CORSTONE1000_MAX_CPUS_PER_CLUSTER U(4) +#define CORSTONE1000_MAX_PE_PER_CPU U(1) +#define CORSTONE1000_PRIMARY_CPU U(0) -#define PLAT_ARM_CLUSTER_COUNT CORSTONE1000_CLUSTER_COUNT +#define PLAT_ARM_CLUSTER_COUNT CORSTONE1000_CLUSTER_COUNT -#define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER_COUNT * \ - CORSTONE1000_MAX_CPUS_PER_CLUSTER * \ - CORSTONE1000_MAX_PE_PER_CPU) +#define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER_COUNT * \ + CORSTONE1000_MAX_CPUS_PER_CLUSTER * \ + CORSTONE1000_MAX_PE_PER_CPU) /* UART related constants */ -#define PLAT_ARM_BOOT_UART_BASE 0x1a510000 -#define PLAT_ARM_BOOT_UART_CLK_IN_HZ V2M_IOFPGA_UART0_CLK_IN_HZ -#define PLAT_ARM_RUN_UART_BASE 0x1a520000 -#define PLAT_ARM_RUN_UART_CLK_IN_HZ V2M_IOFPGA_UART1_CLK_IN_HZ -#define ARM_CONSOLE_BAUDRATE 115200 -#define PLAT_ARM_CRASH_UART_BASE PLAT_ARM_RUN_UART_BASE -#define PLAT_ARM_CRASH_UART_CLK_IN_HZ PLAT_ARM_RUN_UART_CLK_IN_HZ +#define PLAT_ARM_BOOT_UART_BASE 0x1a510000 +#define PLAT_ARM_BOOT_UART_CLK_IN_HZ V2M_IOFPGA_UART0_CLK_IN_HZ +#define PLAT_ARM_RUN_UART_BASE 0x1a520000 +#define PLAT_ARM_RUN_UART_CLK_IN_HZ V2M_IOFPGA_UART1_CLK_IN_HZ +#define ARM_CONSOLE_BAUDRATE 115200 +#define PLAT_ARM_CRASH_UART_BASE PLAT_ARM_RUN_UART_BASE +#define PLAT_ARM_CRASH_UART_CLK_IN_HZ PLAT_ARM_RUN_UART_CLK_IN_HZ /* Memory related constants */ /* SRAM (CVM) memory layout * * - * - * partition size: sizeof(meminfo_t) = 16 bytes - * - * content: memory info area used by the next BL + * partition size: sizeof(meminfo_t) = 16 bytes + * content: memory info area used by the next BL * * - * - * partition size: 4080 bytes + * partition size: 4080 bytes * * - * - * partition size: 4 KB - * - * content: - * - * Area where BL2 copies the images descriptors + * partition size: 4 KB + * content: Area where BL2 copies the images descriptors * * = - * - * partition size: 688 KB - * - * content: - * - * BL32 (optee-os) + * partition size: 688 KB + * content: BL32 (optee-os) * * = 0x20ae000 - * - * partition size: 8 KB - * - * content: - * - * BL32 config (TOS_FW_CONFIG) + * partition size: 8 KB + * content: BL32 config (TOS_FW_CONFIG) * * - * - * partition size: 140 KB - * - * content: - * - * BL31 + * partition size: 140 KB + * content: BL31 * * - * - * partition size: 4 KB - * - * content: - * - * MCUBOOT data needed to verify TF-A BL2 + * partition size: 4 KB + * content: MCUBOOT data needed to verify TF-A BL2 * * - * - * partition size: 176 KB - * - * content: - * - * BL2 + * partition size: 176 KB + * content: BL2 * * = + 1 MB - * - * partition size: 512 KB - * - * content: - * - * BL33 (u-boot) + * partition size: 512 KB + * content: BL33 (u-boot) */ /* DDR memory */ -#define ARM_DRAM1_BASE UL(0x80000000) -#define ARM_DRAM1_SIZE (SZ_2G) /* 2GB*/ -#define ARM_DRAM1_END (ARM_DRAM1_BASE + \ - ARM_DRAM1_SIZE - 1) +#define ARM_DRAM1_BASE UL(0x80000000) +#define ARM_DRAM1_SIZE (SZ_2G) /* 2GB*/ +#define ARM_DRAM1_END (ARM_DRAM1_BASE + ARM_DRAM1_SIZE - 1) /* DRAM1 and DRAM2 are the same for corstone1000 */ -#define ARM_DRAM2_BASE ARM_DRAM1_BASE -#define ARM_DRAM2_SIZE ARM_DRAM1_SIZE -#define ARM_DRAM2_END ARM_DRAM1_END +#define ARM_DRAM2_BASE ARM_DRAM1_BASE +#define ARM_DRAM2_SIZE ARM_DRAM1_SIZE +#define ARM_DRAM2_END ARM_DRAM1_END -#define ARM_NS_DRAM1_BASE ARM_DRAM1_BASE -#define ARM_NS_DRAM1_SIZE ARM_DRAM1_SIZE -#define ARM_NS_DRAM1_END (ARM_NS_DRAM1_BASE +\ - ARM_NS_DRAM1_SIZE - 1) +#define ARM_NS_DRAM1_BASE ARM_DRAM1_BASE +#define ARM_NS_DRAM1_SIZE ARM_DRAM1_SIZE +#define ARM_NS_DRAM1_END (ARM_NS_DRAM1_BASE + ARM_NS_DRAM1_SIZE - 1) /* The first 8 KB of Trusted SRAM are used as shared memory */ -#define ARM_TRUSTED_SRAM_BASE UL(0x02000000) -#define ARM_SHARED_RAM_SIZE (SZ_8K) /* 8 KB */ -#define ARM_SHARED_RAM_BASE ARM_TRUSTED_SRAM_BASE +#define ARM_TRUSTED_SRAM_BASE UL(0x02000000) +#define ARM_SHARED_RAM_SIZE (SZ_8K) /* 8 KB */ +#define ARM_SHARED_RAM_BASE ARM_TRUSTED_SRAM_BASE /* The remaining Trusted SRAM is used to load the BL images */ -#define TOTAL_SRAM_SIZE (SZ_4M) /* 4 MB */ +#define TOTAL_SRAM_SIZE (SZ_4M) /* 4 MB */ -/* Last 512KB of CVM is allocated for shared RAM - * as an example openAMP */ -#define ARM_NS_SHARED_RAM_SIZE (512 * SZ_1K) +/* Last 512KB of CVM is allocated for shared RAM as an example openAMP */ +#define ARM_NS_SHARED_RAM_SIZE (512 * SZ_1K) -#define PLAT_ARM_TRUSTED_SRAM_SIZE (TOTAL_SRAM_SIZE - \ - ARM_NS_SHARED_RAM_SIZE - \ - ARM_SHARED_RAM_SIZE) +#define PLAT_ARM_TRUSTED_SRAM_SIZE (TOTAL_SRAM_SIZE - \ + ARM_NS_SHARED_RAM_SIZE - \ + ARM_SHARED_RAM_SIZE) -#define PLAT_ARM_MAX_BL2_SIZE (180 * SZ_1K) /* 180 KB */ +#define PLAT_ARM_MAX_BL2_SIZE (180 * SZ_1K) /* 180 KB */ -#define PLAT_ARM_MAX_BL31_SIZE (140 * SZ_1K) /* 140 KB */ +#define PLAT_ARM_MAX_BL31_SIZE (140 * SZ_1K) /* 140 KB */ -#define ARM_BL_RAM_BASE (ARM_SHARED_RAM_BASE + \ - ARM_SHARED_RAM_SIZE) -#define ARM_BL_RAM_SIZE (PLAT_ARM_TRUSTED_SRAM_SIZE - \ - ARM_SHARED_RAM_SIZE) +#define ARM_BL_RAM_BASE (ARM_SHARED_RAM_BASE + ARM_SHARED_RAM_SIZE) +#define ARM_BL_RAM_SIZE (PLAT_ARM_TRUSTED_SRAM_SIZE - \ + ARM_SHARED_RAM_SIZE) -#define BL2_SIGNATURE_SIZE (SZ_4K) /* 4 KB */ +#define BL2_SIGNATURE_SIZE (SZ_4K) /* 4 KB */ -#define BL2_SIGNATURE_BASE (BL2_LIMIT - \ - PLAT_ARM_MAX_BL2_SIZE) -#define BL2_BASE (BL2_LIMIT - \ - PLAT_ARM_MAX_BL2_SIZE + \ - BL2_SIGNATURE_SIZE) -#define BL2_LIMIT (ARM_BL_RAM_BASE + \ - ARM_BL_RAM_SIZE) +#define BL2_SIGNATURE_BASE (BL2_LIMIT - PLAT_ARM_MAX_BL2_SIZE) +#define BL2_BASE (BL2_LIMIT - \ + PLAT_ARM_MAX_BL2_SIZE + \ + BL2_SIGNATURE_SIZE) +#define BL2_LIMIT (ARM_BL_RAM_BASE + ARM_BL_RAM_SIZE) -#define BL31_BASE (BL2_SIGNATURE_BASE - \ - PLAT_ARM_MAX_BL31_SIZE) -#define BL31_LIMIT BL2_SIGNATURE_BASE +#define BL31_BASE (BL2_SIGNATURE_BASE - PLAT_ARM_MAX_BL31_SIZE) +#define BL31_LIMIT BL2_SIGNATURE_BASE -#define CORSTONE1000_TOS_FW_CONFIG_BASE (BL31_BASE - \ - CORSTONE1000_TOS_FW_CONFIG_SIZE) -#define CORSTONE1000_TOS_FW_CONFIG_SIZE (SZ_8K) /* 8 KB */ -#define CORSTONE1000_TOS_FW_CONFIG_LIMIT BL31_BASE +#define CORSTONE1000_TOS_FW_CONFIG_BASE (BL31_BASE - \ + CORSTONE1000_TOS_FW_CONFIG_SIZE) +#define CORSTONE1000_TOS_FW_CONFIG_SIZE (SZ_8K) /* 8 KB */ +#define CORSTONE1000_TOS_FW_CONFIG_LIMIT BL31_BASE -#define BL32_BASE ARM_BL_RAM_BASE -#define PLAT_ARM_MAX_BL32_SIZE (CORSTONE1000_TOS_FW_CONFIG_BASE - \ - BL32_BASE) +#define BL32_BASE ARM_BL_RAM_BASE +#define PLAT_ARM_MAX_BL32_SIZE (CORSTONE1000_TOS_FW_CONFIG_BASE - BL32_BASE) -#define BL32_LIMIT (BL32_BASE + \ - PLAT_ARM_MAX_BL32_SIZE) +#define BL32_LIMIT (BL32_BASE + PLAT_ARM_MAX_BL32_SIZE) /* SPD_spmd settings */ -#define PLAT_ARM_SPMC_BASE BL32_BASE -#define PLAT_ARM_SPMC_SIZE PLAT_ARM_MAX_BL32_SIZE +#define PLAT_ARM_SPMC_BASE BL32_BASE +#define PLAT_ARM_SPMC_SIZE PLAT_ARM_MAX_BL32_SIZE /* NS memory */ /* The last 512KB of the SRAM is allocated as shared memory */ -#define ARM_NS_SHARED_RAM_BASE (ARM_TRUSTED_SRAM_BASE + TOTAL_SRAM_SIZE - \ - (PLAT_ARM_MAX_BL31_SIZE + \ - PLAT_ARM_MAX_BL32_SIZE)) +#define ARM_NS_SHARED_RAM_BASE (ARM_TRUSTED_SRAM_BASE + TOTAL_SRAM_SIZE - \ + (PLAT_ARM_MAX_BL31_SIZE + \ + PLAT_ARM_MAX_BL32_SIZE)) -#define BL33_BASE ARM_DRAM1_BASE -#define PLAT_ARM_MAX_BL33_SIZE (12 * SZ_1M) /* 12 MB*/ -#define BL33_LIMIT (ARM_DRAM1_BASE + PLAT_ARM_MAX_BL33_SIZE) +#define BL33_BASE ARM_DRAM1_BASE +#define PLAT_ARM_MAX_BL33_SIZE (12 * SZ_1M) /* 12 MB*/ +#define BL33_LIMIT (ARM_DRAM1_BASE + PLAT_ARM_MAX_BL33_SIZE) /* end of the definition of SRAM memory layout */ /* NOR Flash */ -#define PLAT_ARM_BOOT_BANK_FLAG UL(0x08002000) -#define PLAT_ARM_FIP_BASE_BANK0 UL(0x081EF000) -#define PLAT_ARM_FIP_BASE_BANK1 UL(0x0916F000) -#define PLAT_ARM_FIP_MAX_SIZE UL(0x1ff000) /* 1.996 MB */ +#define PLAT_ARM_BOOT_BANK_FLAG UL(0x08002000) +#define PLAT_ARM_FIP_BASE_BANK0 UL(0x081EF000) +#define PLAT_ARM_FIP_BASE_BANK1 UL(0x0916F000) +#define PLAT_ARM_FIP_MAX_SIZE UL(0x1ff000) /* 1.996 MB */ -#define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE -#define PLAT_ARM_NVM_SIZE (SZ_32M) /* 32 MB */ +#define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE +#define PLAT_ARM_NVM_SIZE (SZ_32M) /* 32 MB */ -#define PLAT_ARM_FLASH_IMAGE_BASE PLAT_ARM_FIP_BASE_BANK0 -#define PLAT_ARM_FLASH_IMAGE_MAX_SIZE PLAT_ARM_FIP_MAX_SIZE +#define PLAT_ARM_FLASH_IMAGE_BASE PLAT_ARM_FIP_BASE_BANK0 +#define PLAT_ARM_FLASH_IMAGE_MAX_SIZE PLAT_ARM_FIP_MAX_SIZE /* * Some data must be aligned on the biggest cache line size in the platform. * This is known only to the platform as it might have a combination of * integrated and external caches. */ -#define CACHE_WRITEBACK_GRANULE (U(1) << ARM_CACHE_WRITEBACK_SHIFT) -#define ARM_CACHE_WRITEBACK_SHIFT 6 +#define CACHE_WRITEBACK_GRANULE (U(1) << ARM_CACHE_WRITEBACK_SHIFT) +#define ARM_CACHE_WRITEBACK_SHIFT 6 /* * Define FW_CONFIG area base and limit. Leave enough space for BL2 meminfo. * FW_CONFIG is intended to host the device tree. Currently, This area is not * used because corstone1000 platform doesn't use a device tree at TF-A level. */ -#define ARM_FW_CONFIG_BASE (ARM_SHARED_RAM_BASE \ - + sizeof(meminfo_t)) -#define ARM_FW_CONFIG_LIMIT (ARM_SHARED_RAM_BASE \ - + (ARM_SHARED_RAM_SIZE >> 1)) +#define ARM_FW_CONFIG_BASE (ARM_SHARED_RAM_BASE + sizeof(meminfo_t)) +#define ARM_FW_CONFIG_LIMIT (ARM_SHARED_RAM_BASE + \ + (ARM_SHARED_RAM_SIZE >> 1)) /* * Boot parameters passed from BL2 to BL31/BL32 are stored here */ -#define ARM_BL2_MEM_DESC_BASE ARM_FW_CONFIG_LIMIT -#define ARM_BL2_MEM_DESC_LIMIT ARM_BL_RAM_BASE +#define ARM_BL2_MEM_DESC_BASE ARM_FW_CONFIG_LIMIT +#define ARM_BL2_MEM_DESC_LIMIT ARM_BL_RAM_BASE /* * The max number of regions like RO(code), coherent and data required by * different BL stages which need to be mapped in the MMU. */ -#define ARM_BL_REGIONS 3 -#define PLAT_ARM_MMAP_ENTRIES 8 -#define MAX_XLAT_TABLES 5 -#define MAX_MMAP_REGIONS (PLAT_ARM_MMAP_ENTRIES + \ - ARM_BL_REGIONS) -#define MAX_IO_DEVICES 2 -#define MAX_IO_HANDLES 3 -#define MAX_IO_BLOCK_DEVICES 1 +#define ARM_BL_REGIONS 3 +#define PLAT_ARM_MMAP_ENTRIES 8 +#define MAX_XLAT_TABLES 5 +#define MAX_MMAP_REGIONS (PLAT_ARM_MMAP_ENTRIES + ARM_BL_REGIONS) +#define MAX_IO_DEVICES 2 +#define MAX_IO_HANDLES 3 +#define MAX_IO_BLOCK_DEVICES 1 /* GIC related constants */ -#define PLAT_ARM_GICD_BASE 0x1C010000 -#define PLAT_ARM_GICC_BASE 0x1C02F000 +#define PLAT_ARM_GICD_BASE 0x1C010000 +#define PLAT_ARM_GICC_BASE 0x1C02F000 /* MHUv2 Secure Channel receiver and sender */ -#define PLAT_SDK700_MHU0_SEND 0x1B800000 -#define PLAT_SDK700_MHU0_RECV 0x1B810000 +#define PLAT_SDK700_MHU0_SEND 0x1B800000 +#define PLAT_SDK700_MHU0_RECV 0x1B810000 /* Timer/watchdog related constants */ -#define ARM_SYS_CNTCTL_BASE UL(0x1a200000) -#define ARM_SYS_CNTREAD_BASE UL(0x1a210000) -#define ARM_SYS_TIMCTL_BASE UL(0x1a220000) +#define ARM_SYS_CNTCTL_BASE UL(0x1a200000) +#define ARM_SYS_CNTREAD_BASE UL(0x1a210000) +#define ARM_SYS_TIMCTL_BASE UL(0x1a220000) -#define SECURE_WATCHDOG_ADDR_CTRL_REG 0x1A320000 -#define SECURE_WATCHDOG_ADDR_VAL_REG 0x1A320008 -#define SECURE_WATCHDOG_MASK_ENABLE 0x01 -#define SECURE_WATCHDOG_COUNTDOWN_VAL 0x1000 +#define SECURE_WATCHDOG_ADDR_CTRL_REG 0x1A320000 +#define SECURE_WATCHDOG_ADDR_VAL_REG 0x1A320008 +#define SECURE_WATCHDOG_MASK_ENABLE 0x01 +#define SECURE_WATCHDOG_COUNTDOWN_VAL 0x1000 -#define SYS_COUNTER_FREQ_IN_TICKS UL(50000000) /* 50MHz */ +#define SYS_COUNTER_FREQ_IN_TICKS UL(50000000) /* 50MHz */ -#define CORSTONE1000_IRQ_TZ_WDOG 32 -#define CORSTONE1000_IRQ_SEC_SYS_TIMER 34 +#define CORSTONE1000_IRQ_TZ_WDOG 32 +#define CORSTONE1000_IRQ_SEC_SYS_TIMER 34 -#define PLAT_MAX_PWR_LVL 2 +#define PLAT_MAX_PWR_LVL 2 /* * Macros mapping the MPIDR Affinity levels to ARM Platform Power levels. The * power levels have a 1:1 mapping with the MPIDR affinity levels. */ -#define ARM_PWR_LVL0 MPIDR_AFFLVL0 -#define ARM_PWR_LVL1 MPIDR_AFFLVL1 -#define ARM_PWR_LVL2 MPIDR_AFFLVL2 +#define ARM_PWR_LVL0 MPIDR_AFFLVL0 +#define ARM_PWR_LVL1 MPIDR_AFFLVL1 +#define ARM_PWR_LVL2 MPIDR_AFFLVL2 /* * Macros for local power states in ARM platforms encoded by State-ID field * within the power-state parameter. */ /* Local power state for power domains in Run state. */ -#define ARM_LOCAL_STATE_RUN U(0) +#define ARM_LOCAL_STATE_RUN U(0) /* Local power state for retention. Valid only for CPU power domains */ -#define ARM_LOCAL_STATE_RET U(1) +#define ARM_LOCAL_STATE_RET U(1) /* Local power state for OFF/power-down. Valid for CPU and cluster * power domains */ -#define ARM_LOCAL_STATE_OFF U(2) +#define ARM_LOCAL_STATE_OFF U(2) -#define PLAT_ARM_TRUSTED_MAILBOX_BASE ARM_TRUSTED_SRAM_BASE -#define PLAT_ARM_NSTIMER_FRAME_ID U(1) +#define PLAT_ARM_TRUSTED_MAILBOX_BASE ARM_TRUSTED_SRAM_BASE +#define PLAT_ARM_NSTIMER_FRAME_ID U(1) -#define PLAT_ARM_NS_IMAGE_BASE (ARM_NS_SHARED_RAM_BASE) +#define PLAT_ARM_NS_IMAGE_BASE (ARM_NS_SHARED_RAM_BASE) -#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32) -#define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32) +#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32) +#define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32) /* * This macro defines the deepest retention state possible. A higher state * ID will represent an invalid or a power down state. */ -#define PLAT_MAX_RET_STATE 1 +#define PLAT_MAX_RET_STATE 1 /* * This macro defines the deepest power down states possible. Any state ID * higher than this is invalid. */ -#define PLAT_MAX_OFF_STATE 2 +#define PLAT_MAX_OFF_STATE 2 -#define PLATFORM_STACK_SIZE UL(0x440) +#define PLATFORM_STACK_SIZE UL(0x440) -#define CORSTONE1000_EXTERNAL_FLASH MAP_REGION_FLAT( \ - PLAT_ARM_NVM_BASE, \ - PLAT_ARM_NVM_SIZE, \ - MT_DEVICE | MT_RO | MT_SECURE) +#define CORSTONE1000_EXTERNAL_FLASH MAP_REGION_FLAT( \ + PLAT_ARM_NVM_BASE, \ + PLAT_ARM_NVM_SIZE, \ + MT_DEVICE | MT_RO | MT_SECURE) -#define ARM_MAP_SHARED_RAM MAP_REGION_FLAT( \ - ARM_SHARED_RAM_BASE, \ - ARM_SHARED_RAM_SIZE, \ - MT_MEMORY | MT_RW | MT_SECURE) +#define ARM_MAP_SHARED_RAM MAP_REGION_FLAT( \ + ARM_SHARED_RAM_BASE, \ + ARM_SHARED_RAM_SIZE, \ + MT_MEMORY | MT_RW | MT_SECURE) -#define ARM_MAP_NS_SHARED_RAM MAP_REGION_FLAT( \ - ARM_NS_SHARED_RAM_BASE, \ - ARM_NS_SHARED_RAM_SIZE, \ - MT_MEMORY | MT_RW | MT_NS) +#define ARM_MAP_NS_SHARED_RAM MAP_REGION_FLAT( \ + ARM_NS_SHARED_RAM_BASE, \ + ARM_NS_SHARED_RAM_SIZE, \ + MT_MEMORY | MT_RW | MT_NS) -#define ARM_MAP_NS_DRAM1 MAP_REGION_FLAT( \ - ARM_NS_DRAM1_BASE, \ - ARM_NS_DRAM1_SIZE, \ - MT_MEMORY | MT_RW | MT_NS) +#define ARM_MAP_NS_DRAM1 MAP_REGION_FLAT( \ + ARM_NS_DRAM1_BASE, \ + ARM_NS_DRAM1_SIZE, \ + MT_MEMORY | MT_RW | MT_NS) -#define ARM_MAP_BL_RO MAP_REGION_FLAT( \ - BL_CODE_BASE, \ - BL_CODE_END \ - - BL_CODE_BASE, \ - MT_CODE | MT_SECURE), \ - MAP_REGION_FLAT( \ - BL_RO_DATA_BASE, \ - BL_RO_DATA_END \ - - BL_RO_DATA_BASE, \ - MT_RO_DATA | MT_SECURE) +#define ARM_MAP_BL_RO MAP_REGION_FLAT( \ + BL_CODE_BASE, \ + (BL_CODE_END - BL_CODE_BASE), \ + MT_CODE | MT_SECURE), \ + MAP_REGION_FLAT( \ + BL_RO_DATA_BASE, \ + (BL_RO_DATA_END - BL_RO_DATA_BASE), \ + MT_RO_DATA | MT_SECURE) #if USE_COHERENT_MEM -#define ARM_MAP_BL_COHERENT_RAM MAP_REGION_FLAT( \ - BL_COHERENT_RAM_BASE, \ - BL_COHERENT_RAM_END \ - - BL_COHERENT_RAM_BASE, \ - MT_DEVICE | MT_RW | MT_SECURE) +#define ARM_MAP_BL_COHERENT_RAM MAP_REGION_FLAT( \ + BL_COHERENT_RAM_BASE, \ + (BL_COHERENT_RAM_END \ + - BL_COHERENT_RAM_BASE), \ + MT_DEVICE | MT_RW | MT_SECURE) #endif /* * Map the region for the optional device tree configuration with read and * write permissions */ -#define ARM_MAP_BL_CONFIG_REGION MAP_REGION_FLAT( \ - ARM_FW_CONFIG_BASE, \ - (ARM_FW_CONFIG_LIMIT- \ - ARM_FW_CONFIG_BASE), \ - MT_MEMORY | MT_RW | MT_SECURE) +#define ARM_MAP_BL_CONFIG_REGION MAP_REGION_FLAT( \ + ARM_FW_CONFIG_BASE, \ + (ARM_FW_CONFIG_LIMIT \ + - ARM_FW_CONFIG_BASE), \ + MT_MEMORY | MT_RW | MT_SECURE) -#define CORSTONE1000_DEVICE_BASE (0x1A000000) -#define CORSTONE1000_DEVICE_SIZE (0x26000000) -#define CORSTONE1000_MAP_DEVICE MAP_REGION_FLAT( \ - CORSTONE1000_DEVICE_BASE, \ - CORSTONE1000_DEVICE_SIZE, \ - MT_DEVICE | MT_RW | MT_SECURE) +#define CORSTONE1000_DEVICE_BASE (0x1A000000) +#define CORSTONE1000_DEVICE_SIZE (0x26000000) +#define CORSTONE1000_MAP_DEVICE MAP_REGION_FLAT( \ + CORSTONE1000_DEVICE_BASE, \ + CORSTONE1000_DEVICE_SIZE, \ + MT_DEVICE | MT_RW | MT_SECURE) -#define ARM_IRQ_SEC_PHY_TIMER 29 +#define ARM_IRQ_SEC_PHY_TIMER 29 -#define ARM_IRQ_SEC_SGI_0 8 -#define ARM_IRQ_SEC_SGI_1 9 -#define ARM_IRQ_SEC_SGI_2 10 -#define ARM_IRQ_SEC_SGI_3 11 -#define ARM_IRQ_SEC_SGI_4 12 -#define ARM_IRQ_SEC_SGI_5 13 -#define ARM_IRQ_SEC_SGI_6 14 -#define ARM_IRQ_SEC_SGI_7 15 +#define ARM_IRQ_SEC_SGI_0 8 +#define ARM_IRQ_SEC_SGI_1 9 +#define ARM_IRQ_SEC_SGI_2 10 +#define ARM_IRQ_SEC_SGI_3 11 +#define ARM_IRQ_SEC_SGI_4 12 +#define ARM_IRQ_SEC_SGI_5 13 +#define ARM_IRQ_SEC_SGI_6 14 +#define ARM_IRQ_SEC_SGI_7 15 /* * Define a list of Group 1 Secure and Group 0 interrupt properties as per GICv3 @@ -424,12 +380,14 @@ * terminology. On a GICv2 system or mode, the lists will be merged and treated * as Group 0 interrupts. */ -#define PLAT_ARM_G1S_IRQ_PROPS(grp) \ - ARM_G1S_IRQ_PROPS(grp), \ - INTR_PROP_DESC(CORSTONE1000_IRQ_TZ_WDOG, GIC_HIGHEST_SEC_PRIORITY, \ - (grp), GIC_INTR_CFG_LEVEL), \ - INTR_PROP_DESC(CORSTONE1000_IRQ_SEC_SYS_TIMER, \ - GIC_HIGHEST_SEC_PRIORITY, (grp), GIC_INTR_CFG_LEVEL) +#define PLAT_ARM_G1S_IRQ_PROPS(grp) \ + ARM_G1S_IRQ_PROPS(grp), \ + INTR_PROP_DESC(CORSTONE1000_IRQ_TZ_WDOG, \ + GIC_HIGHEST_SEC_PRIORITY, \ + (grp), GIC_INTR_CFG_LEVEL), \ + INTR_PROP_DESC(CORSTONE1000_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)