Ticket #2014: 0001-GRETH-added-support-for-non-snooping-GRETH-10-100-sy_v1.patch

c/src/lib/libbsp/sparc/leon2/include/bsp.h

@@ -60 +60 @@
 
 #define HAS_SMC91111
 
+/* Configure GRETH driver */
+#define GRETH_SUPPORTED
+#define GRETH_MEM_LOAD(addr) leon_r32_no_cache(addr)
+
 /*
  *  The synchronous trap is an arbitrarily chosen software trap.
  */

c/src/lib/libbsp/sparc/leon2/include/leon.h

@@ -369 +369 @@
 #define LEON_REG_TIMER_COUNTER_DEFINED_MASK       0x00000003
 #define LEON_REG_TIMER_COUNTER_CURRENT_MODE_MASK  0x00000003
 
+/* Load 32-bit word by forcing a cache-miss */
+static inline unsigned int leon_r32_no_cache(uintptr_t addr)
+{
+        unsigned int tmp;
+        asm volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr));
+        return tmp;
+}
+
 #endif /* !ASM */
 
 #ifdef __cplusplus

c/src/lib/libbsp/sparc/leon3/include/bsp.h

@@ -73 +73 @@
 
 #define HAS_SMC91111
 
+/* Configure GRETH driver */
+#define GRETH_SUPPORTED
+#define GRETH_MEM_LOAD(addr) leon_r32_no_cache(addr)
+
 extern int   CPU_SPARC_HAS_SNOOPING;
 
 

c/src/lib/libbsp/sparc/leon3/include/leon.h

@@ -326 +326 @@
 #define LEON_REG_TIMER_COUNTER_DEFINED_MASK       0x00000003
 #define LEON_REG_TIMER_COUNTER_CURRENT_MODE_MASK  0x00000003
 
+/* Load 32-bit word by forcing a cache-miss */
+static inline unsigned int leon_r32_no_cache(uintptr_t addr)
+{
+        unsigned int tmp;
+        asm volatile (" lda [%1] 1, %0\n" : "=r"(tmp) : "r"(addr));
+        return tmp;
+}
+
 #endif /* !ASM */
 
 #ifdef __cplusplus

c/src/libchip/network/greth.c

@@ -12 +12 @@
  */
 
 #include <rtems.h>
-
-#define GRETH_SUPPORTED
 #include <bsp.h>
 
+#ifdef GRETH_SUPPORTED
+
 #include <inttypes.h>
 #include <errno.h>
 #include <rtems/bspIo.h>
@@ -57 +57 @@
 extern void ipalign(struct mbuf *m);
 #endif
 
+/* Used when reading from memory written by GRETH DMA unit */
+#ifndef GRETH_MEM_LOAD
+#define GRETH_MEM_LOAD(addr) (*(volatile unsigned int *)(addr))
+#endif
+
 /*
  * Number of OCs supported by this driver
  */
@@ -499 +504 @@
     print_init_info(sc);
 }
 
+#ifdef CPU_U32_FIX
+
+/*
+ * Routine to align the received packet so that the ip header
+ * is on a 32-bit boundary. Necessary for cpu's that do not
+ * allow unaligned loads and stores and when the 32-bit DMA
+ * mode is used.
+ *
+ * Transfers are done on word basis to avoid possibly slow byte
+ * and half-word writes.
+ */
+
+void ipalign(struct mbuf *m)
+{
+  unsigned int *first, *last, data;
+  unsigned int tmp;
+
+  if ((((int) m->m_data) & 2) && (m->m_len)) {
+    last = (unsigned int *) ((((int) m->m_data) + m->m_len + 8) & ~3);
+    first = (unsigned int *) (((int) m->m_data) & ~3);
+    tmp = GRETH_MEM_LOAD(first);
+    tmp = tmp << 16;
+    first++;
+    do {
+      /* When snooping is not available the LDA instruction must be used
+       * to avoid the cache to return an illegal value.
+       * Load with forced cache miss
+       */
+      data = GRETH_MEM_LOAD(first);
+      *first = tmp | (data >> 16);
+      tmp = data << 16;
+      first++;
+    } while (first <= last);
+
+    m->m_data = (caddr_t)(((int) m->m_data) + 2);
+  }
+}
+#endif
+
 void
 greth_Daemon (void *arg)
 {
@@ -510 +554 @@
     rtems_event_set events;
     rtems_interrupt_level level;
     int first;
+    unsigned int tmp;
 
     for (;;)
       {
@@ -539 +584 @@
     /* Scan for Received packets */
 again:
     while (!((len_status =
-                    dp->rxdesc[dp->rx_ptr].ctrl) & GRETH_RXD_ENABLE))
+                    GRETH_MEM_LOAD(&dp->rxdesc[dp->rx_ptr].ctrl)) & GRETH_RXD_ENABLE))
             {
                     bad = 0;
                     if (len_status & GRETH_RXD_TOOLONG)
@@ -583 +628 @@
                                     len - sizeof (struct ether_header);
 
                             eh = mtod (m, struct ether_header *);
+
                             m->m_data += sizeof (struct ether_header);
 #ifdef CPU_U32_FIX
-                            if(!(dp->gbit_mac))
+                            if(!dp->gbit_mac) {
+                                    /* OVERRIDE CACHED ETHERNET HEADER FOR NON-SNOOPING SYSTEMS */
+                                    tmp = GRETH_MEM_LOAD((uintptr_t)eh);
+                                    tmp = GRETH_MEM_LOAD(4+(uintptr_t)eh);
+                                    tmp = GRETH_MEM_LOAD(8+(uintptr_t)eh);
+                                    tmp = GRETH_MEM_LOAD(12+(uintptr_t)eh);
+
                                     ipalign(m); /* Align packet on 32-bit boundary */
+                            }
 #endif
 
                             ether_input (ifp, eh, m);
@@ -641 +694 @@
     /*
      * Is there a free descriptor available?
      */
-    if ( dp->txdesc[dp->tx_ptr].ctrl & GRETH_TXD_ENABLE ){
+    if (GRETH_MEM_LOAD(&dp->txdesc[dp->tx_ptr].ctrl) & GRETH_TXD_ENABLE){
             /* No. */
             inside = 0;
             return 1;
@@ -651 +704 @@
     n = m;
 
     len = 0;
-    temp = (unsigned char *) dp->txdesc[dp->tx_ptr].addr;
+    temp = (unsigned char *) GRETH_MEM_LOAD(&dp->txdesc[dp->tx_ptr].addr);
 #ifdef GRETH_DEBUG
     printf("TXD: 0x%08x : BUF: 0x%08x\n", (int) m->m_data, (int) temp);
 #endif
@@ -814 +867 @@
      */
     for (;;){
         /* Reap Sent packets */
-        while((sc->tx_cnt > 0) && !(sc->txdesc[sc->tx_dptr].ctrl) && !(sc->txdesc[sc->tx_dptr].ctrl & GRETH_TXD_ENABLE)) {
+        while((sc->tx_cnt > 0) && !(GRETH_MEM_LOAD(&sc->txdesc[sc->tx_dptr].ctrl) & GRETH_TXD_ENABLE)) {
             m_free(sc->txmbuf[sc->tx_dptr]);
             sc->tx_dptr = (sc->tx_dptr + 1) % sc->txbufs;
             sc->tx_cnt--;
@@ -1146 +1199 @@
     return 1;
 };
 
+#endif