Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 70 insertions, 246 deletions

diff --git a/arch/blackfin/mach-common/dpmc.S b/arch/blackfin/mach-common/dpmc.S
index b80ddd8b232d..9d45aa3265b1 100644
--- a/arch/blackfin/mach-common/dpmc.S
+++ b/arch/blackfin/mach-common/dpmc.S
@@ -31,140 +31,6 @@
 #include <asm/blackfin.h>
 #include <asm/mach/irq.h>
 
-.text
-
-ENTRY(_unmask_wdog_wakeup_evt)
-        [--SP] = ( R7:0, P5:0 );
-#if defined(CONFIG_BF561)
-        P0.H = hi(SICA_IWR1);
-        P0.L = lo(SICA_IWR1);
-#elif defined(CONFIG_BF54x) || defined(CONFIG_BF52x)
-        P0.h = HI(SIC_IWR0);
-        P0.l = LO(SIC_IWR0);
-#else
-        P0.h = HI(SIC_IWR);
-        P0.l = LO(SIC_IWR);
-#endif
-        R7 = [P0];
-#if defined(CONFIG_BF561)
-        BITSET(R7, 27);
-#else
-        BITSET(R7,(IRQ_WATCH - IVG7));
-#endif
-        [P0] = R7;
-        SSYNC;
-
-        ( R7:0, P5:0 ) = [SP++];
-        RTS;
-
-.LWRITE_TO_STAT:
-        /* When watch dog timer is enabled, a write to STAT will load the
-         * contents of CNT to STAT
-         */
-        R7 = 0x0000(z);
-#if defined(CONFIG_BF561)
-        P0.h = HI(WDOGA_STAT);
-        P0.l = LO(WDOGA_STAT);
-#else
-        P0.h = HI(WDOG_STAT);
-        P0.l = LO(WDOG_STAT);
-#endif
-        [P0] = R7;
-        SSYNC;
-        JUMP .LSKIP_WRITE_TO_STAT;
-
-ENTRY(_program_wdog_timer)
-        [--SP] = ( R7:0, P5:0 );
-#if defined(CONFIG_BF561)
-        P0.h = HI(WDOGA_CNT);
-        P0.l = LO(WDOGA_CNT);
-#else
-        P0.h = HI(WDOG_CNT);
-        P0.l = LO(WDOG_CNT);
-#endif
-        [P0] = R0;
-        SSYNC;
-
-#if defined(CONFIG_BF561)
-        P0.h = HI(WDOGA_CTL);
-        P0.l = LO(WDOGA_CTL);
-#else
-        P0.h = HI(WDOG_CTL);
-        P0.l = LO(WDOG_CTL);
-#endif
-        R7 = W[P0](Z);
-        CC = BITTST(R7,1);
-        if !CC JUMP .LWRITE_TO_STAT;
-        CC = BITTST(R7,2);
-        if !CC JUMP .LWRITE_TO_STAT;
-
-.LSKIP_WRITE_TO_STAT:
-#if defined(CONFIG_BF561)
-        P0.h = HI(WDOGA_CTL);
-        P0.l = LO(WDOGA_CTL);
-#else
-        P0.h = HI(WDOG_CTL);
-        P0.l = LO(WDOG_CTL);
-#endif
-        R7 = W[P0](Z);
-        BITCLR(R7,1);   /* Enable GP event */
-        BITSET(R7,2);
-        W[P0] = R7.L;
-        SSYNC;
-        NOP;
-
-        R7 = W[P0](Z);
-        BITCLR(R7,4);   /* Enable the wdog counter */
-        W[P0] = R7.L;
-        SSYNC;
-
-        ( R7:0, P5:0 ) = [SP++];
-        RTS;
-
-ENTRY(_clear_wdog_wakeup_evt)
-        [--SP] = ( R7:0, P5:0 );
-
-#if defined(CONFIG_BF561)
-        P0.h = HI(WDOGA_CTL);
-        P0.l = LO(WDOGA_CTL);
-#else
-        P0.h = HI(WDOG_CTL);
-        P0.l = LO(WDOG_CTL);
-#endif
-        R7 = 0x0AD6(Z);
-        W[P0] = R7.L;
-        SSYNC;
-
-        R7 = W[P0](Z);
-        BITSET(R7,15);
-        W[P0] = R7.L;
-        SSYNC;
-
-        R7 = W[P0](Z);
-        BITSET(R7,1);
-        BITSET(R7,2);
-        W[P0] = R7.L;
-        SSYNC;
-
-        ( R7:0, P5:0 ) = [SP++];
-        RTS;
-
-ENTRY(_disable_wdog_timer)
-        [--SP] = ( R7:0, P5:0 );
-#if defined(CONFIG_BF561)
-        P0.h = HI(WDOGA_CTL);
-        P0.l = LO(WDOGA_CTL);
-#else
-        P0.h = HI(WDOG_CTL);
-        P0.l = LO(WDOG_CTL);
-#endif
-        R7 = 0xAD6(Z);
-        W[P0] = R7.L;
-        SSYNC;
-        ( R7:0, P5:0 ) = [SP++];
-        RTS;
-
-#if !defined(CONFIG_BF561)
 
 .section .l1.text
 
