Changeset 85c005f3 in rtems

Timestamp:

01/12/06 00:15:16 (18 years ago)

Author:

Till Straumann <strauman@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

1827c35f

Parents:

c2fc65b

Message:

• vmeUniverse/vmeTsi148.c, vmeUniverse/vmeTsi148.h, vmeUniverse/vmeUniverse.c, vmeUniverse/vmeUniverse.h,

vmeUniverse/vme_amd_defs.h: No longer enable posted-writes
on master windows (creates race-condition on memory-mapped
devices). A new flag allows for signalling that a window
maps 'ordinary memory'. Disable VME IRQ level if no
handler is registered with interrupting vector.

Location:

c/src/lib/libbsp/shared

Files:

• ChangeLog (modified) (1 diff)
• vmeUniverse/vmeTsi148.c (modified) (1 diff)
• vmeUniverse/vmeUniverse.c (modified) (6 diffs)
• vmeUniverse/vmeUniverse.h (modified) (1 diff)
• vmeUniverse/vme_am_defs.h (modified) (2 diffs)

c/src/lib/libbsp/shared/ChangeLog

@@ +1 @@
+2006-01-11      Till Straumann <strauman@slac.stanford.edu>
+        * vmeUniverse/vmeTsi148.c, vmeUniverse/vmeTsi148.h,
+        vmeUniverse/vmeUniverse.c, vmeUniverse/vmeUniverse.h,
+    vmeUniverse/vme_amd_defs.h: No longer enable posted-writes
+    on master windows (creates race-condition on memory-mapped
+    devices). A new flag allows for signalling that a window
+    maps 'ordinary memory'. Disable VME IRQ level if no
+    handler is registered with interrupting vector.
+
 2006-01-11      Till Straumann <strauman@slac.stanford.edu>
 

c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c

@@ -1148 +1148 @@
                         if ( !(ip=irqHdlTbl[vector])) {
                                 /* TODO: log error message - RTEMS has no logger :-( */
-                                printk("vmeTsi148 ISR: ERROR: no handler registered (level %i) IACK 0x%08x\n",
-                                                lvl, vector);
+                                vmeTsi148IntDisable(lvl);
+                                printk("vmeTsi148 ISR: ERROR: no handler registered (level %i) IACK 0x%08x -- DISABING level %i\n",
+                                                lvl, vector, lvl);
                         } else {
                                 /* dispatch handler, it must clear the IRQ at the device */

c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c

@@ -291 +291 @@
 {
 unsigned long mode=0;
+
+    /* NOTE: reading the CY961 (Echotek ECDR814) with VDW32
+     *       generated bus errors when reading 32-bit words
+     *       - very weird, because the registers are 16-bit
+     *         AFAIK.
+     *       - 32-bit accesses worked fine on vxWorks which
+     *         has the port set to 64-bit.
+     *       ????????
+     */
+
         if (!ismaster) {
                 mode |= UNIV_SCTL_DAT | UNIV_SCTL_PGM;
                 mode |= UNIV_SCTL_USER;
-        }
+                if ( VME_AM_IS_MEMORY & address_space )
+                        mode |= UNIV_SCTL_PWEN | UNIV_SCTL_PREN;
+                mode |= UNIV_SCTL_EN;
+        } else {
+                mode |= UNIV_MCTL_VDW64 | UNIV_MCTL_VCT /* enable block transfers */;
+                if ( VME_AM_IS_MEMORY & address_space )
+                        mode |= UNIV_MCTL_PWEN;
+                mode |= UNIV_MCTL_EN;
+        }
+
+        address_space &= ~VME_AM_IS_MEMORY;
+
         switch (address_space) {
                 case VME_AM_STD_SUP_PGM:
@@ -457 +478 @@
                 WRITE_LE(offst,preg,12);
 #endif
-                /* calculate configuration word and enable the port */
-                /* NOTE: reading the CY961 (Echotek ECDR814) with VDW32
-                 *       generated bus errors when reading 32-bit words
-                 *       - very weird, because the registers are 16-bit
-                 *         AFAIK.
-                 *       - 32-bit accesses worked fine on vxWorks which
-                 *         has the port set to 64-bit.
-                 *       ????????
-                 */
-                if (ismaster)
-                        mode |= UNIV_MCTL_EN | UNIV_MCTL_PWEN | UNIV_MCTL_VDW64 | UNIV_MCTL_VCT;
-                else 
-                        mode |= UNIV_SCTL_EN | UNIV_SCTL_PWEN | UNIV_SCTL_PREN;
 
 #ifdef TSILL
@@ -546 +554 @@
                         cntrl&UNIV_MCTL_PGM ?   "Pgm" : "Dat",
                         cntrl&UNIV_MCTL_SUPER ? "Sup" : "Usr");
+                if ( cntrl & UNIV_MCTL_PWEN )
+                        uprintf(f,", PWEN");
         } else {
                 uprintf(f,"%s %s %s %s", 
@@ -552 +562 @@
                         cntrl&UNIV_SCTL_SUPER ? "Sup," : "    ",
                         cntrl&UNIV_SCTL_USER  ? "Usr" :  "");
+                if ( cntrl & UNIV_SCTL_PWEN )
+                        uprintf(f,", PWEN");
+                if ( cntrl & UNIV_SCTL_PREN )
+                        uprintf(f,", PREN");
         }
         uprintf(f,"\n");
