Merge commit 'u-boot/master' into for-1.3.1

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

diff --git a/cpu/mpc86xx/interrupts.c b/cpu/mpc86xx/interrupts.c
index a8bcb98b816c16c2378f7892c2378249da62f2c8..d9f634fdab89c4f70ed92595801641e4ab3507cc 100644 (file)
--- a/cpu/mpc86xx/interrupts.c
+++ b/cpu/mpc86xx/interrupts.c
@@ -8,7 +8,7 @@
  * (C) Copyright 2003 Motorola Inc. (MPC85xx port)
  * Xianghua Xiao (X.Xiao@motorola.com)
  *
- * (C) Copyright 2004 Freescale Semiconductor. (MPC86xx Port)
+ * (C) Copyright 2004, 2007 Freescale Semiconductor. (MPC86xx Port)
  * Jeff Brown
  * Srikanth Srinivasan (srikanth.srinivasan@freescale.com)
  *
@@ -41,7 +41,7 @@ unsigned long decrementer_count;    /* count value for 1e6/HZ microseconds */
 unsigned long timestamp;
 
 
-static __inline__ unsigned long get_msr (void)
+static __inline__ unsigned long get_msr(void)
 {
        unsigned long msr;
 
@@ -50,12 +50,12 @@ static __inline__ unsigned long get_msr (void)
        return msr;
 }
 
-static __inline__ void set_msr (unsigned long msr)
+static __inline__ void set_msr(unsigned long msr)
 {
        asm volatile ("mtmsr %0"::"r" (msr));
 }
 
-static __inline__ unsigned long get_dec (void)
+static __inline__ unsigned long get_dec(void)
 {
        unsigned long val;
 
@@ -64,58 +64,87 @@ static __inline__ unsigned long get_dec (void)
        return val;
 }
 
-
-static __inline__ void set_dec (unsigned long val)
+static __inline__ void set_dec(unsigned long val)
 {
        if (val)
                asm volatile ("mtdec %0"::"r" (val));
 }
 
 /* interrupt is not supported yet */
-int interrupt_init_cpu (unsigned *decrementer_count)
+int interrupt_init_cpu(unsigned long *decrementer_count)
 {
        return 0;
 }
 
-
-int interrupt_init (void)
+int interrupt_init(void)
 {
        int ret;
 
+       volatile immap_t *immr = (immap_t *)CFG_IMMR;
+       immr->im_pic.gcr = MPC86xx_PICGCR_RST;
+       while (immr->im_pic.gcr & MPC86xx_PICGCR_RST);
+       immr->im_pic.gcr = MPC86xx_PICGCR_MODE;
+
        /* call cpu specific function from $(CPU)/interrupts.c */
-       ret = interrupt_init_cpu (&decrementer_count);
+       ret = interrupt_init_cpu(&decrementer_count);
 
        if (ret)
                return ret;
 
-       decrementer_count = get_tbclk()/CFG_HZ;
-       debug("interrupt init: tbclk() = %d MHz, decrementer_count = %d\n", (get_tbclk()/1000000), decrementer_count);
+       decrementer_count = get_tbclk() / CFG_HZ;
+       debug("interrupt init: tbclk() = %d MHz, decrementer_count = %ld\n",
+             (get_tbclk() / 1000000),
+             decrementer_count);
+
+       set_dec(decrementer_count);
+
+       set_msr(get_msr() | MSR_EE);
+
+       debug("MSR = 0x%08lx, Decrementer reg = 0x%08lx\n",
+             get_msr(),
+             get_dec());
 
-       set_dec (decrementer_count);
+#ifdef CONFIG_INTERRUPTS
+       volatile ccsr_pic_t *pic = &immr->im_pic;
 
-       set_msr (get_msr () | MSR_EE);
+       pic->iivpr1 = 0x810001; /* 50220 enable mcm interrupts */
+       debug("iivpr1@%x = %x\n", &pic->iivpr1, pic->iivpr1);
 
-       debug("MSR = 0x%08lx, Decrementer reg = 0x%08lx\n", get_msr(), get_dec());
+       pic->iivpr2 = 0x810002; /* 50240 enable ddr interrupts */
+       debug("iivpr2@%x = %x\n", &pic->iivpr2, pic->iivpr2);
+
+       pic->iivpr3 = 0x810003; /* 50260 enable lbc interrupts */
+       debug("iivpr3@%x = %x\n", &pic->iivpr3, pic->iivpr3);
+
+#if defined(CONFIG_PCI1) || defined(CONFIG_PCIE1)
+       pic->iivpr8 = 0x810008; /* enable pcie1 interrupts */
+       debug("iivpr8@%x = %x\n", &pic->iivpr8, pic->iivpr8);
+#endif
+#if defined(CONFIG_PCI2) || defined(CONFIG_PCIE2)
+       pic->iivpr9 = 0x810009; /* enable pcie2 interrupts */
+       debug("iivpr9@%x = %x\n", &pic->iivpr9, pic->iivpr9);
+#endif
+
+       pic->ctpr = 0;  /* 40080 clear current task priority register */
+#endif
 
        return 0;
 }
 
