[Minios-devel] [PATCH v3 34/43] arm64: gic: implement the REG_WRITE32/REG_READ32

[Huang Shijie <shijie.huang@xxxxxxx>]

Implement the REG_WRITE32/REG_READ32 for arm64, and add
a new header io.h for them.

This patch also removes the REG_WRITE32/REG_READ32 for arm32.

Signed-off-by: Huang Shijie <shijie.huang@xxxxxxx>
---
 arch/arm/gic.c         | 15 +--------------
 include/arm/arm64/io.h | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 include/arm/arm64/io.h

diff --git a/arch/arm/gic.c b/arch/arm/gic.c
index 687f242..8be1285 100644
--- a/arch/arm/gic.c
+++ b/arch/arm/gic.c
@@ -4,6 +4,7 @@
 #include <mini-os/hypervisor.h>
 #include <mini-os/console.h>
 #include <libfdt.h>
+#include <mini-os/arm64/io.h>
 
 //#define VGIC_DEBUG
 #ifdef VGIC_DEBUG
@@ -41,20 +42,6 @@ static struct gic gic;
 
 #define REG(addr) ((uint32_t *)(addr))
 
-static inline uint32_t REG_READ32(volatile uint32_t *addr)
-{
-    uint32_t value;
-    __asm__ __volatile__("ldr %0, [%1]":"=&r"(value):"r"(addr));
-    rmb();
-    return value;
-}
-
-static inline void REG_WRITE32(volatile uint32_t *addr, unsigned int value)
-{
-    __asm__ __volatile__("str %0, [%1]"::"r"(value), "r"(addr));
-    wmb();
-}
-
 static void gic_set_priority(struct gic *gic, int irq_number, unsigned char 
priority)
 {
     uint32_t value;
diff --git a/include/arm/arm64/io.h b/include/arm/arm64/io.h
new file mode 100644
index 0000000..f4c087c
--- /dev/null
+++ b/include/arm/arm64/io.h
@@ -0,0 +1,18 @@
+#ifndef __ARM64_IO_H__
+#define __ARM64_IO_H__
+
+static inline uint32_t REG_READ32(volatile uint32_t *addr)
+{
+    uint32_t value;
+
+    __asm__ __volatile__("ldr %w0, [%1]":"=&r"(value):"r"(addr));
+    rmb();
+    return value;
+}
+
+static inline void REG_WRITE32(volatile uint32_t *addr, unsigned int value)
+{
+    __asm__ __volatile__("str %w0, [%1]"::"r" (value), "r"(addr));
+    wmb();
+}
+#endif
-- 
2.7.4


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel