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

fix(zynqmp): typecast operands to match data type

Browse source 
This corrects the MISRA violation C2012-10.1:
Operands shall not be of an inappropriate essential type.
The condition is explicitly checked against 0U, appending 'U' and
typecasting for unsigned comparison.

Change-Id: I016f9df3811d80cd230257b5533d4d15a15fe14f
Signed-off-by: Nithin G <nithing@amd.com>
Signed-off-by: Maheedhar Bollapalli <maheedharsai.bollapalli@amd.com>
This commit is contained in:
Maheedhar Bollapalli 2024-04-24 12:12:48 +05:30
parent fbc415d204
commit 2863b0c466
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plat/xilinx/zynqmp/aarch64/zynqmp_common.c
View file

@ -42,9 +42,9 @@ const mmap_region_t *plat_get_mmap(void)
static uint32_t zynqmp_get_silicon_ver(void)
{
static unsigned int ver;
static uint32_t ver;
if (!ver) {
if (ver == 0U) {
ver = mmio_read_32(ZYNQMP_CSU_BASEADDR +
ZYNQMP_CSU_VERSION_OFFSET);
ver &= ZYNQMP_SILICON_VER_MASK;
@ -326,8 +326,9 @@ int32_t plat_get_soc_version(void)
{
uint32_t chip_id = zynqmp_get_silicon_ver();
uint32_t manfid = SOC_ID_SET_JEP_106(JEDEC_XILINX_BKID, JEDEC_XILINX_MFID);
uint32_t result = (manfid | (chip_id & 0xFFFFU));
return (int32_t)(manfid | (chip_id & 0xFFFFU));
return (int32_t)result;
}
int32_t plat_get_soc_revision(void)
@ -366,7 +367,7 @@ static void zynqmp_print_platform_name(void)
VERBOSE("TF-A running on %s/%s at 0x%x\n",
zynqmp_print_silicon_idcode(), label, BL31_BASE);
VERBOSE("TF-A running on v%d/RTL%d.%d\n",
zynqmp_get_ps_ver(), (rtl & 0xf0U) >> 4, rtl & 0xfU);
zynqmp_get_ps_ver(), (rtl & 0xf0U) >> 4U, rtl & 0xfU);
}
#else
static inline void zynqmp_print_platform_name(void) { }

10
plat/xilinx/zynqmp/pm_service/pm_api_clock.c
View file

@ -2455,15 +2455,17 @@ enum pm_ret_status pm_api_clock_get_num_clocks(uint32_t *nclocks)
*/
void pm_api_clock_get_name(uint32_t clock_id, char *name)
{
if (clock_id == (uint32_t)CLK_MAX) {
uint32_t clock_id_num = clock_id;
if (clock_id_num == CLK_MAX) {
(void)memcpy(name, END_OF_CLK, ((sizeof(END_OF_CLK) > CLK_NAME_LEN) ?
CLK_NAME_LEN : sizeof(END_OF_CLK)));
} else if ((clock_id > CLK_MAX) || (!pm_clock_valid(clock_id))) {
(void)memset(name, 0, CLK_NAME_LEN);
} else if (clock_id < (uint32_t)CLK_MAX_OUTPUT_CLK) {
(void)memcpy(name, clocks[clock_id].name, CLK_NAME_LEN);
} else if (clock_id_num < (uint32_t)CLK_MAX_OUTPUT_CLK) {
(void)memcpy(name, clocks[clock_id_num].name, CLK_NAME_LEN);
} else {
(void)memcpy(name, ext_clocks[clock_id - (uint32_t)CLK_MAX_OUTPUT_CLK].name,
(void)memcpy(name, ext_clocks[clock_id_num - (uint32_t)CLK_MAX_OUTPUT_CLK].name,
CLK_NAME_LEN);
}
}

2
plat/xilinx/zynqmp/pm_service/zynqmp_pm_api_sys.c
View file

@ -710,7 +710,7 @@ enum pm_ret_status pm_get_callbackdata(uint32_t *data, size_t count)
{
enum pm_ret_status ret = PM_RET_SUCCESS;
/* Return if interrupt is not from PMU */
if (!pm_ipi_irq_status(primary_proc)) {
if ((pm_ipi_irq_status(primary_proc) == 0U)) {
return ret;
}

2
plat/xilinx/zynqmp/pm_service/zynqmp_pm_svc_main.c
View file

@ -253,7 +253,7 @@ int32_t pm_setup(void)
ret = status;
}
pm_up = !status;
pm_up = (status == 0);
return ret;
}