Changeset 705 for trunk/softs

Timestamp:

May 28, 2014, 11:56:50 AM (10 years ago)

Author:

cfuguet

Message:

tsar_boot:

• Completing io utility functions to provide physical address extention capability to read and write 8 and 16 bits IO mapped registers.

• Providing default value 0 to CLUSTER_IO preprocessor constant for compatibility with most TSAR platforms where peripherals are in cluster 0. This way, preloader parameters file does not need to be modified for these platforms.

Location:

trunk/softs/tsar_boot/include

Files:

• defs.h (modified) (1 diff)
• io.h (modified) (7 diffs)

trunk/softs/tsar_boot/include/defs.h

@@ -8 +8 @@
 #define BLOCK_SIZE          512
 
+#ifndef CLUSTER_IO
+#  define CLUSTER_IO        0
+#endif
+
 // vim: tabstop=4 : softtabstop=4 : shiftwidth=4 : expandtab
 

trunk/softs/tsar_boot/include/io.h

@@ -1 +1 @@
 /**********************************************************************
- * \file        io.h
- * \date        5 September 2012
- * \author      Cesar Fuguet / Alain Greiner
+ * \file    io.h
+ * \date    5 September 2012
+ * \author  Cesar Fuguet / Alain Greiner
  *
  * Utility functions to write or read memory mapped hardware registers
@@ -26 +26 @@
         "mtc2  $0,    $24            \n"  /* PADDR_EXT <= 0          */
         : "=r" (value)
-        : "r" (addr), "r" (ext) );
+        : "r" (addr), "r" (ext)
+        : "memory" );
 
-    return value;
+    return (volatile unsigned int)value;
 }
 
@@ -36 +37 @@
 static inline unsigned short ioread16(void * addr)
 {
-        return *(volatile unsigned short *) addr;
+    unsigned short value;
+    unsigned int ext = CLUSTER_IO;
+
+    asm volatile(
+        "mtc2  %2,    $24            \n"  /* PADDR_EXT <= cluster_io */
+        "lhu   %0,    0(%1)          \n"  /* value <= *(ext\addr)    */
+        "mtc2  $0,    $24            \n"  /* PADDR_EXT <= 0          */
+        : "=r" (value)
+        : "r" (addr), "r" (ext)
+        : "memory" );
+
+    return (volatile unsigned short)value;
 }
 
@@ -44 +56 @@
 static inline unsigned char ioread8(void * addr)
 {
-        return *(volatile unsigned char *) addr;
+    unsigned char value;
+    unsigned int ext = CLUSTER_IO;
+
+    asm volatile(
+        "mtc2  %2,    $24            \n"  /* PADDR_EXT <= cluster_io */
+        "lbu   %0,    0(%1)          \n"  /* value <= *(ext\addr)    */
+        "mtc2  $0,    $24            \n"  /* PADDR_EXT <= 0          */
+        : "=r" (value)
+        : "r" (addr), "r" (ext)
+        : "memory" );
+
+    return (volatile unsigned char)value;
 }
 
@@ -59 +82 @@
         "sw    %0,    0(%1)          \n"  /* *(ext\addr) <= value    */
         "mtc2  $0,    $24            \n"  /* PADDR_EXT <= 0          */
-            "sync                        \n"  /* sync barrier            */
+        "sync                        \n"  /* sync barrier            */
         :
-        : "r" (value), "r" (addr), "r" (ext) );
+        : "r" (value), "r" (addr), "r" (ext)
+        : "memory" );
 }
 
@@ -69 +93 @@
 static inline void iowrite16(void * addr, unsigned short value)
 {
-        *(volatile unsigned short *) addr = value;
-        asm volatile("sync" ::: "memory");
+    unsigned int ext = CLUSTER_IO;
+
+    asm volatile(
+        "mtc2  %2,    $24            \n"  /* PADDR_EXT <= cluster_io */
+        "sh    %0,    0(%1)          \n"  /* *(ext\addr) <= value    */
+        "mtc2  $0,    $24            \n"  /* PADDR_EXT <= 0          */
+        "sync                        \n"  /* sync barrier            */
+        :
+        : "r" (value), "r" (addr), "r" (ext)
+        : "memory" );
 }
 
@@ -78 +110 @@
 static inline void iowrite8(void * addr, unsigned char value)
 {
-        *(volatile unsigned char *) addr = value;
-        asm volatile("sync" ::: "memory");
+    unsigned int ext = CLUSTER_IO;
+
+    asm volatile(
+        "mtc2  %2,    $24            \n"  /* PADDR_EXT <= cluster_io */
+        "sb    %0,    0(%1)          \n"  /* *(ext\addr) <= value    */
+        "mtc2  $0,    $24            \n"  /* PADDR_EXT <= 0          */
+        "sync                        \n"  /* sync barrier            */
+        :
+        : "r" (value), "r" (addr), "r" (ext)
+        : "memory" );
 }
 
 #endif
+
+// vim: tabstop=4 : softtabstop=4 : shiftwidth=4 : expandtab