@@ -459,10 +325,12 @@ ENTRY(_set_sic_iwr)
         RTS;
 
 ENTRY(_set_rtc_istat)
+#ifndef CONFIG_BF561
         P0.H = hi(RTC_ISTAT);
         P0.L = lo(RTC_ISTAT);
         w[P0] = R0.L;
         SSYNC;
+#endif
         RTS;
 
 ENTRY(_test_pll_locked)
@@ -473,4 +341,3 @@ ENTRY(_test_pll_locked)
         CC = BITTST(R0,5);
         IF !CC JUMP 1b;
         RTS;
-#endif
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 2cbb7a0bc38e..cee54cebbc65 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -1369,7 +1369,7 @@ ENTRY(_sys_call_table)
         .long _sys_epoll_pwait
         .long _sys_utimensat
         .long _sys_signalfd
-        .long _sys_ni_syscall
+        .long _sys_timerfd_create
         .long _sys_eventfd      /* 350 */
         .long _sys_pread64
         .long _sys_pwrite64
@@ -1378,6 +1378,9 @@ ENTRY(_sys_call_table)
         .long _sys_get_robust_list      /* 355 */
         .long _sys_fallocate
         .long _sys_semtimedop
+        .long _sys_timerfd_settime
+        .long _sys_timerfd_gettime
+
         .rept NR_syscalls-(.-_sys_call_table)/4
         .long _sys_ni_syscall
         .endr
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 880595afe98d..225ef14af75e 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -74,7 +74,7 @@ unsigned long bfin_sic_iwr[3];	/* Up to 3 SIC_IWRx registers */
 #endif
 
 struct ivgx {
-        /* irq number for request_irq, available in mach-bf533/irq.h */
+        /* irq number for request_irq, available in mach-bf5xx/irq.h */
         unsigned int irqno;
         /* corresponding bit in the SIC_ISR register */
         unsigned int isrflag;
@@ -86,7 +86,6 @@ struct ivg_slice {
         struct ivgx *istop;
 } ivg7_13[IVG13 - IVG7 + 1];
 
-static void search_IAR(void);
 
 /*
  * Search SIC_IAR and fill tables with the irqvalues
@@ -120,10 +119,10 @@ static void __init search_IAR(void)
 }
 
 /*
- * This is for BF533 internal IRQs
+ * This is for core internal IRQs
  */
 
-static void ack_noop(unsigned int irq)
+static void bfin_ack_noop(unsigned int irq)
 {
         /* Dummy function.  */
 }
@@ -156,11 +155,11 @@ static void bfin_internal_mask_irq(unsigned int irq)
 {
 #ifdef CONFIG_BF53x
         bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() &
-                             ~(1 << (irq - (IRQ_CORETMR + 1))));
+                             ~(1 << SIC_SYSIRQ(irq)));
 #else
         unsigned mask_bank, mask_bit;
-        mask_bank = (irq - (IRQ_CORETMR + 1)) / 32;
-        mask_bit = (irq - (IRQ_CORETMR + 1)) % 32;
+        mask_bank = SIC_SYSIRQ(irq) / 32;
+        mask_bit = SIC_SYSIRQ(irq) % 32;
         bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) &
                              ~(1 << mask_bit));
 #endif
@@ -171,11 +170,11 @@ static void bfin_internal_unmask_irq(unsigned int irq)
 {
 #ifdef CONFIG_BF53x
         bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() |
-                             (1 << (irq - (IRQ_CORETMR + 1))));
+                             (1 << SIC_SYSIRQ(irq)));
 #else
         unsigned mask_bank, mask_bit;
-        mask_bank = (irq - (IRQ_CORETMR + 1)) / 32;
-        mask_bit = (irq - (IRQ_CORETMR + 1)) % 32;
+        mask_bank = SIC_SYSIRQ(irq) / 32;
+        mask_bit = SIC_SYSIRQ(irq) % 32;
         bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) |
                              (1 << mask_bit));
 #endif
