commit 0a0d4ee5ea7db6e00ffcd37704b50053a27ff97a
author Shruti Gupta <shruti.gupta@arm.com> Mon Apr 22 21:37:25 2024 +0100
committer Soby Mathew <soby.mathew@arm.com> Wed Apr 24 14:05:46 2024 +0200
tree f5743943204b9ad12268d59e33ad24a8b96aeea0
parent b58c0470c5db49293558fe5a24388d15cb4b81dc

fix: fix cppcheck misra errors

Fix remaining misra errors and now the error
count is 0 for CPPCheck version 2.13.4.

Change-Id: I903b198b137672b4c26457bbafcab05185dce608
Signed-off-by: Shruti Gupta <shruti.gupta@arm.com>

lib/s2tt/include/s2tt.h

diff --git a/lib/s2tt/include/s2tt.h b/lib/s2tt/include/s2tt.h
index 27d47e7..cc7d0fd 100644
--- a/lib/s2tt/include/s2tt.h
+++ b/lib/s2tt/include/s2tt.h
@@ -38,11 +38,11 @@
 	 */
 };
 
-#define S2TT_MIN_IPA_BITS		32U
-#define S2TT_MAX_IPA_BITS		48U
+#define S2TT_MIN_IPA_BITS		U(32)
+#define S2TT_MAX_IPA_BITS		U(48)
 
-#define S2TT_MAX_IPA_BITS_LPA2		52U
-#define S2TT_MAX_IPA_SIZE_LPA2		(1UL << S2TT_MAX_IPA_BITS_LPA2)
+#define S2TT_MAX_IPA_BITS_LPA2		U(52)
+#define S2TT_MAX_IPA_SIZE_LPA2		(UL(1) << S2TT_MAX_IPA_BITS_LPA2)
 
 #define S2TT_MIN_STARTING_LEVEL		(0)
 #define S2TT_MIN_STARTING_LEVEL_LPA2	(-1)
@@ -53,7 +53,7 @@
  * S2TTE_STRIDE: The number of bits resolved in a single level of translation
  * walk (except for the starting level which may resolve more or fewer bits).
  */
-#define S2TTE_STRIDE		(GRANULE_SHIFT - 3U)
+#define S2TTE_STRIDE		(U(GRANULE_SHIFT) - 3U)
 #define S2TTES_PER_S2TT		(1UL << S2TTE_STRIDE)
 
 /*

lib/s2tt/src/s2tt.c

diff --git a/lib/s2tt/src/s2tt.c b/lib/s2tt/src/s2tt.c
index 3ba0e13..b603640 100644
--- a/lib/s2tt/src/s2tt.c
+++ b/lib/s2tt/src/s2tt.c
@@ -598,11 +598,13 @@
 unsigned long s2tte_create_table(const struct s2tt_context *s2_ctx,
 				 unsigned long pa, long level)
 {
-	__unused int min_starting_level;
+	__unused long min_starting_level;
 
 	(void)level;
 
 	assert(s2_ctx != NULL);
+
+	/* cppcheck-suppress misra-c2012-10.6 */
 	min_starting_level = (s2_ctx->enable_lpa2 == true) ?
 			S2TT_MIN_STARTING_LEVEL_LPA2 : S2TT_MIN_STARTING_LEVEL;
 
@@ -1033,6 +1035,7 @@
 
 	assert(s2_ctx != NULL);
 
+	/* cppcheck-suppress misra-c2012-10.6 */
 	min_starting_level = (s2_ctx->enable_lpa2 == true) ?
 		S2TT_MIN_STARTING_LEVEL_LPA2 : S2TT_MIN_STARTING_LEVEL;
 	assert(level >= min_starting_level);
@@ -1055,6 +1058,7 @@
 {
 	assert(s2_ctx != NULL);
 
+	/* cppcheck-suppress misra-c2012-10.6 */
 	__unused long min_starting_level = (s2_ctx->enable_lpa2 == true) ?
 		S2TT_MIN_STARTING_LEVEL_LPA2 : S2TT_MIN_STARTING_LEVEL;
 	unsigned long levels = (unsigned long)(S2TT_PAGE_LEVEL - level);
@@ -1273,6 +1277,8 @@
 	unsigned long i, index = wi->index;
 	long level = wi->last_level;
 	unsigned long map_size;
+
+	/* cppcheck-suppress misra-c2012-10.6 */
 	__unused long min_starting_level = (s2_ctx->enable_lpa2 == true) ?
 			S2TT_MIN_STARTING_LEVEL_LPA2 : S2TT_MIN_STARTING_LEVEL;