Changeset ff3b7da7 in mainline

Timestamp:

2008-11-11T22:11:18Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

aa8d0f7

Parents:

f3c4a26

Message:

Accesses to memory mapped registers should use volatile pointers so that
the compiler doesn't even think of trying to be clever. Add memory barriers
and fixed cstyle.

Location:

kernel/arch/sparc64/include

Files:

• asm.h (modified) (1 diff)
• types.h (modified) (1 diff)

kernel/arch/sparc64/include/asm.h

@@ -43 +43 @@
 #include <config.h>
 #include <arch/stack.h>
-
-typedef uint64_t ioport_t;
-
-
-static inline void  outb(ioport_t port,uint8_t v)
-{
-        *((uint8_t *)(port)) = v;
-}
-
-static inline void  outw(ioport_t port,uint16_t v)
-{
-        *((uint16_t *)(port)) = v;
-}
-
-static inline void  outl(ioport_t port,uint32_t v)
-{
-        *((uint32_t *)(port)) = v;
-}
-
-
+#include <arch/barrier.h>
+
+static inline void outb(ioport_t port, uint8_t v)
+{
+        *((volatile uint8_t *)(port)) = v;
+        memory_barrier();
+}
+
+static inline void outw(ioport_t port, uint16_t v)
+{
+        *((volatile uint16_t *)(port)) = v;
+        memory_barrier();
+}
+
+static inline void outl(ioport_t port, uint32_t v)
+{
+        *((volatile uint32_t *)(port)) = v;
+        memory_barrier();
+}
 
 static inline uint8_t inb(ioport_t port)
 {
-        return *((uint8_t *)(port));
+        uint8_t rv;
+
+        rv = *((volatile uint8_t *)(port));
+        memory_barrier();
+
+        return rv;
 }
 
 static inline uint16_t inw(ioport_t port)
 {
-        return *((uint16_t *)(port));
+        uint16_t rv;
+
+        rv = *((volatile uint16_t *)(port));
+        memory_barrier();
+
+        return rv;
 }
 
 static inline uint32_t inl(ioport_t port)
 {
-        return *((uint32_t *)(port));
-}
-
-
-
-
+        uint32_t rv;
+
+        rv = *((volatile uint32_t *)(port));
+        memory_barrier();
+
+        return rv;
+}
 
 /** Read Processor State register.

kernel/arch/sparc64/include/types.h

@@ -55 +55 @@
 typedef uint64_t ipl_t;
 
+typedef uint64_t ioport_t;
+
 typedef uint64_t unative_t;
 typedef int64_t native_t;