plat/common: gic: MISRA fixes
Change-Id: I11509a3271d7608048d49e7dd5192be0c2a313f0
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/plat/common/plat_gicv2.c b/plat/common/plat_gicv2.c
index 026ea71..2b61834 100644
--- a/plat/common/plat_gicv2.c
+++ b/plat/common/plat_gicv2.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -8,6 +8,7 @@
#include <gicv2.h>
#include <interrupt_mgmt.h>
#include <platform.h>
+#include <stdbool.h>
/*
* The following platform GIC functions are weakly defined. They
@@ -101,7 +102,7 @@
type = gicv2_get_interrupt_group(id);
/* Assume that all secure interrupts are S-EL1 interrupts */
- return type == GICV2_INTR_GROUP1 ? INTR_TYPE_NS :
+ return (type == GICV2_INTR_GROUP1) ? INTR_TYPE_NS :
#if GICV2_G0_FOR_EL3
INTR_TYPE_EL3;
#else
@@ -130,9 +131,8 @@
uint32_t plat_interrupt_type_to_line(uint32_t type,
uint32_t security_state)
{
- assert(type == INTR_TYPE_S_EL1 ||
- type == INTR_TYPE_EL3 ||
- type == INTR_TYPE_NS);
+ assert((type == INTR_TYPE_S_EL1) || (type == INTR_TYPE_EL3) ||
+ (type == INTR_TYPE_NS));
assert(sec_state_is_valid(security_state));
@@ -144,8 +144,8 @@
* Secure interrupts are signaled using the IRQ line if the FIQ is
* not enabled else they are signaled using the FIQ line.
*/
- return ((gicv2_is_fiq_enabled()) ? __builtin_ctz(SCR_FIQ_BIT) :
- __builtin_ctz(SCR_IRQ_BIT));
+ return ((gicv2_is_fiq_enabled() != 0U) ? __builtin_ctz(SCR_FIQ_BIT) :
+ __builtin_ctz(SCR_IRQ_BIT));
}
unsigned int plat_ic_get_running_priority(void)
@@ -211,7 +211,7 @@
void plat_ic_set_interrupt_type(unsigned int id, unsigned int type)
{
- int gicv2_type = 0;
+ unsigned int gicv2_type = 0U;
/* Map canonical interrupt type to GICv2 type */
switch (type) {
@@ -226,7 +226,7 @@
gicv2_type = GICV2_INTR_GROUP1;
break;
default:
- assert(0);
+ assert(false);
break;
}
@@ -247,7 +247,7 @@
gicv2_raise_sgi(sgi_num, id);
#else
- assert(0);
+ assert(false);
#endif
}
@@ -266,7 +266,7 @@
proc_num = -1;
break;
default:
- assert(0);
+ assert(false);
break;
}
diff --git a/plat/common/plat_gicv3.c b/plat/common/plat_gicv3.c
index 26a4973..e43a355 100644
--- a/plat/common/plat_gicv3.c
+++ b/plat/common/plat_gicv3.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -11,6 +11,7 @@
#include <gicv3.h>
#include <interrupt_mgmt.h>
#include <platform.h>
+#include <stdbool.h>
#ifdef IMAGE_BL31
@@ -54,7 +55,7 @@
assert(IS_IN_EL3());
irqnr = gicv3_get_pending_interrupt_id();
- return (gicv3_is_intr_id_special_identifier(irqnr)) ?
+ return gicv3_is_intr_id_special_identifier(irqnr) ?
INTR_ID_UNAVAILABLE : irqnr;
}
@@ -73,20 +74,27 @@
uint32_t plat_ic_get_pending_interrupt_type(void)
{
unsigned int irqnr;
+ uint32_t type;
assert(IS_IN_EL3());
irqnr = gicv3_get_pending_interrupt_type();
switch (irqnr) {
case PENDING_G1S_INTID:
- return INTR_TYPE_S_EL1;
+ type = INTR_TYPE_S_EL1;
+ break;
case PENDING_G1NS_INTID:
- return INTR_TYPE_NS;
+ type = INTR_TYPE_NS;
+ break;
case GIC_SPURIOUS_INTERRUPT:
- return INTR_TYPE_INVAL;
+ type = INTR_TYPE_INVAL;
+ break;
default:
- return INTR_TYPE_EL3;
+ type = INTR_TYPE_EL3;
+ break;
}
+
+ return type;
}
/*
@@ -132,9 +140,9 @@
uint32_t plat_interrupt_type_to_line(uint32_t type,
uint32_t security_state)
{
- assert(type == INTR_TYPE_S_EL1 ||
- type == INTR_TYPE_EL3 ||
- type == INTR_TYPE_NS);
+ assert((type == INTR_TYPE_S_EL1) ||
+ (type == INTR_TYPE_EL3) ||
+ (type == INTR_TYPE_NS));
assert(sec_state_is_valid(security_state));
assert(IS_IN_EL3());
@@ -227,9 +235,10 @@
assert(plat_core_pos_by_mpidr(target) >= 0);
/* Verify that this is a secure EL3 SGI */
- assert(plat_ic_get_interrupt_type(sgi_num) == INTR_TYPE_EL3);
+ assert(plat_ic_get_interrupt_type((unsigned int)sgi_num) ==
+ INTR_TYPE_EL3);
- gicv3_raise_secure_g0_sgi(sgi_num, target);
+ gicv3_raise_secure_g0_sgi((unsigned int)sgi_num, target);
}
void plat_ic_set_spi_routing(unsigned int id, unsigned int routing_mode,
@@ -246,7 +255,7 @@
irm = GICV3_IRM_ANY;
break;
default:
- assert(0);
+ assert(false);
break;
}
@@ -274,10 +283,10 @@
unsigned int plat_ic_get_interrupt_id(unsigned int raw)
{
- unsigned int id = (raw & INT_ID_MASK);
+ unsigned int id = raw & INT_ID_MASK;
- return (gicv3_is_intr_id_special_identifier(id) ?
- INTR_ID_UNAVAILABLE : id);
+ return gicv3_is_intr_id_special_identifier(id) ?
+ INTR_ID_UNAVAILABLE : id;
}
#endif
#ifdef IMAGE_BL32