Cactus test for exercising SMMUv3 driver to perform stage2 translation

Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
Change-Id: I498cb63aed497ab469a38e486a7943dd634e5b36
diff --git a/include/lib/mmio.h b/include/lib/mmio.h
index e8a7df0..c788af3 100644
--- a/include/lib/mmio.h
+++ b/include/lib/mmio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2021, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -24,16 +24,33 @@
 	*(volatile uint32_t*)addr = value;
 }
 
+static inline void mmio_write32_offset(uintptr_t addr, uint32_t byte_off,
+					uint32_t data)
+{
+	mmio_write_32((uintptr_t)((uint8_t *)addr + byte_off), data);
+}
+
 static inline uint32_t mmio_read_32(uintptr_t addr)
 {
 	return *(volatile uint32_t*)addr;
 }
 
+static inline uint32_t mmio_read32_offset(uintptr_t addr, uint32_t byte_off)
+{
+	return mmio_read_32((uintptr_t)((uint8_t *)addr + byte_off));
+}
+
 static inline void mmio_write_64(uintptr_t addr, uint64_t value)
 {
 	*(volatile uint64_t*)addr = value;
 }
 
+static inline void mmio_write64_offset(uintptr_t addr, uint32_t byte_off,
+					uint64_t data)
+{
+	mmio_write_64((uintptr_t)((uint8_t *)addr + byte_off), data);
+}
+
 static inline uint64_t mmio_read_64(uintptr_t addr)
 {
 	return *(volatile uint64_t*)addr;