commit b74d268979aff31f47f916814f965f7ea37969f2
author Daniel Boulby <daniel.boulby@arm.com> Fri Nov 26 13:54:50 2021 +0000
committer Joao Alves <joao.alves@arm.com> Mon Dec 06 12:36:46 2021 +0100
tree 3f4f45e0f7ad1ff54d1be65447cd30ba211479bd
parent 8435071ec72afb6e5ccbbf2f28d14ee2b0f3ce81

build(ffa): change invariant CHECK to assert (2/3)

Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: I33f948315c4568af3bd757f0f89bb8d336b9ad39

inc/hf/io.h

diff --git a/inc/hf/io.h b/inc/hf/io.h
index 5bc69b5..3a4818a 100644
--- a/inc/hf/io.h
+++ b/inc/hf/io.h
@@ -14,7 +14,7 @@
 #include "hf/arch/barriers.h"
 #include "hf/arch/types.h"
 
-#include "hf/check.h"
+#include "hf/assert.h"
 
 /* Opaque types for different sized fields of memory mapped IO. */
 
@@ -137,25 +137,25 @@
 
 static inline uint8_t io_read8_array(io8_array_t io, size_t n)
 {
-	CHECK(n < io.count);
+	assert(n < io.count);
 	return io.base[n];
 }
 
 static inline uint16_t io_read16_array(io16_array_t io, size_t n)
 {
-	CHECK(n < io.count);
+	assert(n < io.count);
 	return io.base[n];
 }
 
 static inline uint32_t io_read32_array(io32_array_t io, size_t n)
 {
-	CHECK(n < io.count);
+	assert(n < io.count);
 	return io.base[n];
 }
 
 static inline uint64_t io_read64_array(io64_array_t io, size_t n)
 {
-	CHECK(n < io.count);
+	assert(n < io.count);
 	return io.base[n];
 }
 
@@ -268,25 +268,25 @@
 
 static inline void io_write8_array(io8_array_t io, size_t n, uint8_t v)
 {
-	CHECK(n < io.count);
+	assert(n < io.count);
 	io.base[n] = v;
 }
 
 static inline void io_write16_array(io16_array_t io, size_t n, uint16_t v)
 {
-	CHECK(n < io.count);
+	assert(n < io.count);
 	io.base[n] = v;
 }
 
 static inline void io_write32_array(io32_array_t io, size_t n, uint32_t v)
 {
-	CHECK(n < io.count);
+	assert(n < io.count);
 	io.base[n] = v;
 }
 
 static inline void io_write64_array(io64_array_t io, size_t n, uint64_t v)
 {
-	CHECK(n < io.count);
+	assert(n < io.count);
 	io.base[n] = v;
 }
 

src/arch/aarch64/plat/ffa/spmc.c

diff --git a/src/arch/aarch64/plat/ffa/spmc.c b/src/arch/aarch64/plat/ffa/spmc.c
index f53d9c7..ec75228 100644
--- a/src/arch/aarch64/plat/ffa/spmc.c
+++ b/src/arch/aarch64/plat/ffa/spmc.c
@@ -53,7 +53,7 @@
 /** Unlocks `sri_state` guarding lock. */
 void sri_state_unlock(struct sri_state_locked sri_state_locked)
 {
-	CHECK(sri_state_locked.sri_state == &sri_state);
+	assert(sri_state_locked.sri_state == &sri_state);
 	sri_state_locked.sri_state = NULL;
 	sl_unlock(&sri_state_lock_instance);
 }
@@ -386,7 +386,7 @@
 static struct vm_locked plat_ffa_nwd_vm_find_locked(
 	struct nwd_vms_locked nwd_vms_locked, ffa_vm_id_t vm_id)
 {
-	CHECK(nwd_vms_locked.nwd_vms != NULL);
+	assert(nwd_vms_locked.nwd_vms != NULL);
 
 	for (unsigned int i = 0U; i < nwd_vms_size; i++) {
 		if (nwd_vms[i].id == vm_id) {
@@ -1095,8 +1095,8 @@
 static void sri_state_set(struct sri_state_locked sri_state_locked,
 			  enum plat_ffa_sri_state state)
 {
-	CHECK(sri_state_locked.sri_state != NULL &&
-	      sri_state_locked.sri_state == &sri_state);
+	assert(sri_state_locked.sri_state != NULL &&
+	       sri_state_locked.sri_state == &sri_state);
 
 	switch (*(sri_state_locked.sri_state)) {
 	case TRIGGERED:

src/arch/aarch64/plat/interrupts/gicv3.c

diff --git a/src/arch/aarch64/plat/interrupts/gicv3.c b/src/arch/aarch64/plat/interrupts/gicv3.c
index 89aa364..ef6d417 100644
--- a/src/arch/aarch64/plat/interrupts/gicv3.c
+++ b/src/arch/aarch64/plat/interrupts/gicv3.c
@@ -6,6 +6,7 @@
  * https://opensource.org/licenses/BSD-3-Clause.
  */
 
+#include "hf/check.h"
 #include "hf/cpu.h"
 #include "hf/dlog.h"
 #include "hf/interrupt_desc.h"