Merge branch 'fixes' into cleanups

[oweals/u-boot.git] / cpu / mpc85xx / interrupts.c

diff --git a/cpu/mpc85xx/interrupts.c b/cpu/mpc85xx/interrupts.c
index 4fe1facf457f4a3d2c0a72ee741c561b4f9e1ab8..4ef83950d11a34fc196886e53acf9ff89919a3c7 100644 (file)
--- a/cpu/mpc85xx/interrupts.c
+++ b/cpu/mpc85xx/interrupts.c
@@ -31,90 +31,46 @@
 #include <watchdog.h>
 #include <command.h>
 #include <asm/processor.h>
-#include <ppc_asm.tmpl>
 
-unsigned decrementer_count;            /* count value for 1e6/HZ microseconds */
-
-static __inline__ unsigned long get_msr(void)
-{
-       unsigned long msr;
-
-       asm volatile("mfmsr %0" : "=r" (msr) :);
-       return msr;
-}
-
-static __inline__ void set_msr(unsigned long msr)
-{
-       asm volatile("mtmsr %0" : : "r" (msr));
-       asm volatile("isync");
-}
-
-static __inline__ unsigned long get_dec (void)
-{
-       unsigned long val;
-
-       asm volatile ("mfdec %0":"=r" (val):);
-
-       return val;
-}
-
-
-static __inline__ void set_dec (unsigned long val)
-{
-       if (val)
-               asm volatile ("mtdec %0"::"r" (val));
-}
-
-void enable_interrupts (void)
-{
-       set_msr (get_msr() | MSR_EE);
-}
-
-/* returns flag if MSR_EE was set before */
-int disable_interrupts (void)
-{
-       ulong msr = get_msr();
-       set_msr (msr & ~MSR_EE);
-       return ((msr & MSR_EE) != 0);
-}
-
-int interrupt_init (void)
+int interrupt_init_cpu(unsigned long *decrementer_count)
 {
-       volatile ccsr_pic_t *pic = (void *)(CFG_MPC85xx_PIC_ADDR);
+       volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR);
 
        pic->gcr = MPC85xx_PICGCR_RST;
-       while (pic->gcr & MPC85xx_PICGCR_RST);
+       while (pic->gcr & MPC85xx_PICGCR_RST)
+               ;
        pic->gcr = MPC85xx_PICGCR_M;
-       decrementer_count = get_tbclk() / CFG_HZ;
+
+       *decrementer_count = get_tbclk() / CONFIG_SYS_HZ;
+
+       /* PIE is same as DIE, dec interrupt enable */
        mtspr(SPRN_TCR, TCR_PIE);
-       set_dec (decrementer_count);
-       set_msr (get_msr () | MSR_EE);
 
 #ifdef CONFIG_INTERRUPTS
        pic->iivpr1 = 0x810001; /* 50220 enable ecm interrupts */
-       debug("iivpr1@%x = %x\n",&pic->iivpr1, pic->iivpr1);
+       debug("iivpr1@%x = %x\n", (uint)&pic->iivpr1, pic->iivpr1);
 
        pic->iivpr2 = 0x810002; /* 50240 enable ddr interrupts */
-       debug("iivpr2@%x = %x\n",&pic->iivpr2, pic->iivpr2);
+       debug("iivpr2@%x = %x\n", (uint)&pic->iivpr2, pic->iivpr2);
 
        pic->iivpr3 = 0x810003; /* 50260 enable lbc interrupts */
-       debug("iivpr3@%x = %x\n",&pic->iivpr3, pic->iivpr3);
+       debug("iivpr3@%x = %x\n", (uint)&pic->iivpr3, pic->iivpr3);
 
 #ifdef CONFIG_PCI1
        pic->iivpr8 = 0x810008; /* enable pci1 interrupts */
-       debug("iivpr8@%x = %x\n",&pic->iivpr8, pic->iivpr8);
+       debug("iivpr8@%x = %x\n", (uint)&pic->iivpr8, pic->iivpr8);
 #endif
 #if defined(CONFIG_PCI2) || defined(CONFIG_PCIE2)
        pic->iivpr9 = 0x810009; /* enable pci1 interrupts */
-       debug("iivpr9@%x = %x\n",&pic->iivpr9, pic->iivpr9);
+       debug("iivpr9@%x = %x\n", (uint)&pic->iivpr9, pic->iivpr9);
 #endif
 #ifdef CONFIG_PCIE1
        pic->iivpr10 = 0x81000a;        /* enable pcie1 interrupts */
-       debug("iivpr10@%x = %x\n",&pic->iivpr10, pic->iivpr10);
+       debug("iivpr10@%x = %x\n", (uint)&pic->iivpr10, pic->iivpr10);
 #endif
 #ifdef CONFIG_PCIE3
        pic->iivpr11 = 0x81000b;        /* enable pcie3 interrupts */
-       debug("iivpr11@%x = %x\n",&pic->iivpr11, pic->iivpr11);
+       debug("iivpr11@%x = %x\n", (uint)&pic->iivpr11, pic->iivpr11);
 #endif
 
        pic->ctpr=0;            /* 40080 clear current task priority register */
@@ -123,9 +79,7 @@ int interrupt_init (void)
        return (0);
 }
 
-/*
- * Install and free a interrupt handler. Not implemented yet.
- */
+/* Install and free a interrupt handler. Not implemented yet. */
 
 void
 irq_install_handler(int vec, interrupt_handler_t *handler, void *arg)
@@ -139,55 +93,16 @@ irq_free_handler(int vec)
        return;
 }
 
-/****************************************************************************/
-
-
-volatile ulong timestamp = 0;
-
-/*
- * timer_interrupt - gets called when the decrementer overflows,
- * with interrupts disabled.
- * Trivial implementation - no need to be really accurate.
- */
-void timer_interrupt(struct pt_regs *regs)
+void timer_interrupt_cpu(struct pt_regs *regs)
 {
-       timestamp++;
-       set_dec (decrementer_count);
+       /* PIS is same as DIS, dec interrupt status */
        mtspr(SPRN_TSR, TSR_PIS);
-#if defined(CONFIG_WATCHDOG)
-       if ((timestamp % 1000) == 0)
-               reset_85xx_watchdog();
-#endif /* CONFIG_WATCHDOG */
-}
-
-void reset_timer (void)
-{
-       timestamp = 0;
-}
-
-ulong get_timer (ulong base)
-{
-       return (timestamp - base);
-}
-
-void set_timer (ulong t)
-{
-       timestamp = t;
 }
 
 #if defined(CONFIG_CMD_IRQ)
-
-/*******************************************************************************
- *
- * irqinfo - print information about PCI devices,not implemented.
- *
- */
-int
-do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+/* irqinfo - print information about PCI devices,not implemented. */
+int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       printf ("\nInterrupt-unsupported:\n");
-
        return 0;
 }
-
 #endif