Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1356 from robertovargas-arm/misra-changes

Browse source 
Misra changes
This commit is contained in:
Dimitris Papastamos 2018-04-16 15:04:28 +01:00 • committed by GitHub
commit 8b37120065
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 97 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bl1/bl1_fwu.c
View file

@ -24,12 +24,12 @@
* Function declarations. * Function declarations.
*/ */
static int bl1_fwu_image_copy(unsigned int image_id, static int bl1_fwu_image_copy(unsigned int image_id,
uintptr_t image_addr, uintptr_t image_src,
unsigned int block_size, unsigned int block_size,
unsigned int image_size, unsigned int image_size,
unsigned int flags); unsigned int flags);
static int bl1_fwu_image_auth(unsigned int image_id, static int bl1_fwu_image_auth(unsigned int image_id,
uintptr_t image_addr, uintptr_t image_src,
unsigned int image_size, unsigned int image_size,
unsigned int flags); unsigned int flags);
static int bl1_fwu_image_execute(unsigned int image_id, static int bl1_fwu_image_execute(unsigned int image_id,
@ -50,7 +50,7 @@ __dead2 static void bl1_fwu_done(void *client_cookie, void *reserved);
static unsigned int sec_exec_image_id = INVALID_IMAGE_ID; static unsigned int sec_exec_image_id = INVALID_IMAGE_ID;
/* Authentication status of each image. */ /* Authentication status of each image. */
extern unsigned int auth_img_flags[]; extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
/******************************************************************************* /*******************************************************************************
* Top level handler for servicing FWU SMCs. * Top level handler for servicing FWU SMCs.

3
bl1/tbbr/tbbr_img_desc.c
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,6 +7,7 @@
#include <bl1.h> #include <bl1.h>
#include <bl_common.h> #include <bl_common.h>
#include <platform_def.h> #include <platform_def.h>
#include <tbbr/tbbr_img_desc.h>
image_desc_t bl1_tbbr_image_descs[] = { image_desc_t bl1_tbbr_image_descs[] = {
{ {

4
bl2/bl2_image_load.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -182,7 +182,7 @@ static int load_bl33(bl31_params_t *bl2_to_bl31_params)
* This function loads SCP_BL2/BL3x images and returns the ep_info for * This function loads SCP_BL2/BL3x images and returns the ep_info for
* the next executable image. * the next executable image.
******************************************************************************/ ******************************************************************************/
entry_point_info_t *bl2_load_images(void) struct entry_point_info *bl2_load_images(void)
{ {
bl31_params_t *bl2_to_bl31_params; bl31_params_t *bl2_to_bl31_params;
entry_point_info_t *bl31_ep_info; entry_point_info_t *bl31_ep_info;

2
bl2/bl2_image_load_v2.c
View file

@ -21,7 +21,7 @@
* This function loads SCP_BL2/BL3x images and returns the ep_info for * This function loads SCP_BL2/BL3x images and returns the ep_info for
* the next executable image. * the next executable image.
******************************************************************************/ ******************************************************************************/
entry_point_info_t *bl2_load_images(void) struct entry_point_info *bl2_load_images(void)
{ {
bl_params_t *bl2_to_next_bl_params; bl_params_t *bl2_to_next_bl_params;
bl_load_info_t *bl2_load_info; bl_load_info_t *bl2_load_info;

44
bl32/tsp/tsp_private.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -62,7 +62,7 @@ CASSERT(TSP_ARGS_SIZE == sizeof(tsp_args_t), assert_sp_args_size_mismatch);
void tsp_get_magic(uint64_t args[4]); void tsp_get_magic(uint64_t args[4]);
tsp_args_t *tsp_cpu_resume_main(uint64_t arg0, tsp_args_t *tsp_cpu_resume_main(uint64_t max_off_pwrlvl,
uint64_t arg1, uint64_t arg1,
uint64_t arg2, uint64_t arg2,
uint64_t arg3, uint64_t arg3,
@ -106,7 +106,47 @@ extern work_statistics_t tsp_stats[PLATFORM_CORE_COUNT];
/* Vector table of jumps */ /* Vector table of jumps */
extern tsp_vectors_t tsp_vector_table; extern tsp_vectors_t tsp_vector_table;
/* functions */
int32_t tsp_common_int_handler(void);
int32_t tsp_handle_preemption(void);
tsp_args_t *tsp_abort_smc_handler(uint64_t func,
uint64_t arg1,
uint64_t arg2,
uint64_t arg3,
uint64_t arg4,
uint64_t arg5,
uint64_t arg6,
uint64_t arg7);
tsp_args_t *tsp_smc_handler(uint64_t func,
uint64_t arg1,
uint64_t arg2,
uint64_t arg3,
uint64_t arg4,
uint64_t arg5,
uint64_t arg6,
uint64_t arg7);
tsp_args_t *tsp_system_reset_main(uint64_t arg0,
uint64_t arg1,
uint64_t arg2,
uint64_t arg3,
uint64_t arg4,
uint64_t arg5,
uint64_t arg6,
uint64_t arg7);
tsp_args_t *tsp_system_off_main(uint64_t arg0,
uint64_t arg1,
uint64_t arg2,
uint64_t arg3,
uint64_t arg4,
uint64_t arg5,
uint64_t arg6,
uint64_t arg7);
uint64_t tsp_main(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __TSP_PRIVATE_H__ */ #endif /* __TSP_PRIVATE_H__ */

4
drivers/auth/auth_mod.c
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -30,7 +30,7 @@
/* Pointer to CoT */ /* Pointer to CoT */
extern const auth_img_desc_t *const cot_desc_ptr; extern const auth_img_desc_t *const cot_desc_ptr;
extern unsigned int auth_img_flags[]; extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
static int cmp_auth_param_type_desc(const auth_param_type_desc_t *a, static int cmp_auth_param_type_desc(const auth_param_type_desc_t *a,
const auth_param_type_desc_t *b) const auth_param_type_desc_t *b)

3
drivers/auth/crypto_mod.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -9,7 +9,6 @@
#include <debug.h> #include <debug.h>
/* Variable exported by the crypto library through REGISTER_CRYPTO_LIB() */ /* Variable exported by the crypto library through REGISTER_CRYPTO_LIB() */
extern const crypto_lib_desc_t crypto_lib_desc;
/* /*
* The crypto module is responsible for verifying digital signatures and hashes. * The crypto module is responsible for verifying digital signatures and hashes.

3
drivers/auth/mbedtls/mbedtls_common.c
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -10,6 +10,7 @@
#include <mbedtls/memory_buffer_alloc.h> #include <mbedtls/memory_buffer_alloc.h>
#include <mbedtls/platform.h> #include <mbedtls/platform.h>
#include <mbedtls_config.h> #include <mbedtls_config.h>
#include <mbedtls_common.h>
/* /*
* mbed TLS heap * mbed TLS heap

3
include/bl2/bl2.h
View file

@ -7,9 +7,6 @@
#ifndef BL2_H__ #ifndef BL2_H__
#define BL2_H__ #define BL2_H__
struct entry_point_info;
void bl2_main(void); void bl2_main(void);
struct entry_point_info *bl2_load_images(void);
#endif /* BL2_H__ */ #endif /* BL2_H__ */

3
include/common/tbbr/tbbr_img_def.h
View file

@ -75,4 +75,7 @@
/* NT_FW_CONFIG */ /* NT_FW_CONFIG */
#define NT_FW_CONFIG_ID 27 #define NT_FW_CONFIG_ID 27
/* Define size of the array */
#define MAX_NUMBER_IDS 28
#endif /* __TBBR_IMG_DEF_H__ */ #endif /* __TBBR_IMG_DEF_H__ */

8
include/drivers/auth/auth_mod.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -12,6 +12,7 @@
#include <auth_common.h> #include <auth_common.h>
#include <cot_def.h> #include <cot_def.h>
#include <img_parser_mod.h> #include <img_parser_mod.h>
#include <tbbr_img_def.h>
/* /*
* Image flags * Image flags
@ -41,7 +42,10 @@ int auth_mod_verify_img(unsigned int img_id,
#define REGISTER_COT(_cot) \ #define REGISTER_COT(_cot) \
const auth_img_desc_t *const cot_desc_ptr = \ const auth_img_desc_t *const cot_desc_ptr = \
(const auth_img_desc_t *const)&_cot[0]; \ (const auth_img_desc_t *const)&_cot[0]; \
unsigned int auth_img_flags[sizeof(_cot)/sizeof(_cot[0])] unsigned int auth_img_flags[MAX_NUMBER_IDS]
extern const auth_img_desc_t *const cot_desc_ptr;
extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
#endif /* TRUSTED_BOARD_BOOT */ #endif /* TRUSTED_BOARD_BOOT */

6
include/drivers/auth/crypto_mod.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -43,7 +43,7 @@ typedef struct crypto_lib_desc_s {
void crypto_mod_init(void); void crypto_mod_init(void);
int crypto_mod_verify_signature(void *data_ptr, unsigned int data_len, int crypto_mod_verify_signature(void *data_ptr, unsigned int data_len,
void *sig_ptr, unsigned int sig_len, void *sig_ptr, unsigned int sig_len,
void *sig_alg, unsigned int sig_alg_len, void *sig_alg_ptr, unsigned int sig_alg_len,
void *pk_ptr, unsigned int pk_len); void *pk_ptr, unsigned int pk_len);
int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len, int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len,
void *digest_info_ptr, unsigned int digest_info_len); void *digest_info_ptr, unsigned int digest_info_len);
@ -57,4 +57,6 @@ int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len,
.verify_hash = _verify_hash \ .verify_hash = _verify_hash \
} }
extern const crypto_lib_desc_t crypto_lib_desc;
#endif /* __CRYPTO_MOD_H__ */ #endif /* __CRYPTO_MOD_H__ */

6
include/drivers/auth/img_parser_mod.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -44,10 +44,10 @@ typedef struct img_parser_lib_desc_s {
/* Exported functions */ /* Exported functions */
void img_parser_init(void); void img_parser_init(void);
int img_parser_check_integrity(img_type_t img_type, int img_parser_check_integrity(img_type_t img_type,
void *img, unsigned int img_len); void *img_ptr, unsigned int img_len);
int img_parser_get_auth_param(img_type_t img_type, int img_parser_get_auth_param(img_type_t img_type,
const auth_param_type_desc_t *type_desc, const auth_param_type_desc_t *type_desc,
void *img, unsigned int img_len, void *img_ptr, unsigned int img_len,
void **param_ptr, unsigned int *param_len); void **param_ptr, unsigned int *param_len);
/* Macro to register an image parser library */ /* Macro to register an image parser library */

3
plat/arm/board/fvp/fvp_private.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -18,6 +18,7 @@ void fvp_config_setup(void);
void fvp_interconnect_init(void); void fvp_interconnect_init(void);
void fvp_interconnect_enable(void); void fvp_interconnect_enable(void);
void fvp_interconnect_disable(void); void fvp_interconnect_disable(void);
void tsp_early_platform_setup(void);
#endif /* __FVP_PRIVATE_H__ */ #endif /* __FVP_PRIVATE_H__ */

7
plat/arm/common/arm_bl1_fwu.c
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -9,6 +9,7 @@
#include <debug.h> #include <debug.h>
#include <errno.h> #include <errno.h>
#include <plat_arm.h> #include <plat_arm.h>
#include <platform.h>
#include <platform_def.h> #include <platform_def.h>
#include <tbbr_img_desc.h> #include <tbbr_img_desc.h>
#include <utils.h> #include <utils.h>
@ -19,7 +20,7 @@ typedef struct bl1_mem_info {
unsigned int mem_size; unsigned int mem_size;
} bl1_mem_info_t; } bl1_mem_info_t;
bl1_mem_info_t fwu_addr_map_secure[] = { static bl1_mem_info_t fwu_addr_map_secure[] = {
{ {
.mem_base = ARM_SHARED_RAM_BASE, .mem_base = ARM_SHARED_RAM_BASE,
.mem_size = ARM_SHARED_RAM_SIZE .mem_size = ARM_SHARED_RAM_SIZE
@ -29,7 +30,7 @@ bl1_mem_info_t fwu_addr_map_secure[] = {
} }
}; };
bl1_mem_info_t fwu_addr_map_non_secure[] = { static bl1_mem_info_t fwu_addr_map_non_secure[] = {
{ {
.mem_base = ARM_NS_DRAM1_BASE, .mem_base = ARM_NS_DRAM1_BASE,
.mem_size = ARM_NS_DRAM1_SIZE .mem_size = ARM_NS_DRAM1_SIZE

1
plat/arm/common/arm_dyn_cfg_helpers.c
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <arm_dyn_cfg_helpers.h>
#include <assert.h> #include <assert.h>
#include <desc_image_load.h> #include <desc_image_load.h>
#include <fdt_wrappers.h> #include <fdt_wrappers.h>

2
plat/arm/css/drivers/scp/css_pm_scmi.c
View file

@ -76,7 +76,7 @@ ARM_INSTANTIATE_LOCK;
* Helper function to suspend a CPU power domain and its parent power domains * Helper function to suspend a CPU power domain and its parent power domains
* if applicable. * if applicable.
*/ */
void css_scp_suspend(const psci_power_state_t *target_state) void css_scp_suspend(const struct psci_power_state *target_state)
{ {
int lvl, ret; int lvl, ret;
uint32_t scmi_pwr_state = 0; uint32_t scmi_pwr_state = 0;

4
plat/arm/css/drivers/scp/css_pm_scpi.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -19,7 +19,7 @@
/* /*
* Helper function to inform power down state to SCP. * Helper function to inform power down state to SCP.
*/ */
void css_scp_suspend(const psci_power_state_t *target_state) void css_scp_suspend(const struct psci_power_state *target_state)
{ {
uint32_t cluster_state = scpi_power_on; uint32_t cluster_state = scpi_power_on;
uint32_t system_state = scpi_power_on; uint32_t system_state = scpi_power_on;

20
services/spd/tspd/tspd_private.h
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -206,7 +206,7 @@ extern const spd_pm_ops_t tspd_pm;
/******************************************************************************* /*******************************************************************************
* Forward declarations * Forward declarations
******************************************************************************/ ******************************************************************************/
struct tsp_vectors; typedef struct tsp_vectors tsp_vectors_t;
/******************************************************************************* /*******************************************************************************
* Function & Data prototypes * Function & Data prototypes
@ -215,14 +215,26 @@ uint64_t tspd_enter_sp(uint64_t *c_rt_ctx);
void __dead2 tspd_exit_sp(uint64_t c_rt_ctx, uint64_t ret); void __dead2 tspd_exit_sp(uint64_t c_rt_ctx, uint64_t ret);
uint64_t tspd_synchronous_sp_entry(tsp_context_t *tsp_ctx); uint64_t tspd_synchronous_sp_entry(tsp_context_t *tsp_ctx);
void __dead2 tspd_synchronous_sp_exit(tsp_context_t *tsp_ctx, uint64_t ret); void __dead2 tspd_synchronous_sp_exit(tsp_context_t *tsp_ctx, uint64_t ret);
void tspd_init_tsp_ep_state(struct entry_point_info *tsp_ep, void tspd_init_tsp_ep_state(struct entry_point_info *tsp_entry_point,
uint32_t rw, uint32_t rw,
uint64_t pc, uint64_t pc,
tsp_context_t *tsp_ctx); tsp_context_t *tsp_ctx);
int tspd_abort_preempted_smc(tsp_context_t *tsp_ctx); int tspd_abort_preempted_smc(tsp_context_t *tsp_ctx);
uint64_t tspd_smc_handler(uint32_t smc_fid,
uint64_t x1,
uint64_t x2,
uint64_t x3,
uint64_t x4,
void *cookie,
void *handle,
uint64_t flags);
int32_t tspd_setup(void);
uint64_t tspd_handle_sp_preemption(void *handle);
extern tsp_context_t tspd_sp_context[TSPD_CORE_COUNT]; extern tsp_context_t tspd_sp_context[TSPD_CORE_COUNT];
extern struct tsp_vectors *tsp_vectors; extern tsp_vectors_t *tsp_vectors;
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLY__*/
#endif /* __TSPD_PRIVATE_H__ */ #endif /* __TSPD_PRIVATE_H__ */