diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/tzc/tzc400.c | 13 | ||||
| -rw-r--r-- | drivers/arm/tzc/tzc_common_private.h | 3 | ||||
| -rw-r--r-- | drivers/io/io_fip.c | 6 |
3 files changed, 10 insertions, 12 deletions
diff --git a/drivers/arm/tzc/tzc400.c b/drivers/arm/tzc/tzc400.c index b817487c1..34462a92d 100644 --- a/drivers/arm/tzc/tzc400.c +++ b/drivers/arm/tzc/tzc400.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -205,13 +205,16 @@ void tzc400_enable_filters(void) for (filter = 0; filter < tzc400.num_filters; filter++) { state = _tzc400_get_gate_keeper(tzc400.base, filter); if (state) { - /* The TZC filter is already configured. Changing the + /* + * The TZC filter is already configured. Changing the * programmer's view in an active system can cause * unpredictable behavior therefore panic for now rather * than try to determine whether this is safe in this - * instance. See: - * http://infocenter.arm.com/help/index.jsp?\ - * topic=/com.arm.doc.ddi0504c/CJHHECBF.html */ + * instance. + * + * See the 'ARM (R) CoreLink TM TZC-400 TrustZone (R) + * Address Space Controller' Technical Reference Manual. + */ ERROR("TZC-400 : Filter %d Gatekeeper already" " enabled.\n", filter); panic(); diff --git a/drivers/arm/tzc/tzc_common_private.h b/drivers/arm/tzc/tzc_common_private.h index f092cf1ff..89156ed51 100644 --- a/drivers/arm/tzc/tzc_common_private.h +++ b/drivers/arm/tzc/tzc_common_private.h @@ -169,8 +169,6 @@ nsaid_permissions); \ } -#if ENABLE_ASSERTIONS - static inline unsigned int _tzc_read_peripheral_id(uintptr_t base) { unsigned int id; @@ -182,6 +180,7 @@ static inline unsigned int _tzc_read_peripheral_id(uintptr_t base) return id; } +#if ENABLE_ASSERTIONS #ifdef AARCH32 static inline unsigned long long _tzc_get_max_top_addr(int addr_width) { diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c index abb351180..a23940d81 100644 --- a/drivers/io/io_fip.c +++ b/drivers/io/io_fip.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -28,10 +28,6 @@ x.node[4], x.node[5] typedef struct { - /* Put file_pos above the struct to allow {0} on static init. - * It is a workaround for a known bug in GCC - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 - */ unsigned int file_pos; fip_toc_entry_t entry; } file_state_t; |