@@ -187,8 +186,8 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)
 {
         unsigned bank, bit;
         unsigned long flags;
-        bank = (irq - (IRQ_CORETMR + 1)) / 32;
-        bit = (irq - (IRQ_CORETMR + 1)) % 32;
+        bank = SIC_SYSIRQ(irq) / 32;
+        bit = SIC_SYSIRQ(irq) % 32;
 
         local_irq_save(flags);
 
@@ -204,15 +203,18 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)
 #endif
 
 static struct irq_chip bfin_core_irqchip = {
-        .ack = ack_noop,
+        .ack = bfin_ack_noop,
         .mask = bfin_core_mask_irq,
         .unmask = bfin_core_unmask_irq,
 };
 
 static struct irq_chip bfin_internal_irqchip = {
-        .ack = ack_noop,
+        .ack = bfin_ack_noop,
         .mask = bfin_internal_mask_irq,
         .unmask = bfin_internal_unmask_irq,
+        .mask_ack = bfin_internal_mask_irq,
+        .disable = bfin_internal_mask_irq,
+        .enable = bfin_internal_unmask_irq,
 #ifdef CONFIG_PM
         .set_wake = bfin_internal_set_wake,
 #endif
@@ -221,38 +223,23 @@ static struct irq_chip bfin_internal_irqchip = {
 #ifdef BF537_GENERIC_ERROR_INT_DEMUX
 static int error_int_mask;
 
-static void bfin_generic_error_ack_irq(unsigned int irq)
-{
-
-}
-
 static void bfin_generic_error_mask_irq(unsigned int irq)
 {
         error_int_mask &= ~(1L << (irq - IRQ_PPI_ERROR));
 
-        if (!error_int_mask) {
-                local_irq_disable();
-                bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() &
-                                     ~(1 << (IRQ_GENERIC_ERROR -
-                                        (IRQ_CORETMR + 1))));
-                SSYNC();
-                local_irq_enable();
-        }
+        if (!error_int_mask)
+                bfin_internal_mask_irq(IRQ_GENERIC_ERROR);
 }
 
 static void bfin_generic_error_unmask_irq(unsigned int irq)
 {
-        local_irq_disable();
-        bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() | 1 <<
-                             (IRQ_GENERIC_ERROR - (IRQ_CORETMR + 1)));
-        SSYNC();
-        local_irq_enable();
-
+        bfin_internal_unmask_irq(IRQ_GENERIC_ERROR);
         error_int_mask |= 1L << (irq - IRQ_PPI_ERROR);
 }
 
 static struct irq_chip bfin_generic_error_irqchip = {
-        .ack = bfin_generic_error_ack_irq,
+        .ack = bfin_ack_noop,
+        .mask_ack = bfin_generic_error_mask_irq,
         .mask = bfin_generic_error_mask_irq,
         .unmask = bfin_generic_error_unmask_irq,
 };
@@ -608,7 +595,7 @@ static struct pin_int_t *pint[NR_PINT_SYS_IRQS] = {
         (struct pin_int_t *)PINT3_MASK_SET,
 };
 
