summaryrefslogtreecommitdiffstats
path: root/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-28 22:17:37 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-28 22:17:37 +0000
commit4ac203ac44a171514b2df6c36434ca78140ec539 (patch)
treef9c0860e6341d2d8c2f4c8f529bf96a6caddc0f5 /target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch
parentd27e7369f5ef5d9c92f94c086be55a33749e366f (diff)
[amazon] Add kernel 2.6.30 support
The device is booting and Ethernet is working, but nothing more was tested. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18589 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch')
-rw-r--r--target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch b/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch
new file mode 100644
index 000000000..5de5064dc
--- /dev/null
+++ b/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch
@@ -0,0 +1,32 @@
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -1542,7 +1542,16 @@ void __cpuinit per_cpu_trap_init(void)
+ */
+ if (cpu_has_mips_r2) {
+ cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
++ if (!cp0_compare_irq)
++ cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
++
+ cp0_perfcount_irq = (read_c0_intctl() >> 26) & 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
+@@ -157,8 +157,10 @@ 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_perfcount_irq;
++extern void __weak arch_fixup_c0_irqs(void);
+
+ #endif /* _ASM_IRQ_H */