From 944e7ea94f2594e2b128c671cf7415265302596b Mon Sep 17 00:00:00 2001 From: Venkatesh Yadav Abbarapu Date: Mon, 16 May 2022 17:44:33 +0530 Subject: [PATCH] fix(zynqmp): resolve misra 8.3 warnings MISRA Violation: MISRA-C:2012 R.8.3 - Declaration uses a different parameter name than the one present in the definition. Signed-off-by: Venkatesh Yadav Abbarapu Change-Id: Id0521afd7383df13870710b7dd2894e788896e5e --- plat/xilinx/common/include/ipi.h | 2 +- plat/xilinx/common/include/plat_startup.h | 4 ++-- plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 11 +++++++---- plat/xilinx/zynqmp/pm_service/pm_api_sys.h | 16 ++++++++-------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/plat/xilinx/common/include/ipi.h b/plat/xilinx/common/include/ipi.h index 483902e0e..ac76bf06c 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 66e793373..6799e2181 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 5ad33cc42..6ded2e20b 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/pm_service/pm_api_sys.h b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h index 48b38777a..84b239c67 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,