commit 4faab857384b45a4253f351ff4231334879f2c37
author AlexeiFedorov <Alexei.Fedorov@arm.com> Wed Aug 30 15:06:49 2023 +0100
committer Soby Mathew <soby.mathew@arm.com> Wed Sep 06 13:55:22 2023 +0100
tree 33b945353f7e1671789e6ec5c4758d4f0d44eb3c
parent e9ca042f800270d1c303d6d8b932f422d3175e17

fix(rmm): fix MISRA C:2012 Rule 10.3 in lib & runtime

Signed-off-by: AlexeiFedorov <Alexei.Fedorov@arm.com>
Change-Id: If607bf37c82c5db40ce4a8771fd29739bffa8aa8

lib/common/include/sizes.h

diff --git a/lib/common/include/sizes.h b/lib/common/include/sizes.h
index f1b4f36..df918a9 100644
--- a/lib/common/include/sizes.h
+++ b/lib/common/include/sizes.h
@@ -20,7 +20,7 @@
 #define SZ_2M	(UL(2)  * SZ_1M)
 
 #ifndef __ASSEMBLER__
-#define BITS_PER_UL	(8 * sizeof(unsigned long))
+#define BITS_PER_UL	((unsigned int)(8 * sizeof(unsigned long)))
 #endif
 
 #endif /* SIZES_H */

lib/common/include/utils_def.h

diff --git a/lib/common/include/utils_def.h b/lib/common/include/utils_def.h
index 2a92e05..c0602ec 100644
--- a/lib/common/include/utils_def.h
+++ b/lib/common/include/utils_def.h
@@ -135,7 +135,7 @@
 			(((uintptr_t)_addr >= (uintptr_t)&_array[0]) && \
 			 ((((uintptr_t)_addr - (uintptr_t)&_array[0]) % \
 						sizeof(_array[0])) == UL(0)))
-#define GRANULE_SHIFT	(UL(12))
+#define GRANULE_SHIFT	(U(12))
 #define GRANULE_MASK	(~0xfffUL)
 
 #define HAS_MPAM 0