Changeset 95273a6 in rtems for c/src/lib/libbsp/powerpc/shared

Timestamp:

01/03/00 14:06:42 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

db941670

Parents:

d5c4681e

Message:

Combination of coverhd.h cleanup and MVME23xx/MCP750 patch from Eric Valette
<valette@…> and Jay Kulpinski <jskulpin@…>.

Location:

c/src/lib/libbsp/powerpc/shared

Files:

• include/bsp.h (modified) (1 diff)
• irq/irq_init.c (modified) (2 diffs)
• start/start.S (modified) (4 diffs)
• startup/bspstart.c (modified) (1 diff)

c/src/lib/libbsp/powerpc/shared/include/bsp.h

@@ -33 +33 @@
  * Total memory using RESIDUAL DATA
  */
-unsigned int BSP_mem_size;
+extern unsigned int BSP_mem_size;
 /*
  * PCI Bus Frequency
  */
-unsigned int BSP_bus_frequency;
+extern unsigned int BSP_bus_frequency;
 /*
  * processor clock frequency
  */
-unsigned int BSP_processor_frequency;
+extern unsigned int BSP_processor_frequency;
 /*
  * Time base divisior (how many tick for 1 second).
  */
-unsigned int BSP_time_base_divisor;
+extern unsigned int BSP_time_base_divisor;
+
+#define BSP_Convert_decrementer( _value ) \
+  ((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value)))
 
 extern rtems_configuration_table  BSP_Configuration;

c/src/lib/libbsp/powerpc/shared/irq/irq_init.c

@@ -5 +5 @@
  *
  *  CopyRight (C) 1999 valette@crf.canon.fr
+ *
+ * Enhanced by Jay Kulpinski <jskulpin@eng01.gdds.com>
+ * to make it valid for MVME2300 Motorola boards.
  *
  *  The license and distribution terms for this file may be
@@ -250 +253 @@
   printk("Going to initialize the PCI/ISA bridge IRQ related setting (VIA 82C586)\n");
 #endif
-  if ( (currentBoard == MESQUITE) ) {
+  if ( currentBoard == MESQUITE ) {
     VIA_isa_bridge_interrupts_setup();
+    known_cpi_isa_bridge = 1;
+  }
+  if ( currentBoard == MVME_2300 ) {
+    /* nothing to do for W83C553 bridge */
     known_cpi_isa_bridge = 1;
   }

c/src/lib/libbsp/powerpc/shared/start/start.S

@@ -50 +50 @@
  *   r7: End of command line string
  *
+ *   The Prep boot loader insure that the MMU is currently off...
+ *
  */
         
@@ -57 +59 @@
         mr      r28,r6
         mr      r27,r7
+        /*
+         * Make sure we have nothing in BATS and TLB
+         */
+        bl      clear_bats
+        bl      flush_tlbs
 /*
  * Use the first pair of BAT registers to map the 1st 64MB
@@ -64 +71 @@
         ori     r11,r11,0x7fe           /* set up BAT registers for 604 */
         li      r8,2                    /* R/W access */
+        isync
         mtspr   DBAT0L,r8               /* N.B. 6xx (not 601) have valid */
         mtspr   DBAT0U,r11              /* bit in upper BAT register */
@@ -130 +138 @@
         mtctr   r30
         bctr    
+
+/* 
+ * An undocumented "feature" of 604e requires that the v bit
+ * be cleared before changing BAT values.
+ *
+ * Also, newer IBM firmware does not clear bat3 and 4 so
+ * this makes sure it's done.
+ *  -- Cort 
+ */
+clear_bats:
+        li      r20,0
+        mfspr   r9,PVR
+        rlwinm  r9,r9,16,16,31          /* r9 = 1 for 601, 4 for 604 */
+        cmpwi   r9, 1
+        SYNC
+        beq     1f
+        mtspr   DBAT0U,r20
+        mtspr   DBAT0L,r20      
+        mtspr   DBAT1U,r20
+        mtspr   DBAT1L,r20
+        mtspr   DBAT2U,r20
+        mtspr   DBAT2L,r20      
+        mtspr   DBAT3U,r20
+        mtspr   DBAT3L,r20
+1:      
+        mtspr   IBAT0U,r20
+        mtspr   IBAT0L,r20
+        mtspr   IBAT1U,r20
+        mtspr   IBAT1L,r20
+        mtspr   IBAT2U,r20
+        mtspr   IBAT2L,r20
+        mtspr   IBAT3U,r20
+        mtspr   IBAT3L,r20
+        SYNC    
+        blr
+
+flush_tlbs:
+        lis     r20, 0x1000
+1:      addic.  r20, r20, -0x1000
+        tlbie   r20
+        blt     1b
+        sync
+        blr
+        

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

@@ -234 +234 @@
    * provided by the RAVEN
    */
-  setdbat(3, 0xfeff0000, 0xfeff0000, 0x10000, IO_PAGE);
-
+  setdbat(3, 0xf0000000, 0xf0000000, 0x10000000, IO_PAGE);
   select_console(CONSOLE_LOG);