diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-03 11:37:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-03 11:37:19 -0700 |
| commit | 97055a915720fe1aff9ac71c17fae60e929d4ed6 (patch) | |
| tree | d0ee48805cbec19b760a2ce9702bf3c3bc8bb8ce | |
| parent | ee3ece830f6db9837f7ac67008f532a8c1e755f4 (diff) | |
| parent | 8986d2f50e1a9ba63f64ccbf59181886aa7898c3 (diff) | |
| download | op-kernel-dev-97055a915720fe1aff9ac71c17fae60e929d4ed6.zip op-kernel-dev-97055a915720fe1aff9ac71c17fae60e929d4ed6.tar.gz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] cevt-txx9: Reset timer counter on initialization
[MIPS] IP22: Fix crashes due to wrong L1_CACHE_BYTES
[MIPS] IP32: Fix unexpected irq 71
| -rw-r--r-- | arch/mips/Kconfig | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/cevt-txx9.c | 3 | ||||
| -rw-r--r-- | arch/mips/sgi-ip32/ip32-irq.c | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e5a7c5d..24c5dee 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1006,7 +1006,7 @@ config BOOT_ELF32 config MIPS_L1_CACHE_SHIFT int default "4" if MACH_DECSTATION - default "7" if SGI_IP27 || SGI_IP28 || SNI_RM + default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM default "4" if PMC_MSP4200_EVAL default "5" diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c index 795cb8f..b5fc4eb 100644 --- a/arch/mips/kernel/cevt-txx9.c +++ b/arch/mips/kernel/cevt-txx9.c @@ -161,6 +161,9 @@ void __init txx9_tmr_init(unsigned long baseaddr) struct txx9_tmr_reg __iomem *tmrptr; tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg)); + /* Start once to make CounterResetEnable effective */ + __raw_writel(TXx9_TMTCR_CRE | TXx9_TMTCR_TCE, &tmrptr->tcr); + /* Stop and reset the counter */ __raw_writel(TXx9_TMTCR_CRE, &tmrptr->tcr); __raw_writel(0, &tmrptr->tisr); __raw_writel(0xffffffff, &tmrptr->cpra); diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index b0ea0e4..0d6b666 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c @@ -425,6 +425,11 @@ static void ip32_irq0(void) BUILD_BUG_ON(MACEISA_SERIAL2_RDMAOR_IRQ - MACEISA_AUDIO_SW_IRQ != 31); crime_int = crime->istat & crime_mask; + + /* crime sometime delivers spurious interrupts, ignore them */ + if (unlikely(crime_int == 0)) + return; + irq = MACE_VID_IN1_IRQ + __ffs(crime_int); if (crime_int & CRIME_MACEISA_INT_MASK) { |