-
-void enable_interrupts (void)
+void enable_interrupts(void)
 {
-       set_msr (get_msr () | MSR_EE);
+       set_msr(get_msr() | MSR_EE);
 }
 
 /* returns flag if MSR_EE was set before */
-int disable_interrupts (void)
+int disable_interrupts(void)
 {
-       ulong msr = get_msr ();
+       ulong msr = get_msr();
 
-       set_msr (msr & ~MSR_EE);
+       set_msr(msr & ~MSR_EE);
        return (msr & MSR_EE) != 0;
 }
 
-
 void increment_timestamp(void)
 {
        timestamp++;
@@ -126,52 +155,47 @@ void increment_timestamp(void)
  * with interrupts disabled.
  * Trivial implementation - no need to be really accurate.
  */
-void
-timer_interrupt_cpu (struct pt_regs *regs)
+void timer_interrupt_cpu(struct pt_regs *regs)
 {
        /* nothing to do here */
 }
 
-
-void timer_interrupt (struct pt_regs *regs)
+void timer_interrupt(struct pt_regs *regs)
 {
        /* call cpu specific function from $(CPU)/interrupts.c */
-       timer_interrupt_cpu (regs);
+       timer_interrupt_cpu(regs);
 
        timestamp++;
 
-       ppcDcbf(&timestamp);
-
        /* Restore Decrementer Count */
-       set_dec (decrementer_count);
+       set_dec(decrementer_count);
 
 #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
        if ((timestamp % (CFG_WATCHDOG_FREQ)) == 0)
-               WATCHDOG_RESET ();
-#endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
+               WATCHDOG_RESET();
+#endif /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
 
 #ifdef CONFIG_STATUS_LED
-       status_led_tick (timestamp);
+       status_led_tick(timestamp);
 #endif /* CONFIG_STATUS_LED */
 
 #ifdef CONFIG_SHOW_ACTIVITY
-       board_show_activity (timestamp);
+       board_show_activity(timestamp);
 #endif /* CONFIG_SHOW_ACTIVITY */
 
-
 }
 
-void reset_timer (void)
+void reset_timer(void)
 {
        timestamp = 0;
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
        return timestamp - base;
 }
 
-void set_timer (ulong t)
+void set_timer(ulong t)
 {
        timestamp = t;
 }
@@ -180,24 +204,20 @@ void set_timer (ulong t)
  * Install and free a interrupt handler. Not implemented yet.
  */
 
-void
-irq_install_handler(int vec, interrupt_handler_t *handler, void *arg)
+void irq_install_handler(int vec, interrupt_handler_t *handler, void *arg)
 {
 }
 
-void
-irq_free_handler(int vec)
+void irq_free_handler(int vec)
 {
 }
 
-
 /*
  * irqinfo - print information about PCI devices,not implemented.
  */
-int
-do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       printf ("\nInterrupt-unsupported:\n");
+       printf("\nInterrupt-unsupported:\n");
 
        return 0;
 }
@@ -205,14 +225,7 @@ do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 /*
  * Handle external interrupts
  */
-void
-external_interrupt(struct pt_regs *regs)
+void external_interrupt(struct pt_regs *regs)
 {
        puts("external_interrupt (oops!)\n");
 }
-
-
-
-
-
-