diff options
author | Roberto Vargas <roberto.vargas@arm.com> | 2018-02-12 12:36:17 +0000 |
---|---|---|
committer | Roberto Vargas <roberto.vargas@arm.com> | 2018-02-28 17:19:55 +0000 |
commit | 1af540ef2a09797c3a22c40c340facd4b2f47c2f (patch) | |
tree | a36750064472fc321e69f8b1b497158277776187 /plat/arm | |
parent | dc6aad2e133829ee4c7bb9d2ba87c43f668f2acb (diff) |
Fix MISRA rule 8.4 Part 1
Rule 8.4: A compatible declaration shall be visible when
an object or function with external linkage is defined
Fixed for:
make DEBUG=1 PLAT=fvp LOG_LEVEL=50 all
Change-Id: I7c2ad3f5c015411c202605851240d5347e4cc8c7
Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>
Diffstat (limited to 'plat/arm')
-rw-r--r-- | plat/arm/board/fvp/fvp_bl1_setup.c | 3 | ||||
-rw-r--r-- | plat/arm/board/fvp/fvp_bl2u_setup.c | 3 | ||||
-rw-r--r-- | plat/arm/board/fvp/fvp_common.c | 3 | ||||
-rw-r--r-- | plat/arm/board/fvp/fvp_err.c | 3 | ||||
-rw-r--r-- | plat/arm/board/fvp/fvp_pm.c | 17 | ||||
-rw-r--r-- | plat/arm/board/fvp/fvp_topology.c | 5 | ||||
-rw-r--r-- | plat/arm/board/fvp/fvp_trusted_boot.c | 3 | ||||
-rw-r--r-- | plat/arm/common/arm_bl1_setup.c | 2 | ||||
-rw-r--r-- | plat/arm/common/arm_bl2u_setup.c | 3 | ||||
-rw-r--r-- | plat/arm/common/arm_common.c | 3 | ||||
-rw-r--r-- | plat/arm/common/arm_gicv3.c | 8 | ||||
-rw-r--r-- | plat/arm/common/arm_io_storage.c | 2 | ||||
-rw-r--r-- | plat/arm/common/arm_nor_psci_mem_protect.c | 4 | ||||
-rw-r--r-- | plat/arm/common/arm_tzc400.c | 3 |
14 files changed, 39 insertions, 23 deletions
diff --git a/plat/arm/board/fvp/fvp_bl1_setup.c b/plat/arm/board/fvp/fvp_bl1_setup.c index c539a285..d50c20a1 100644 --- a/plat/arm/board/fvp/fvp_bl1_setup.c +++ b/plat/arm/board/fvp/fvp_bl1_setup.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ #include <plat_arm.h> +#include <platform.h> #include <tbbr_img_def.h> #include "fvp_private.h" diff --git a/plat/arm/board/fvp/fvp_bl2u_setup.c b/plat/arm/board/fvp/fvp_bl2u_setup.c index 283829a7..361e84de 100644 --- a/plat/arm/board/fvp/fvp_bl2u_setup.c +++ b/plat/arm/board/fvp/fvp_bl2u_setup.c @@ -1,10 +1,11 @@ /* - * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ #include <plat_arm.h> +#include <platform.h> #include "fvp_def.h" #include "fvp_private.h" diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c index 600af612..2df11d65 100644 --- a/plat/arm/board/fvp/fvp_common.c +++ b/plat/arm/board/fvp/fvp_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -18,6 +18,7 @@ #include <secure_partition.h> #include <v2m_def.h> #include "../fvp_def.h" +#include "fvp_private.h" /* Defines for GIC Driver build time selection */ #define FVP_GICV2 1 diff --git a/plat/arm/board/fvp/fvp_err.c b/plat/arm/board/fvp/fvp_err.c index 8d495950..d9ad5175 100644 --- a/plat/arm/board/fvp/fvp_err.c +++ b/plat/arm/board/fvp/fvp_err.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,6 +9,7 @@ #include <debug.h> #include <errno.h> #include <norflash.h> +#include <platform.h> #include <stdint.h> /* diff --git a/plat/arm/board/fvp/fvp_pm.c b/plat/arm/board/fvp/fvp_pm.c index 1454587b..f61cdb3c 100644 --- a/plat/arm/board/fvp/fvp_pm.c +++ b/plat/arm/board/fvp/fvp_pm.c @@ -16,6 +16,7 @@ #include <psci.h> #include <spe.h> #include <v2m_def.h> +#include "../../../../drivers/arm/gic/v3/gicv3_private.h" #include "drivers/pwrc/fvp_pwrc.h" #include "fvp_def.h" #include "fvp_private.h" @@ -123,7 +124,7 @@ static void fvp_power_domain_on_finish_common(const psci_power_state_t *target_s /******************************************************************************* * FVP handler called when a CPU is about to enter standby. ******************************************************************************/ -void fvp_cpu_standby(plat_local_state_t cpu_state) +static void fvp_cpu_standby(plat_local_state_t cpu_state) { assert(cpu_state == ARM_LOCAL_STATE_RET); @@ -140,7 +141,7 @@ void fvp_cpu_standby(plat_local_state_t cpu_state) * FVP handler called when a power domain is about to be turned on. The * mpidr determines the CPU to be turned on. ******************************************************************************/ -int fvp_pwr_domain_on(u_register_t mpidr) +static int fvp_pwr_domain_on(u_register_t mpidr) { int rc = PSCI_E_SUCCESS; unsigned int psysr; @@ -162,7 +163,7 @@ int fvp_pwr_domain_on(u_register_t mpidr) * FVP handler called when a power domain is about to be turned off. The * target_state encodes the power state that each level should transition to. ******************************************************************************/ -void fvp_pwr_domain_off(const psci_power_state_t *target_state) +static void fvp_pwr_domain_off(const psci_power_state_t *target_state) { assert(target_state->pwr_domain_state[ARM_PWR_LVL0] == ARM_LOCAL_STATE_OFF); @@ -192,7 +193,7 @@ void fvp_pwr_domain_off(const psci_power_state_t *target_state) * FVP handler called when a power domain is about to be suspended. The * target_state encodes the power state that each level should transition to. ******************************************************************************/ -void fvp_pwr_domain_suspend(const psci_power_state_t *target_state) +static void fvp_pwr_domain_suspend(const psci_power_state_t *target_state) { unsigned long mpidr; @@ -241,7 +242,7 @@ void fvp_pwr_domain_suspend(const psci_power_state_t *target_state) * being turned off earlier. The target_state encodes the low power state that * each level has woken up from. ******************************************************************************/ -void fvp_pwr_domain_on_finish(const psci_power_state_t *target_state) +static void fvp_pwr_domain_on_finish(const psci_power_state_t *target_state) { fvp_power_domain_on_finish_common(target_state); @@ -259,7 +260,7 @@ void fvp_pwr_domain_on_finish(const psci_power_state_t *target_state) * TODO: At the moment we reuse the on finisher and reinitialize the secure * context. Need to implement a separate suspend finisher. ******************************************************************************/ -void fvp_pwr_domain_suspend_finish(const psci_power_state_t *target_state) +static void fvp_pwr_domain_suspend_finish(const psci_power_state_t *target_state) { /* * Nothing to be done on waking up from retention from CPU level. @@ -341,13 +342,15 @@ static int fvp_node_hw_state(u_register_t target_cpu, * layer. The `fake` SYSTEM_SUSPEND allows us to validate some of the driver * save and restore sequences on FVP. */ -void fvp_get_sys_suspend_power_state(psci_power_state_t *req_state) +#if !ARM_BL31_IN_DRAM +static void fvp_get_sys_suspend_power_state(psci_power_state_t *req_state) { unsigned int i; for (i = ARM_PWR_LVL0; i <= PLAT_MAX_PWR_LVL; i++) req_state->pwr_domain_state[i] = ARM_LOCAL_STATE_OFF; } +#endif /******************************************************************************* * Handler to filter PSCI requests. diff --git a/plat/arm/board/fvp/fvp_topology.c b/plat/arm/board/fvp/fvp_topology.c index 4a007f4f..a1e3f7f4 100644 --- a/plat/arm/board/fvp/fvp_topology.c +++ b/plat/arm/board/fvp/fvp_topology.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,11 +8,12 @@ #include <arm_config.h> #include <cassert.h> #include <plat_arm.h> +#include <platform.h> #include <platform_def.h> #include "drivers/pwrc/fvp_pwrc.h" /* The FVP power domain tree descriptor */ -unsigned char fvp_power_domain_tree_desc[FVP_CLUSTER_COUNT + 2]; +static unsigned char fvp_power_domain_tree_desc[FVP_CLUSTER_COUNT + 2]; CASSERT(FVP_CLUSTER_COUNT && FVP_CLUSTER_COUNT <= 256, assert_invalid_fvp_cluster_count); diff --git a/plat/arm/board/fvp/fvp_trusted_boot.c b/plat/arm/board/fvp/fvp_trusted_boot.c index d1e8b9f5..39be4a6e 100644 --- a/plat/arm/board/fvp/fvp_trusted_boot.c +++ b/plat/arm/board/fvp/fvp_trusted_boot.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 */ @@ -7,6 +7,7 @@ #include <assert.h> #include <stdint.h> #include <string.h> +#include <platform.h> #include <tbbr_oid.h> #include "fvp_def.h" diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index 0b9c9eef..3a30eca6 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -7,9 +7,11 @@ #include <arch.h> #include <arm_def.h> #include <arm_xlat_tables.h> +#include <bl1.h> #include <bl_common.h> #include <console.h> #include <plat_arm.h> +#include <platform.h> #include <platform_def.h> #include <sp805.h> #include <utils.h> diff --git a/plat/arm/common/arm_bl2u_setup.c b/plat/arm/common/arm_bl2u_setup.c index 03d908b1..cc291fc9 100644 --- a/plat/arm/common/arm_bl2u_setup.c +++ b/plat/arm/common/arm_bl2u_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -10,6 +10,7 @@ #include <console.h> #include <plat_arm.h> #include <platform_def.h> +#include <platform.h> #include <string.h> /* Weak definitions may be overridden in specific ARM standard platform */ diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c index bf639737..3f0ea01a 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -11,6 +11,7 @@ #include <mmio.h> #include <plat_arm.h> #include <platform_def.h> +#include <platform.h> #include <secure_partition.h> extern const mmap_region_t plat_arm_mmap[]; diff --git a/plat/arm/common/arm_gicv3.c b/plat/arm/common/arm_gicv3.c index e273b774..b8ffd6bc 100644 --- a/plat/arm/common/arm_gicv3.c +++ b/plat/arm/common/arm_gicv3.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -35,8 +35,8 @@ static const interrupt_prop_t arm_interrupt_props[] = { * We save and restore the GICv3 context on system suspend. Allocate the * data in the designated EL3 Secure carve-out memory */ -gicv3_redist_ctx_t rdist_ctx __section("arm_el3_tzc_dram"); -gicv3_dist_ctx_t dist_ctx __section("arm_el3_tzc_dram"); +static gicv3_redist_ctx_t rdist_ctx __section("arm_el3_tzc_dram"); +static gicv3_dist_ctx_t dist_ctx __section("arm_el3_tzc_dram"); /* * MPIDR hashing function for translating MPIDRs read from GICR_TYPER register @@ -58,7 +58,7 @@ static unsigned int arm_gicv3_mpidr_hash(u_register_t mpidr) return plat_arm_calc_core_pos(mpidr); } -const gicv3_driver_data_t arm_gic_data = { +static const gicv3_driver_data_t arm_gic_data __unused = { .gicd_base = PLAT_ARM_GICD_BASE, .gicr_base = PLAT_ARM_GICR_BASE, .interrupt_props = arm_interrupt_props, diff --git a/plat/arm/common/arm_io_storage.c b/plat/arm/common/arm_io_storage.c index 5cabc546..652f5e95 100644 --- a/plat/arm/common/arm_io_storage.c +++ b/plat/arm/common/arm_io_storage.c @@ -10,6 +10,8 @@ #include <io_fip.h> #include <io_memmap.h> #include <io_storage.h> +#include <plat_arm.h> +#include <platform.h> #include <platform_def.h> #include <string.h> #include <utils.h> diff --git a/plat/arm/common/arm_nor_psci_mem_protect.c b/plat/arm/common/arm_nor_psci_mem_protect.c index c5263fd8..3167a42a 100644 --- a/plat/arm/common/arm_nor_psci_mem_protect.c +++ b/plat/arm/common/arm_nor_psci_mem_protect.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,7 +12,7 @@ #include <psci.h> #include <utils.h> -mem_region_t arm_ram_ranges[] = { +static mem_region_t arm_ram_ranges[] = { {ARM_NS_DRAM1_BASE, ARM_NS_DRAM1_SIZE}, #ifdef AARCH64 {ARM_DRAM2_BASE, ARM_DRAM2_SIZE}, diff --git a/plat/arm/common/arm_tzc400.c b/plat/arm/common/arm_tzc400.c index cf133268..6b706be9 100644 --- a/plat/arm/common/arm_tzc400.c +++ b/plat/arm/common/arm_tzc400.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 */ @@ -7,6 +7,7 @@ #include <arm_def.h> #include <arm_spm_def.h> #include <debug.h> +#include <plat_arm.h> #include <platform_def.h> #include <tzc400.h> |