diff options
author | Olivier Deprez <olivier.deprez@arm.com> | 2020-09-25 07:08:36 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-09-25 07:08:36 +0000 |
commit | 6b745042eaab45aa8ab7949bd5c7fdc5d5d9371f (patch) | |
tree | b21502de7c81fe5a377344d5f34a2d798cb74be6 | |
parent | b21ecb4ef05f692506d97abfcdea94a41e3921ae (diff) | |
parent | 16796a25fefc4ecf780211bf554d3b8dc5436fa4 (diff) | |
download | trusted-firmware-a-6b745042eaab45aa8ab7949bd5c7fdc5d5d9371f.tar.gz |
Merge changes from topic "tc0_architecture_change" into integration
* changes:
plat: tc0: enable TZC
fdts: tc0: update MHUv2 interrupt number
-rw-r--r-- | fdts/tc0.dts | 2 | ||||
-rw-r--r-- | plat/arm/board/tc0/include/platform_def.h | 17 | ||||
-rw-r--r-- | plat/arm/board/tc0/platform.mk | 4 | ||||
-rw-r--r-- | plat/arm/board/tc0/tc0_security.c | 13 |
4 files changed, 32 insertions, 4 deletions
diff --git a/fdts/tc0.dts b/fdts/tc0.dts index ac097cdde3..15c14cabd2 100644 --- a/fdts/tc0.dts +++ b/fdts/tc0.dts @@ -134,7 +134,7 @@ clocks = <&soc_refclk100mhz>; clock-names = "apb_pclk"; #mbox-cells = <1>; - interrupts = <0 316 4>; + interrupts = <0 317 4>; interrupt-names = "mhu_rx"; mhu-protocol = "doorbell"; }; diff --git a/plat/arm/board/tc0/include/platform_def.h b/plat/arm/board/tc0/include/platform_def.h index a8d471ee33..075c4037b9 100644 --- a/plat/arm/board/tc0/include/platform_def.h +++ b/plat/arm/board/tc0/include/platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -191,4 +191,19 @@ */ #define PLAT_CSS_MAX_SCP_BL2U_SIZE 0x20000 +/* TZC Related Constants */ +#define PLAT_ARM_TZC_BASE UL(0x25000000) +#define PLAT_ARM_TZC_FILTERS TZC_400_REGION_ATTR_FILTER_BIT(0) + +#define TZC400_OFFSET UL(0x1000000) +#define TZC400_COUNT 4 + +#define TZC400_BASE(n) (PLAT_ARM_TZC_BASE + \ + (n * TZC400_OFFSET)) + +#define TZC_NSAID_DEFAULT U(0) + +#define PLAT_ARM_TZC_NS_DEV_ACCESS \ + (TZC_REGION_ACCESS_RDWR(TZC_NSAID_DEFAULT)) + #endif /* PLATFORM_DEF_H */ diff --git a/plat/arm/board/tc0/platform.mk b/plat/arm/board/tc0/platform.mk index 903fabfb05..05d691ee23 100644 --- a/plat/arm/board/tc0/platform.mk +++ b/plat/arm/board/tc0/platform.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2020, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2020, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -61,6 +61,8 @@ BL2_SOURCES += ${TC0_BASE}/tc0_security.c \ ${TC0_BASE}/tc0_err.c \ ${TC0_BASE}/tc0_trusted_boot.c \ lib/utils/mem_region.c \ + drivers/arm/tzc/tzc400.c \ + plat/arm/common/arm_tzc400.c \ plat/arm/common/arm_nor_psci_mem_protect.c BL31_SOURCES += ${INTERCONNECT_SOURCES} \ diff --git a/plat/arm/board/tc0/tc0_security.c b/plat/arm/board/tc0/tc0_security.c index 6aa38c822c..5f1cb1159b 100644 --- a/plat/arm/board/tc0/tc0_security.c +++ b/plat/arm/board/tc0/tc0_security.c @@ -1,12 +1,23 @@ /* - * Copyright (c) 2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ +#include <plat/arm/common/plat_arm.h> #include <platform_def.h> +static const arm_tzc_regions_info_t tzc_regions[] = { + ARM_TZC_REGIONS_DEF, + {} +}; + /* Initialize the secure environment */ void plat_arm_security_setup(void) { + unsigned int i; + + for (i = 0U; i < TZC400_COUNT; i++) { + arm_tzc400_setup(TZC400_BASE(i), tzc_regions); + } } |