diff options
author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2022-05-18 22:10:31 +0200 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-05-18 22:10:31 +0200 |
commit | fd36b00f8ab313ddd401972281e900cd37c8db5e (patch) | |
tree | 75aa01a47ada0fa9b76115cc630773f90c3bd210 | |
parent | 0482fdf8ca25a3d61999dafc0e0a7d71bc5cdfeb (diff) | |
parent | 944e7ea94f2594e2b128c671cf7415265302596b (diff) | |
download | trusted-firmware-a-fd36b00f8ab313ddd401972281e900cd37c8db5e.tar.gz |
Merge changes from topic "xlnx_zynqmp_misra_fix" into integration
* changes:
fix(zynqmp): resolve misra 8.3 warnings
fix(zynqmp): resolve misra R8.4 warnings
-rw-r--r-- | plat/xilinx/common/include/ipi.h | 2 | ||||
-rw-r--r-- | plat/xilinx/common/include/plat_startup.h | 4 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 11 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/plat_psci.c | 8 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_api_sys.h | 16 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/sip_svc_setup.c | 2 |
6 files changed, 23 insertions, 20 deletions
diff --git a/plat/xilinx/common/include/ipi.h b/plat/xilinx/common/include/ipi.h index 483902e0ea..ac76bf06cb 100644 --- a/plat/xilinx/common/include/ipi.h +++ b/plat/xilinx/common/include/ipi.h @@ -47,7 +47,7 @@ struct ipi_config { ********************************************************************/ /* Initialize IPI configuration table */ -void ipi_config_table_init(const struct ipi_config *ipi_table, +void ipi_config_table_init(const struct ipi_config *ipi_config_table, uint32_t total_ipi); /* Validate IPI mailbox access */ diff --git a/plat/xilinx/common/include/plat_startup.h b/plat/xilinx/common/include/plat_startup.h index 66e7933733..6799e2181e 100644 --- a/plat/xilinx/common/include/plat_startup.h +++ b/plat/xilinx/common/include/plat_startup.h @@ -15,8 +15,8 @@ enum fsbl_handoff { FSBL_HANDOFF_TOO_MANY_PARTS }; -enum fsbl_handoff fsbl_atf_handover(entry_point_info_t *bl32_image_ep_info, - entry_point_info_t *bl33_image_ep_info, +enum fsbl_handoff fsbl_atf_handover(entry_point_info_t *bl32, + entry_point_info_t *bl33, uint64_t atf_handoff_addr); #endif /* PLAT_STARTUP_H */ diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 5ad33cc429..6ded2e20bb 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -33,15 +33,18 @@ static entry_point_info_t bl33_image_ep_info; * while BL32 corresponds to the secure image type. A NULL pointer is returned * if the image does not exist. */ -entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) +struct entry_point_info *bl31_plat_get_next_image_ep_info(uint32_t type) { - assert(sec_state_is_valid(type)); + entry_point_info_t *next_image_info; + assert(sec_state_is_valid(type)); if (type == NON_SECURE) { - return &bl33_image_ep_info; + next_image_info = &bl33_image_ep_info; + } else { + next_image_info = &bl32_image_ep_info; } - return &bl32_image_ep_info; + return next_image_info; } /* diff --git a/plat/xilinx/zynqmp/plat_psci.c b/plat/xilinx/zynqmp/plat_psci.c index 881dfe643c..f337cf502f 100644 --- a/plat/xilinx/zynqmp/plat_psci.c +++ b/plat/xilinx/zynqmp/plat_psci.c @@ -19,9 +19,9 @@ #include "pm_api_sys.h" #include "pm_client.h" -uintptr_t zynqmp_sec_entry; +static uintptr_t zynqmp_sec_entry; -void zynqmp_cpu_standby(plat_local_state_t cpu_state) +static void zynqmp_cpu_standby(plat_local_state_t cpu_state) { VERBOSE("%s: cpu_state: 0x%x\n", __func__, cpu_state); @@ -171,7 +171,7 @@ static void __dead2 zynqmp_system_reset(void) } } -int zynqmp_validate_power_state(unsigned int power_state, +static int zynqmp_validate_power_state(unsigned int power_state, psci_power_state_t *req_state) { VERBOSE("%s: power_state: 0x%x\n", __func__, power_state); @@ -194,7 +194,7 @@ int zynqmp_validate_power_state(unsigned int power_state, return PSCI_E_SUCCESS; } -void zynqmp_get_sys_suspend_power_state(psci_power_state_t *req_state) +static void zynqmp_get_sys_suspend_power_state(psci_power_state_t *req_state) { req_state->pwr_domain_state[PSCI_CPU_PWR_LVL] = PLAT_MAX_OFF_STATE; req_state->pwr_domain_state[1] = PLAT_MAX_OFF_STATE; diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h index 48b38777aa..84b239c671 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h @@ -68,7 +68,7 @@ enum pm_register_access_id { /********************************************************** * System-level API function declarations **********************************************************/ -enum pm_ret_status pm_req_suspend(enum pm_node_id nid, +enum pm_ret_status pm_req_suspend(enum pm_node_id target, enum pm_request_ack ack, unsigned int latency, unsigned int state); @@ -78,12 +78,12 @@ enum pm_ret_status pm_self_suspend(enum pm_node_id nid, unsigned int state, uintptr_t address); -enum pm_ret_status pm_force_powerdown(enum pm_node_id nid, +enum pm_ret_status pm_force_powerdown(enum pm_node_id target, enum pm_request_ack ack); enum pm_ret_status pm_abort_suspend(enum pm_abort_reason reason); -enum pm_ret_status pm_req_wakeup(enum pm_node_id nid, +enum pm_ret_status pm_req_wakeup(enum pm_node_id target, unsigned int set_address, uintptr_t address, enum pm_request_ack ack); @@ -112,7 +112,7 @@ enum pm_ret_status pm_set_requirement(enum pm_node_id nid, /* Miscellaneous API functions */ enum pm_ret_status pm_get_api_version(unsigned int *version); -enum pm_ret_status pm_get_node_status(enum pm_node_id node, +enum pm_ret_status pm_get_node_status(enum pm_node_id nid, uint32_t *ret_buff); enum pm_ret_status pm_acknowledge_cb(enum pm_node_id nid, enum pm_ret_status status, @@ -133,8 +133,8 @@ enum pm_ret_status pm_fpga_load(uint32_t address_low, enum pm_ret_status pm_fpga_get_status(unsigned int *value); enum pm_ret_status pm_get_chipid(uint32_t *value); -enum pm_ret_status pm_secure_rsaaes(uint32_t address_high, - uint32_t address_low, +enum pm_ret_status pm_secure_rsaaes(uint32_t address_low, + uint32_t address_high, uint32_t size, uint32_t flags); unsigned int pm_get_shutdown_scope(void); @@ -157,9 +157,9 @@ enum pm_ret_status pm_clock_setrate(unsigned int clock_id, enum pm_ret_status pm_clock_getrate(unsigned int clock_id, uint64_t *rate); enum pm_ret_status pm_clock_setparent(unsigned int clock_id, - unsigned int parent_id); + unsigned int parent_index); enum pm_ret_status pm_clock_getparent(unsigned int clock_id, - unsigned int *parent_id); + unsigned int *parent_index); void pm_query_data(enum pm_query_id qid, unsigned int arg1, unsigned int arg2, unsigned int arg3, unsigned int *data); enum pm_ret_status pm_sha_hash(uint32_t address_high, diff --git a/plat/xilinx/zynqmp/sip_svc_setup.c b/plat/xilinx/zynqmp/sip_svc_setup.c index 4a6095c608..4ce9b8a5dd 100644 --- a/plat/xilinx/zynqmp/sip_svc_setup.c +++ b/plat/xilinx/zynqmp/sip_svc_setup.c @@ -53,7 +53,7 @@ static int32_t sip_svc_setup(void) * Handler for all SiP SMC calls. Handles standard SIP requests * and calls PM SMC handler if the call is for a PM-API function. */ -uintptr_t sip_svc_smc_handler(uint32_t smc_fid, +static uintptr_t sip_svc_smc_handler(uint32_t smc_fid, u_register_t x1, u_register_t x2, u_register_t x3, |