diff options
| author | Nishant Sharma <nishant.sharma@arm.com> | 2023-10-12 10:37:54 +0100 |
|---|---|---|
| committer | Nishant Sharma <nishant.sharma@arm.com> | 2023-10-12 10:37:54 +0100 |
| commit | 5df1dccd0be06cc45e82a57dc01be5b6b5d1a21b (patch) | |
| tree | 525c3a414f70f5dbca15788cd66c57a0ab3566d7 | |
| parent | 801cd3c84a7bb8a66c5a40de25e611ec6448239c (diff) | |
feat(arm): reuse SPM_MM specific defines for SPMC_AT_EL3
For EL3 SPMC configuration enabled platforms, allow the reuse of
SPM_MM specific definitions.
Signed-off-by: Sayanta Pattanayak <sayanta.pattanayak@arm.com>
Signed-off-by: Nishant Sharma <nishant.sharma@arm.com>
Change-Id: Ia24b97343c7b8c6b22a4d54c5bb9cee2c480241f
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 2 | ||||
| -rw-r--r-- | plat/arm/css/sgi/include/sgi_base_platform_def.h | 8 | ||||
| -rw-r--r-- | plat/arm/css/sgi/sgi_plat_v2.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 2fdbfb7d0..f71480f75 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -53,7 +53,7 @@ typedef struct arm_tzc_regions_info { PLAT_ARM_TZC_NS_DEV_ACCESS} #endif -#if SPM_MM +#if SPM_MM || (SPMC_AT_EL3 && SPMC_AT_EL3_SEL0_SP) #define ARM_TZC_REGIONS_DEF \ {ARM_AP_TZC_DRAM1_BASE, ARM_EL3_TZC_DRAM1_END + ARM_L1_GPT_SIZE,\ TZC_REGION_S_RDWR, 0}, \ diff --git a/plat/arm/css/sgi/include/sgi_base_platform_def.h b/plat/arm/css/sgi/include/sgi_base_platform_def.h index b9c785f81..8a13bf33e 100644 --- a/plat/arm/css/sgi/include/sgi_base_platform_def.h +++ b/plat/arm/css/sgi/include/sgi_base_platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2022, Arm Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2023, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -33,7 +33,7 @@ * chips are accessed - secure ram, css device and soc device regions. */ #if defined(IMAGE_BL31) -# if SPM_MM +# if SPM_MM || (SPMC_AT_EL3 && SPMC_AT_EL3_SEL0_SP) # define PLAT_ARM_MMAP_ENTRIES (9 + ((CSS_SGI_CHIP_COUNT - 1) * 3)) # define MAX_XLAT_TABLES (7 + ((CSS_SGI_CHIP_COUNT - 1) * 3)) # define PLAT_SP_IMAGE_MMAP_REGIONS 10 @@ -210,7 +210,7 @@ #define PLAT_SP_PRI 0x10 #endif -#if SPM_MM && RAS_FFH_SUPPORT +#if (SPM_MM || (SPMC_AT_EL3 && SPMC_AT_EL3_SEL0_SP)) && RAS_FFH_SUPPORT /* * CPER buffer memory of 128KB is reserved and it is placed adjacent to the * memory shared between EL3 and S-EL0. @@ -232,7 +232,7 @@ #define PLAT_ARM_SP_IMAGE_STACK_BASE (PLAT_SP_IMAGE_NS_BUF_BASE + \ PLAT_SP_IMAGE_NS_BUF_SIZE + \ CSS_SGI_SP_CPER_BUF_SIZE) -#elif SPM_MM +#elif (SPM_MM || (SPMC_AT_EL3 && SPMC_AT_EL3_SEL0_SP)) /* * Secure partition stack follows right after the memory region that is shared * between EL3 and S-EL0. diff --git a/plat/arm/css/sgi/sgi_plat_v2.c b/plat/arm/css/sgi/sgi_plat_v2.c index 8de0efe30..85f99d44d 100644 --- a/plat/arm/css/sgi/sgi_plat_v2.c +++ b/plat/arm/css/sgi/sgi_plat_v2.c @@ -54,7 +54,7 @@ const mmap_region_t plat_arm_mmap[] = { #if ARM_BL31_IN_DRAM ARM_MAP_BL31_SEC_DRAM, #endif -#if SPM_MM +#if SPM_MM || (SPMC_AT_EL3 && SPMC_AT_EL3_SEL0_SP) ARM_SP_IMAGE_MMAP, #endif #if TRUSTED_BOARD_BOOT && !RESET_TO_BL2 @@ -73,7 +73,7 @@ const mmap_region_t plat_arm_mmap[] = { CSS_SGI_MAP_DEVICE, SOC_PLATFORM_PERIPH_MAP_DEVICE, SOC_SYSTEM_PERIPH_MAP_DEVICE, -#if SPM_MM +#if SPM_MM || (SPMC_AT_EL3 && SPMC_AT_EL3_SEL0_SP) ARM_SPM_BUF_EL3_MMAP, #endif {0} |