commit 0b67df851f5740b962e429f43b1bde27676eb46f
author AlexeiFedorov <Alexei.Fedorov@arm.com> Tue Aug 29 15:16:06 2023 +0100
committer Soby Mathew <soby.mathew@arm.com> Tue Sep 05 15:27:15 2023 +0100
tree e9bfc3270f8942de0c3946dfa027aa0ffea97d8c
parent 172ccd1930e41f635611521c30d779b90afcdddf

fix(lib/realm): fix MISRA C:2012 issues in buffer.c

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

lib/realm/src/buffer.c

diff --git a/lib/realm/src/buffer.c b/lib/realm/src/buffer.c
index dddba0e..6b09e58 100644
--- a/lib/realm/src/buffer.c
+++ b/lib/realm/src/buffer.c
@@ -179,7 +179,8 @@
 void assert_cpu_slots_empty(void)
 {
 	for (unsigned int i = 0U; i < (unsigned int)NR_CPU_SLOTS; i++) {
-		assert(slot_to_descriptor(i) == TRANSIENT_DESC);
+		assert(slot_to_descriptor((enum buffer_slot)i) ==
+							TRANSIENT_DESC);
 	}
 }
 
@@ -259,8 +260,8 @@
 	assert(ALIGNED(offset, 8U));
 	assert(ALIGNED(dest, 8U));
 
-	offset &= ~GRANULE_MASK;
-	assert(offset + size <= GRANULE_SIZE);
+	offset &= (unsigned int)(~GRANULE_MASK);
+	assert((offset + size) <= GRANULE_SIZE);
 
 	src = (uintptr_t)ns_granule_map(slot, ns_gr);
 	retval = memcpy_ns_read(dest, (void *)(src + offset), size);
@@ -299,8 +300,8 @@
 	assert(ALIGNED(offset, 8U));
 	assert(ALIGNED(src, 8U));
 
-	offset &= ~GRANULE_MASK;
-	assert(offset + size <= GRANULE_SIZE);
+	offset &= (unsigned int)(~GRANULE_MASK);
+	assert((offset + size) <= GRANULE_SIZE);
 
 	dest = (uintptr_t)ns_granule_map(slot, ns_gr);
 	retval = memcpy_ns_write((void *)(dest + offset), src, size);
@@ -321,7 +322,7 @@
 
 	assert(GRANULE_ALIGNED(addr));
 
-	attr |= (slot == SLOT_NS ? MT_NS : MT_REALM);
+	attr |= ((slot == SLOT_NS) ? MT_NS : MT_REALM);
 
 	if (xlat_map_memory_page_with_attrs(entry, va,
 					    (uintptr_t)addr, attr) != 0) {