Skip to content

Commit

Permalink
[MIPS] BCM1480: Remove duplicate acknowledge of timer interrupt.
Browse files Browse the repository at this point in the history
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
ralfbaechle committed Nov 15, 2007
1 parent 07a80e4 commit a8401fa
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions arch/mips/sibyte/bcm1480/irq.c
Expand Up @@ -412,18 +412,6 @@ static void bcm1480_kgdb_interrupt(void)

extern void bcm1480_mailbox_interrupt(void);

static inline void dispatch_ip4(void)
{
int cpu = smp_processor_id();
int irq = K_BCM1480_INT_TIMER_0 + cpu;

/* Reset the timer */
__raw_writeq(M_SCD_TIMER_ENABLE|M_SCD_TIMER_MODE_CONTINUOUS,
IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));

do_IRQ(irq);
}

static inline void dispatch_ip2(void)
{
unsigned long long mask_h, mask_l;
Expand Down Expand Up @@ -451,6 +439,7 @@ static inline void dispatch_ip2(void)

asmlinkage void plat_irq_dispatch(void)
{
unsigned int cpu = smp_processor_id();
unsigned int pending;

#ifdef CONFIG_SIBYTE_BCM1480_PROF
Expand All @@ -467,7 +456,7 @@ asmlinkage void plat_irq_dispatch(void)
#endif

if (pending & CAUSEF_IP4)
dispatch_ip4();
do_IRQ(K_BCM1480_INT_TIMER_0 + cpu);
#ifdef CONFIG_SMP
else if (pending & CAUSEF_IP3)
bcm1480_mailbox_interrupt();
Expand Down

0 comments on commit a8401fa

Please sign in to comment.