-unsigned short get_irq_base(u8 bank, u8 bmap)
+inline unsigned short get_irq_base(u8 bank, u8 bmap)
 {
 
         u16 irq_base;
@@ -969,17 +956,12 @@ int __init init_arch_irq(void)
 #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561)
         bfin_write_SIC_IMASK0(SIC_UNMASK_ALL);
         bfin_write_SIC_IMASK1(SIC_UNMASK_ALL);
-        bfin_write_SIC_IWR0(IWR_ENABLE_ALL);
-        bfin_write_SIC_IWR1(IWR_ENABLE_ALL);
 # ifdef CONFIG_BF54x
         bfin_write_SIC_IMASK2(SIC_UNMASK_ALL);
-        bfin_write_SIC_IWR2(IWR_ENABLE_ALL);
 # endif
 #else
         bfin_write_SIC_IMASK(SIC_UNMASK_ALL);
-        bfin_write_SIC_IWR(IWR_ENABLE_ALL);
 #endif
-        SSYNC();
 
         local_irq_disable();
 
@@ -1001,90 +983,53 @@ int __init init_arch_irq(void)
                         set_irq_chip(irq, &bfin_core_irqchip);
                 else
                         set_irq_chip(irq, &bfin_internal_irqchip);
-#ifdef BF537_GENERIC_ERROR_INT_DEMUX
-                if (irq != IRQ_GENERIC_ERROR) {
-#endif
 
-                        switch (irq) {
+                switch (irq) {
 #if defined(CONFIG_BF53x)
-                        case IRQ_PROG_INTA:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
+                case IRQ_PROG_INTA:
 # if defined(BF537_FAMILY) && !(defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE))
-                        case IRQ_MAC_RX:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
+                case IRQ_MAC_RX:
 # endif
 #elif defined(CONFIG_BF54x)
-                        case IRQ_PINT0:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
-                        case IRQ_PINT1:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
-                        case IRQ_PINT2:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
-                        case IRQ_PINT3:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
+                case IRQ_PINT0:
+                case IRQ_PINT1:
+                case IRQ_PINT2:
+                case IRQ_PINT3:
 #elif defined(CONFIG_BF52x)
-                        case IRQ_PORTF_INTA:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
-                        case IRQ_PORTG_INTA:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
-                        case IRQ_PORTH_INTA:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
+                case IRQ_PORTF_INTA:
+                case IRQ_PORTG_INTA:
+                case IRQ_PORTH_INTA:
 #elif defined(CONFIG_BF561)
-                        case IRQ_PROG0_INTA:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
-                        case IRQ_PROG1_INTA:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
-                        case IRQ_PROG2_INTA:
-                                set_irq_chained_handler(irq,
-                                                        bfin_demux_gpio_irq);
-                                break;
+                case IRQ_PROG0_INTA:
+                case IRQ_PROG1_INTA:
+                case IRQ_PROG2_INTA:
 #endif
-                        default:
-                                set_irq_handler(irq, handle_simple_irq);
-                                break;
-                        }
-
+                        set_irq_chained_handler(irq,
+                                                bfin_demux_gpio_irq);
+                        break;
 #ifdef BF537_GENERIC_ERROR_INT_DEMUX
-                } else {
+                case IRQ_GENERIC_ERROR:
                         set_irq_handler(irq, bfin_demux_error_irq);
-                }
+
+                        break;
 #endif
+                default:
+                        set_irq_handler(irq, handle_simple_irq);
+                        break;
+                }
         }
+
 #ifdef BF537_GENERIC_ERROR_INT_DEMUX
-        for (irq = IRQ_PPI_ERROR; irq <= IRQ_UART1_ERROR; irq++) {
-                set_irq_chip(irq, &bfin_generic_error_irqchip);
-                set_irq_handler(irq, handle_level_irq);
-        }
+        for (irq = IRQ_PPI_ERROR; irq <= IRQ_UART1_ERROR; irq++)
+                set_irq_chip_and_handler(irq, &bfin_generic_error_irqchip,
+                                         handle_level_irq);
 #endif
 
-        for (irq = GPIO_IRQ_BASE; irq < NR_IRQS; irq++) {
+        /* if configured as edge, then will be changed to do_edge_IRQ */
+        for (irq = GPIO_IRQ_BASE; irq < NR_IRQS; irq++)
+                set_irq_chip_and_handler(irq, &bfin_gpio_irqchip,
+                                         handle_level_irq);
 
-                set_irq_chip(irq, &bfin_gpio_irqchip);
-                /* if configured as edge, then will be changed to do_edge_IRQ */
-                set_irq_handler(irq, handle_level_irq);
-        }
 
         bfin_write_IMASK(0);
         CSYNC();
@@ -1106,6 +1051,16 @@ int __init init_arch_irq(void)
             IMASK_IVG14 | IMASK_IVG13 | IMASK_IVG12 | IMASK_IVG11 |
             IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 | IMASK_IVGHW;
 
+#if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561)
+        bfin_write_SIC_IWR0(IWR_ENABLE_ALL);
+        bfin_write_SIC_IWR1(IWR_ENABLE_ALL);
+# ifdef CONFIG_BF54x
+        bfin_write_SIC_IWR2(IWR_ENABLE_ALL);
+# endif
+#else
+        bfin_write_SIC_IWR(IWR_ENABLE_ALL);
+#endif
+
         return 0;
 }
 
@@ -1122,7 +1077,6 @@ void do_irq(int vec, struct pt_regs *fp)
 #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561)
                 unsigned long sic_status[3];
 
-                SSYNC();
                 sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();
                 sic_status[1] = bfin_read_SIC_ISR1() & bfin_read_SIC_IMASK1();
 #ifdef CONFIG_BF54x
@@ -1138,7 +1092,7 @@ void do_irq(int vec, struct pt_regs *fp)
                 }
 #else
                 unsigned long sic_status;
-                SSYNC();
+
                 sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();
 
                 for (;; ivg++) {