From f0f2c90365d933ee0a160b4bf5723fc303d9ab73 Mon Sep 17 00:00:00 2001 From: Tony K Nadackal Date: Wed, 7 Dec 2022 20:44:05 +0000 Subject: [PATCH] fix(scmi): change function prototype to fix gcc error Change function prototype of plat_css_get_scmi_info() to fix the GCC sign conversion error "comparison between signed and unsigned integer expressions". Changing channel_id type to unsigned int since it can never be a negative value. Signed-off-by: Tony K Nadackal Change-Id: I579b21497329db40897c10d86c8fc68e4877f3db --- include/drivers/arm/css/scmi.h | 2 +- plat/arm/board/juno/juno_topology.c | 2 +- plat/arm/board/morello/morello_bl31_setup.c | 2 +- plat/arm/board/n1sdp/n1sdp_bl31_setup.c | 2 +- plat/arm/board/tc/tc_bl31_setup.c | 2 +- plat/arm/css/sgi/sgi_bl31_setup.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/drivers/arm/css/scmi.h b/include/drivers/arm/css/scmi.h index 9dd08e5ab..356012bf9 100644 --- a/include/drivers/arm/css/scmi.h +++ b/include/drivers/arm/css/scmi.h @@ -168,7 +168,7 @@ int scmi_ap_core_set_reset_addr(void *p, uint64_t reset_addr, uint32_t attr); int scmi_ap_core_get_reset_addr(void *p, uint64_t *reset_addr, uint32_t *attr); /* API to get the platform specific SCMI channel information. */ -scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id); +scmi_channel_plat_info_t *plat_css_get_scmi_info(unsigned int channel_id); /* API to override default PSCI callbacks for platforms that support SCMI. */ const plat_psci_ops_t *css_scmi_override_pm_ops(plat_psci_ops_t *ops); diff --git a/plat/arm/board/juno/juno_topology.c b/plat/arm/board/juno/juno_topology.c index 075f512c3..768741ed0 100644 --- a/plat/arm/board/juno/juno_topology.c +++ b/plat/arm/board/juno/juno_topology.c @@ -20,7 +20,7 @@ static scmi_channel_plat_info_t juno_scmi_plat_info = { .ring_doorbell = &mhu_ring_doorbell, }; -scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id) +scmi_channel_plat_info_t *plat_css_get_scmi_info(unsigned int channel_id) { return &juno_scmi_plat_info; } diff --git a/plat/arm/board/morello/morello_bl31_setup.c b/plat/arm/board/morello/morello_bl31_setup.c index a04421200..e04587dd3 100644 --- a/plat/arm/board/morello/morello_bl31_setup.c +++ b/plat/arm/board/morello/morello_bl31_setup.c @@ -19,7 +19,7 @@ static scmi_channel_plat_info_t morello_scmi_plat_info = { .ring_doorbell = &mhu_ring_doorbell }; -scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id) +scmi_channel_plat_info_t *plat_css_get_scmi_info(unsigned int channel_id) { return &morello_scmi_plat_info; } diff --git a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c index 5e897fee3..ad6c1f840 100644 --- a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c +++ b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c @@ -62,7 +62,7 @@ static uintptr_t n1sdp_multichip_gicr_frames[3] = { 0 }; -scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id) +scmi_channel_plat_info_t *plat_css_get_scmi_info(unsigned int channel_id) { return &n1sdp_scmi_plat_info; } diff --git a/plat/arm/board/tc/tc_bl31_setup.c b/plat/arm/board/tc/tc_bl31_setup.c index 0523ef8f2..2cdf045b9 100644 --- a/plat/arm/board/tc/tc_bl31_setup.c +++ b/plat/arm/board/tc/tc_bl31_setup.c @@ -33,7 +33,7 @@ void bl31_platform_setup(void) tc_bl31_common_platform_setup(); } -scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id) +scmi_channel_plat_info_t *plat_css_get_scmi_info(unsigned int channel_id) { return &tc_scmi_plat_info[channel_id]; diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/sgi/sgi_bl31_setup.c index 27cf18346..9adcb7c0b 100644 --- a/plat/arm/css/sgi/sgi_bl31_setup.c +++ b/plat/arm/css/sgi/sgi_bl31_setup.c @@ -74,7 +74,7 @@ static scmi_channel_plat_info_t plat_rd_scmi_info[] = { #endif }; -scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id) +scmi_channel_plat_info_t *plat_css_get_scmi_info(unsigned int channel_id) { if (sgi_plat_info.platform_id == RD_N1E1_EDGE_SID_VER_PART_NUM || sgi_plat_info.platform_id == RD_V1_SID_VER_PART_NUM || -- 2.39.5