Changeset bf939b0 in rtems

Timestamp:

Jul 18, 2003, 5:05:39 PM (18 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

adc5f630

Parents:

552af999

Message:

2003-07-18 Till Straumann <strauman@…>

PR 415/bsps

• pci/detect_raven_bridge.c, startup/bspstart.c: This patch reverts enabling MCP interrupts for the motorola_powerpc BSPs. REASON: pci config space scanning (as e.g. done by the DEC Ethernet driver) would raise machine check exceptions.

Location:

c/src/lib/libbsp/powerpc/shared

Files:

• ChangeLog (modified) (1 diff)
• pci/detect_raven_bridge.c (modified) (3 diffs)
• startup/bspstart.c (modified) (1 diff)

c/src/lib/libbsp/powerpc/shared/ChangeLog

@@ +1 @@
+2003-07-18      Till Straumann <strauman@slac.stanford.edu>
+
+        PR 415/bsps
+        * pci/detect_raven_bridge.c, startup/bspstart.c:
+        This patch reverts enabling MCP interrupts for the motorola_powerpc
+        BSPs. REASON: pci config space scanning (as e.g. done by the DEC
+        Ethernet driver) would raise machine check exceptions.
+
 2003-07-16      Greg Menke <gregory.menke@gsfc.nasa.gov>
 

c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c

@@ -14 +14 @@
 #include <rtems/bspIo.h>
 
-SPR_RW(HID0)
-
 #define RAVEN_MPIC_IOSPACE_ENABLE       0x1
 #define RAVEN_MPIC_MEMSPACE_ENABLE      0x2
@@ -23 +21 @@
 #define RAVEN_CLEAR_EVENTS_MASK         0xf9000000
 
-#define RAVEN_MPIC_MEREN                0xfeff0020
-#define RAVEN_MPIC_MERST                0xfeff0024
-/* enable machine check on all conditions
- * EXCEPT for signalled master abort (which
- * can be caused by PCI configuration space
- * accesses to non-present devices)
- * - of course, this is sort of a hack :-(
- */
-#define MEREN_VAL                               0x2d00
+#define RAVEN_MPIC_MEREN                ((volatile unsigned *)0xfeff0020)
+#define RAVEN_MPIC_MERST                ((volatile unsigned *)0xfeff0024)
+/* enable machine check on all conditions */
+#define MEREN_VAL                               0x2f00
 
 #define pci BSP_pci_configuration
@@ -51 +44 @@
                                 printk("Enabling MCP generation on hostbridge errors\n");
                         out_be32(RAVEN_MPIC_MEREN, MEREN_VAL);
-                        _write_HID0(_read_HID0() | HID0_EMCP );
                 } else {
+                        out_be32(RAVEN_MPIC_MEREN, 0);
                         if ( !quiet && enableMCP ) {
                                 printk("leaving MCP interrupt disabled\n");

c/src/lib/libbsp/powerpc/shared/startup/bspstart.c

@@ -337 +337 @@
                                            residualCopy.VitalProductData.TimeBaseDivisor : 4000);
 
-  /* clear hostbridge errors and enable MCP */
-  _BSP_clear_hostbridge_errors(1/*enableMCP*/, 0/*quiet*/);
+  /* clear hostbridge errors but leave MCP disabled -
+   * PCI config space scanning code will trip otherwise :-(
+   */
+  _BSP_clear_hostbridge_errors(0 /* enableMCP */, 0/*quiet*/);