diff options
| author | John Crispin <john@openwrt.org> | 2010-12-12 22:57:16 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2010-12-12 22:57:16 +0000 |
| commit | 9f47e80bb30bed05ebcdfe671d4f2a9e9c7bfe55 (patch) | |
| tree | 3d80c2524b0e73b5f7c9982eca4fe9301efdf75a /target/linux/lantiq/patches/000-mips-bad-intctl.patch | |
| parent | f590b304ef7d22242e08c86866cbb37927f0a404 (diff) | |
| download | upstream-9f47e80bb30bed05ebcdfe671d4f2a9e9c7bfe55.tar.gz upstream-9f47e80bb30bed05ebcdfe671d4f2a9e9c7bfe55.tar.bz2 upstream-9f47e80bb30bed05ebcdfe671d4f2a9e9c7bfe55.zip | |
adds new lantiq kernel. once the codebase is fully tested and know to be working on all the devices previously supported by ifxmips, we will drop ifxmips support.
SVN-Revision: 24526
Diffstat (limited to 'target/linux/lantiq/patches/000-mips-bad-intctl.patch')
| -rw-r--r-- | target/linux/lantiq/patches/000-mips-bad-intctl.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches/000-mips-bad-intctl.patch b/target/linux/lantiq/patches/000-mips-bad-intctl.patch new file mode 100644 index 0000000000..7c0f52db06 --- /dev/null +++ b/target/linux/lantiq/patches/000-mips-bad-intctl.patch @@ -0,0 +1,35 @@ +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c +@@ -1496,7 +1496,18 @@ void __cpuinit per_cpu_trap_init(void) + if (cpu_has_mips_r2) { + cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP; + cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7; ++ ++ if (!cp0_compare_irq) ++ cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ; ++ + cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7; ++ ++ if (!cp0_perfcount_irq) ++ cp0_perfcount_irq = CP0_LEGACY_PERFCNT_IRQ; ++ ++ if (arch_fixup_c0_irqs) ++ arch_fixup_c0_irqs(); ++ + if (cp0_perfcount_irq == cp0_compare_irq) + cp0_perfcount_irq = -1; + } else { +--- a/arch/mips/include/asm/irq.h ++++ b/arch/mips/include/asm/irq.h +@@ -133,9 +133,11 @@ extern void free_irqno(unsigned int irq) + * IE7. Since R2 their number has to be read from the c0_intctl register. + */ + #define CP0_LEGACY_COMPARE_IRQ 7 ++#define CP0_LEGACY_PERFCNT_IRQ 7 + + extern int cp0_compare_irq; + extern int cp0_compare_irq_shift; + extern int cp0_perfcount_irq; ++extern void __weak arch_fixup_c0_irqs(void); + + #endif /* _ASM_IRQ_H */ |