From c96f297f8d3c83560731b86244147f5221d39475 Mon Sep 17 00:00:00 2001 From: Roberto Vargas Date: Mon, 12 Feb 2018 12:36:17 +0000 Subject: [PATCH 1/4] Fix MISRA rule 8.3 Rule 8.3: All declarations of an object or function shall use the same names and type qualifiers. Fixed for: make DEBUG=1 PLAT=juno ARCH=aarch32 AARCH32_SP=sp_min RESET_TO_SP_MIN=1 JUNO_AARCH32_EL3_RUNTIME=1 bl32 Change-Id: Ia34f5155e1cdb67161191f69e8d1248cbaa39e1a Signed-off-by: Roberto Vargas --- include/lib/utils.h | 4 ++-- lib/utils/mem_region.c | 2 +- plat/arm/css/drivers/mhu/css_mhu_doorbell.c | 4 ++-- plat/arm/css/drivers/scp/css_pm_scmi.c | 2 +- plat/arm/css/drivers/scp/css_pm_scpi.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/lib/utils.h b/include/lib/utils.h index f367a1f45..5f13e993f 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -37,10 +37,10 @@ void clear_mem_regions(mem_region_t *tbl, size_t nregions); * in a way that they minimize the number of entries used in the * translation tables. */ -void clear_map_dyn_mem_regions(mem_region_t *region, +void clear_map_dyn_mem_regions(struct mem_region *regions, size_t nregions, uintptr_t va, - size_t chunk_size); + size_t chunk); /* * checks that a region (addr + nbytes-1) of memory is totally covered by diff --git a/lib/utils/mem_region.c b/lib/utils/mem_region.c index e9541ba32..a5c3c6170 100644 --- a/lib/utils/mem_region.c +++ b/lib/utils/mem_region.c @@ -50,7 +50,7 @@ void clear_mem_regions(mem_region_t *tbl, size_t nregions) * be cleared, and chunk is the amount of memory mapped and * cleared in every iteration. */ -void clear_map_dyn_mem_regions(mem_region_t *regions, +void clear_map_dyn_mem_regions(struct mem_region *regions, size_t nregions, uintptr_t va, size_t chunk) diff --git a/plat/arm/css/drivers/mhu/css_mhu_doorbell.c b/plat/arm/css/drivers/mhu/css_mhu_doorbell.c index b9faf679b..54f3e057d 100644 --- a/plat/arm/css/drivers/mhu/css_mhu_doorbell.c +++ b/plat/arm/css/drivers/mhu/css_mhu_doorbell.c @@ -9,7 +9,7 @@ #include "css_mhu_doorbell.h" #include "../scmi/scmi.h" -void mhu_ring_doorbell(scmi_channel_plat_info_t *plat_info) +void mhu_ring_doorbell(struct scmi_channel_plat_info *plat_info) { MHU_RING_DOORBELL(plat_info->db_reg_addr, plat_info->db_modify_mask, @@ -17,7 +17,7 @@ void mhu_ring_doorbell(scmi_channel_plat_info_t *plat_info) return; } -void mhuv2_ring_doorbell(scmi_channel_plat_info_t *plat_info) +void mhuv2_ring_doorbell(struct scmi_channel_plat_info *plat_info) { /* wake receiver */ MHU_V2_ACCESS_REQUEST(MHUV2_BASE_ADDR); diff --git a/plat/arm/css/drivers/scp/css_pm_scmi.c b/plat/arm/css/drivers/scp/css_pm_scmi.c index 91ea63a44..0a5cff668 100644 --- a/plat/arm/css/drivers/scp/css_pm_scmi.c +++ b/plat/arm/css/drivers/scp/css_pm_scmi.c @@ -142,7 +142,7 @@ void css_scp_suspend(const struct psci_power_state *target_state) * Helper function to turn off a CPU power domain and its parent power domains * if applicable. */ -void css_scp_off(const psci_power_state_t *target_state) +void css_scp_off(const struct psci_power_state *target_state) { int lvl = 0, ret; uint32_t scmi_pwr_state = 0; diff --git a/plat/arm/css/drivers/scp/css_pm_scpi.c b/plat/arm/css/drivers/scp/css_pm_scpi.c index 18e71f6e3..123d54f4e 100644 --- a/plat/arm/css/drivers/scp/css_pm_scpi.c +++ b/plat/arm/css/drivers/scp/css_pm_scpi.c @@ -47,7 +47,7 @@ void css_scp_suspend(const struct psci_power_state *target_state) * if applicable. Since SCPI doesn't differentiate between OFF and suspend, we * call the suspend helper here. */ -void css_scp_off(const psci_power_state_t *target_state) +void css_scp_off(const struct psci_power_state *target_state) { css_scp_suspend(target_state); } From a9b5b4aea16e6e2a41567d13d7e6a2664dd2057c Mon Sep 17 00:00:00 2001 From: Roberto Vargas Date: Mon, 12 Feb 2018 12:36:17 +0000 Subject: [PATCH 2/4] Fix MISRA rule 8.4 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=juno ARCH=aarch32 AARCH32_SP=sp_min RESET_TO_SP_MIN=1 JUNO_AARCH32_EL3_RUNTIME=1 bl32 Change-Id: I3ac25096b55774689112ae37bdf1222f9a9ecffb Signed-off-by: Roberto Vargas --- bl32/sp_min/sp_min_main.c | 1 + plat/arm/css/drivers/scp/css_pm_scmi.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bl32/sp_min/sp_min_main.c b/bl32/sp_min/sp_min_main.c index 8e891b757..f06a48bfe 100644 --- a/bl32/sp_min/sp_min_main.c +++ b/bl32/sp_min/sp_min_main.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/plat/arm/css/drivers/scp/css_pm_scmi.c b/plat/arm/css/drivers/scp/css_pm_scmi.c index 0a5cff668..715bf980b 100644 --- a/plat/arm/css/drivers/scp/css_pm_scmi.c +++ b/plat/arm/css/drivers/scp/css_pm_scmi.c @@ -298,7 +298,7 @@ void __dead2 css_scp_sys_reboot(void) css_scp_system_off(SCMI_SYS_PWR_COLD_RESET); } -scmi_channel_plat_info_t plat_css_scmi_plat_info = { +static scmi_channel_plat_info_t plat_css_scmi_plat_info = { .scmi_mbx_mem = CSS_SCMI_PAYLOAD_BASE, .db_reg_addr = PLAT_CSS_MHU_BASE + CSS_SCMI_MHU_DB_REG_OFF, .db_preserve_mask = 0xfffffffe, From 0fbb7a4afe937eefa102a268f78ba9cc579ab23f Mon Sep 17 00:00:00 2001 From: Roberto Vargas Date: Mon, 12 Feb 2018 12:36:17 +0000 Subject: [PATCH 3/4] Fix MISRA rule 8.3 Rule 8.3: All declarations of an object or function shall use the same names and type qualifiers. Fixed for: make DEBUG=1 PLAT=juno SPD=tspd CSS_USE_SCMI_SDS_DRIVER=1 all Change-Id: Id9dcc6238b39fac6046abc28141e3ef5e7aa998d Signed-off-by: Roberto Vargas --- plat/arm/css/drivers/sds/sds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plat/arm/css/drivers/sds/sds.h b/plat/arm/css/drivers/sds/sds.h index ff3787da0..4aef0df9f 100644 --- a/plat/arm/css/drivers/sds/sds.h +++ b/plat/arm/css/drivers/sds/sds.h @@ -80,7 +80,7 @@ typedef enum { } sds_access_mode_t; int sds_init(void); -int sds_struct_exists(uint32_t structure_id); +int sds_struct_exists(unsigned int structure_id); int sds_struct_read(uint32_t structure_id, unsigned int fld_off, void *data, size_t size, sds_access_mode_t mode); int sds_struct_write(uint32_t structure_id, unsigned int fld_off, void *data, From 311a1a8ee8674f8b1a3a4797bb5856fa9d28d522 Mon Sep 17 00:00:00 2001 From: Roberto Vargas Date: Mon, 12 Feb 2018 12:36:17 +0000 Subject: [PATCH 4/4] Fix MISRA rule 8.4 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=juno SPD=tspd CSS_USE_SCMI_SDS_DRIVER=1 all Change-Id: Id732c8df12ef3e20903c41b7ab9a9b55341d68ac Signed-off-by: Roberto Vargas --- plat/arm/css/drivers/scp/css_sds.c | 1 + 1 file changed, 1 insertion(+) diff --git a/plat/arm/css/drivers/scp/css_sds.c b/plat/arm/css/drivers/scp/css_sds.c index a7a51ba2d..561e97b2e 100644 --- a/plat/arm/css/drivers/scp/css_sds.c +++ b/plat/arm/css/drivers/scp/css_sds.c @@ -11,6 +11,7 @@ #include #include #include +#include "css_scp.h" #include "../sds/sds.h" int css_scp_boot_image_xfer(void *image, unsigned int image_size)