vserver 1.9.5.x5

[linux-2.6.git] / arch / ppc / syslib / ibm44x_common.c

diff --git a/arch/ppc/syslib/ibm44x_common.c b/arch/ppc/syslib/ibm44x_common.c
index 76d18d3..7612e06 100644 (file)
--- a/arch/ppc/syslib/ibm44x_common.c
+++ b/arch/ppc/syslib/ibm44x_common.c
@@ -3,8 +3,8 @@
  *
  * PPC44x system library
  *
- * Matt Porter <mporter@mvista.com>
- * Copyright 2002-2003 MontaVista Software Inc.
+ * Matt Porter <mporter@kernel.crashing.org>
+ * Copyright 2002-2005 MontaVista Software Inc.
  *
  * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
  * Copyright (c) 2003, 2004 Zultys Technologies
@@ -16,15 +16,19 @@
  *
  */
 #include <linux/config.h>
+#include <linux/time.h>
 #include <linux/types.h>
 #include <linux/serial.h>
+#include <linux/module.h>
 
-#include <asm/param.h>
 #include <asm/ibm44x.h>
 #include <asm/mmu.h>
 #include <asm/machdep.h>
 #include <asm/time.h>
 #include <asm/ppc4xx_pic.h>
+#include <asm/param.h>
+
+#include <syslib/gen550.h>
 
 phys_addr_t fixup_bigphys_addr(phys_addr_t addr, phys_addr_t size)
 {
@@ -35,15 +39,22 @@ phys_addr_t fixup_bigphys_addr(phys_addr_t addr, phys_addr_t size)
         * address in the 440's 36-bit address space.  Fix
         * them up with the appropriate ERPN
         */
-       if ((addr >= PPC44x_IO_LO) && (addr < PPC44x_IO_HI))
+       if ((addr >= PPC44x_IO_LO) && (addr <= PPC44x_IO_HI))
                page_4gb = PPC44x_IO_PAGE;
-       else if ((addr >= PPC44x_PCICFG_LO) && (addr < PPC44x_PCICFG_HI))
+       else if ((addr >= PPC44x_PCI0CFG_LO) && (addr <= PPC44x_PCI0CFG_HI))
+               page_4gb = PPC44x_PCICFG_PAGE;
+#ifdef CONFIG_440SP
+       else if ((addr >= PPC44x_PCI1CFG_LO) && (addr <= PPC44x_PCI1CFG_HI))
                page_4gb = PPC44x_PCICFG_PAGE;
-       else if ((addr >= PPC44x_PCIMEM_LO) && (addr < PPC44x_PCIMEM_HI))
+       else if ((addr >= PPC44x_PCI2CFG_LO) && (addr <= PPC44x_PCI2CFG_HI))
+               page_4gb = PPC44x_PCICFG_PAGE;
+#endif
+       else if ((addr >= PPC44x_PCIMEM_LO) && (addr <= PPC44x_PCIMEM_HI))
                page_4gb = PPC44x_PCIMEM_PAGE;
 
        return (page_4gb | addr);
 };
+EXPORT_SYMBOL(fixup_bigphys_addr);
 
 void __init ibm44x_calibrate_decr(unsigned int freq)
 {
@@ -139,64 +150,44 @@ static unsigned long __init ibm44x_find_end_of_memory(void)
        return mem_size;
 }
 
-static void __init ibm44x_init_irq(void)
-{
-       int i;
-
-       ppc4xx_pic_init();
-
-       for (i = 0; i < NR_IRQS; i++)
-               irq_desc[i].handler = ppc4xx_pic;
-}
-
-#ifdef CONFIG_SERIAL_TEXT_DEBUG
-#include <linux/serialP.h>
-#include <linux/serial_reg.h>
-#include <asm/serial.h>
-
-static struct serial_state rs_table[RS_TABLE_SIZE] = {
-       SERIAL_PORT_DFNS        /* Defined in <asm/serial.h> */
-};
-
-static void ibm44x_progress(char *s, unsigned short hex)
-{
-       volatile char c;
-       volatile unsigned long com_port;
-       u16 shift;
-
-       com_port = (unsigned long)rs_table[0].iomem_base;
-       shift = rs_table[0].iomem_reg_shift;
-
-       while ((c = *s++) != 0) {
-               while ((*((volatile unsigned char *)com_port +
-                               (UART_LSR << shift)) & UART_LSR_THRE) == 0)
-                       ;
-               *(volatile unsigned char *)com_port = c;
-
-       }
-
-       /* Send LF/CR to pretty up output */
-       while ((*((volatile unsigned char *)com_port +
-               (UART_LSR << shift)) & UART_LSR_THRE) == 0)
-               ;
-       *(volatile unsigned char *)com_port = '\r';
-       while ((*((volatile unsigned char *)com_port +
-               (UART_LSR << shift)) & UART_LSR_THRE) == 0)
-               ;
-       *(volatile unsigned char *)com_port = '\n';
-}
-#endif /* CONFIG_SERIAL_TEXT_DEBUG */
-
 void __init ibm44x_platform_init(void)
 {
-       ppc_md.init_IRQ = ibm44x_init_irq;
+       ppc_md.init_IRQ = ppc4xx_pic_init;
        ppc_md.find_end_of_memory = ibm44x_find_end_of_memory;
        ppc_md.restart = ibm44x_restart;
        ppc_md.power_off = ibm44x_power_off;
        ppc_md.halt = ibm44x_halt;
 
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
-       ppc_md.progress = ibm44x_progress;
+       ppc_md.progress = gen550_progress;
 #endif /* CONFIG_SERIAL_TEXT_DEBUG */
+#ifdef CONFIG_KGDB
+       ppc_md.kgdb_map_scc = gen550_kgdb_map_scc;
+#endif
+
+       /*
+        * The Abatron BDI JTAG debugger does not tolerate others
+        * mucking with the debug registers.
+        */
+#if !defined(CONFIG_BDI_SWITCH)
+       /* Enable internal debug mode */
+        mtspr(SPRN_DBCR0, (DBCR0_IDM));
+
+       /* Clear any residual debug events */
+       mtspr(SPRN_DBSR, 0xffffffff);
+#endif
 }
 
+/* Called from MachineCheckException */
+void platform_machine_check(struct pt_regs *regs)
+{
+       printk("PLB0: BEAR=0x%08x%08x ACR=  0x%08x BESR= 0x%08x\n",
+               mfdcr(DCRN_PLB0_BEARH), mfdcr(DCRN_PLB0_BEARL),
+               mfdcr(DCRN_PLB0_ACR),  mfdcr(DCRN_PLB0_BESR));
+       printk("POB0: BEAR=0x%08x%08x BESR0=0x%08x BESR1=0x%08x\n",
+               mfdcr(DCRN_POB0_BEARH), mfdcr(DCRN_POB0_BEARL),
+               mfdcr(DCRN_POB0_BESR0), mfdcr(DCRN_POB0_BESR1));
+       printk("OPB0: BEAR=0x%08x%08x BSTAT=0x%08x\n",
+               mfdcr(DCRN_OPB0_BEARH), mfdcr(DCRN_OPB0_BEARL),
+               mfdcr(DCRN_OPB0_BSTAT));
+}