@@ -591 +605 @@
                 return -1;
         }
-        if ( (cntrl & (ismaster ? UNIV_MCTL_AM_MASK : UNIV_SCTL_AM_MASK))
-            != offst )
+
+        if ( ! (VME_MODE_EXACT_MATCH & l->aspace) ) {
+                cntrl &= (ismaster ? UNIV_MCTL_AM_MASK : UNIV_SCTL_AM_MASK);
+                offst &= (ismaster ? UNIV_MCTL_AM_MASK : UNIV_SCTL_AM_MASK);
+        }
+
+        if ( cntrl != offst )
                 return 0; /* mode doesn't match requested AM */
 
@@ -1306 +1325 @@
                 if (status & UNIV_VIRQ_ERR) {
                                 /* TODO: log error message - RTEMS has no logger :-( */
-                        printk("vmeUniverse ISR: error read from STATID register; (level: %i) STATID: 0x%08x\n", lvl, status);
+#ifdef BSP_PIC_DO_EOI
+                        linten &= ~msk;
+#else
+                        vmeUniverseIntDisable(lvl);
+#endif
+                        printk("vmeUniverse ISR: error read from STATID register; (level: %i) STATID: 0x%08x -- DISABLING\n", lvl, status);
                 } else if (!(ip=universeHdlTbl[status & UNIV_VIRQ_STATID_MASK])) {
+#ifdef BSP_PIC_DO_EOI
+                        linten &= ~msk;
+#else
+                        vmeUniverseIntDisable(lvl);
+#endif
                                 /* TODO: log error message - RTEMS has no logger :-( */
-                        printk("vmeUniverse ISR: no handler installed for this vector; (level: %i) STATID: 0x%08x\n", lvl, status);
+                        printk("vmeUniverse ISR: no handler installed for this vector; (level: %i) STATID: 0x%08x -- DISABLING\n", lvl, status);
                 } else {
                                 /* dispatch handler, it must clear the IRQ at the device */

c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h

@@ -75 +75 @@
 #endif
 
-#endif
+/* Enables posted writes (and on a VME slave: prefetched reads, too) */
+#ifndef VME_AM_IS_MEMORY
+#define VME_AM_IS_MEMORY                        (1<<8)
+#endif
+
+#endif
+
+
+
+/* When looking for an address translation, ask for a match of VME_MODE_PWEN etc., too */
+#define VME_MODE_EXACT_MATCH            (1<<31)
 
 #include <stdarg.h>

c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h

@@ -59 +59 @@
 #endif
 
-/* Higher order bits are driver specific */
+/* Mask for standard address modifiers */
 
 #ifndef VME_AM_MASK
@@ -65 +65 @@
 #endif
 
+/* Hint that the a window is mapping memory; the 
+ * driver may assume it to be safe to enable decoupled
+ * cycles, caching and the like...
+ */
+#ifndef VME_AM_IS_MEMORY
+#define VME_AM_IS_MEMORY                        (1<<8)
 #endif
+
+/* Flags 1<<11 .. 1<<8  are reserved
+ * Flags 1<<12 .. 1<<31 are for driver specific options
+ */
+
+#endif