* Timer/Performance interrupt fixups @ 2007-06-21 11:59 chris 2007-06-21 11:59 ` [PATCH] Fix timer/performance interrupt detection chris 0 siblings, 1 reply; 5+ messages in thread From: chris @ 2007-06-21 11:59 UTC (permalink / raw) To: linux-mips There were a couple of problems with the patch you committed last night ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Fix timer/performance interrupt detection 2007-06-21 11:59 Timer/Performance interrupt fixups chris @ 2007-06-21 11:59 ` chris 2007-06-21 11:59 ` [PATCH] Count timer interrupts correctly chris 2007-06-21 12:20 ` [PATCH] Fix timer/performance interrupt detection Ralf Baechle 0 siblings, 2 replies; 5+ messages in thread From: chris @ 2007-06-21 11:59 UTC (permalink / raw) To: linux-mips; +Cc: Chris Dearman From: Chris Dearman <chris@mips.com> Signed-off-by: Chris Dearman <chris@mips.com> --- arch/mips/kernel/traps.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index b123364..3ea7863 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -1372,12 +1372,12 @@ void __init per_cpu_trap_init(void) */ if (cpu_has_mips_r2) { cp0_compare_irq = (read_c0_intctl () >> 29) & 7; - cp0_perfcount_irq = -1; - } else { - cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ; cp0_perfcount_irq = (read_c0_intctl () >> 26) & 7; - if (cp0_perfcount_irq != cp0_compare_irq) + if (cp0_perfcount_irq == cp0_compare_irq) cp0_perfcount_irq = -1; + } else { + cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ; + cp0_perfcount_irq = -1; } #ifdef CONFIG_MIPS_MT_SMTC -- 1.4.4.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] Count timer interrupts correctly. 2007-06-21 11:59 ` [PATCH] Fix timer/performance interrupt detection chris @ 2007-06-21 11:59 ` chris 2007-06-21 12:20 ` Ralf Baechle 2007-06-21 12:20 ` [PATCH] Fix timer/performance interrupt detection Ralf Baechle 1 sibling, 1 reply; 5+ messages in thread From: chris @ 2007-06-21 11:59 UTC (permalink / raw) To: linux-mips; +Cc: Chris Dearman From: Chris Dearman <chris@mips.com> Signed-off-by: Chris Dearman <chris@mips.com> --- arch/mips/kernel/smtc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 2e01147..046b03b 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c @@ -822,7 +822,7 @@ void ipi_decode(struct smtc_ipi *pipi) switch (type_copy) { case SMTC_CLOCK_TICK: irq_enter(); - kstat_this_cpu.irqs[MIPS_CPU_IRQ_BASE + cp0_perfcount_irq]++; + kstat_this_cpu.irqs[MIPS_CPU_IRQ_BASE + cp0_compare_irq]++; /* Invoke Clock "Interrupt" */ ipi_timer_latch[dest_copy] = 0; #ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG -- 1.4.4.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Count timer interrupts correctly. 2007-06-21 11:59 ` [PATCH] Count timer interrupts correctly chris @ 2007-06-21 12:20 ` Ralf Baechle 0 siblings, 0 replies; 5+ messages in thread From: Ralf Baechle @ 2007-06-21 12:20 UTC (permalink / raw) To: chris; +Cc: linux-mips On Thu, Jun 21, 2007 at 12:59:58PM +0100, chris@mips.com wrote: Applied also. Thanks Chris! Ralf ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fix timer/performance interrupt detection 2007-06-21 11:59 ` [PATCH] Fix timer/performance interrupt detection chris 2007-06-21 11:59 ` [PATCH] Count timer interrupts correctly chris @ 2007-06-21 12:20 ` Ralf Baechle 1 sibling, 0 replies; 5+ messages in thread From: Ralf Baechle @ 2007-06-21 12:20 UTC (permalink / raw) To: chris; +Cc: linux-mips On Thu, Jun 21, 2007 at 12:59:57PM +0100, chris@mips.com wrote: Applied. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-06-21 12:28 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-06-21 11:59 Timer/Performance interrupt fixups chris 2007-06-21 11:59 ` [PATCH] Fix timer/performance interrupt detection chris 2007-06-21 11:59 ` [PATCH] Count timer interrupts correctly chris 2007-06-21 12:20 ` Ralf Baechle 2007-06-21 12:20 ` [PATCH] Fix timer/performance interrupt detection Ralf Baechle
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox