diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-10 15:08:28 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-10 15:08:28 +0000 |
| commit | aed622fd2cccaac076436139e74fe408f6f1d9d7 (patch) | |
| tree | 7206261baf65bf8906b2dd2c2b57e5c0e41f2817 /target/linux/amazon/patches-2.6.37/000-mips-bad-intctl.patch | |
| parent | 077377a294aa659cd11c6ba52d05382de9d0b0e0 (diff) | |
| download | upstream-aed622fd2cccaac076436139e74fe408f6f1d9d7.tar.gz upstream-aed622fd2cccaac076436139e74fe408f6f1d9d7.tar.bz2 upstream-aed622fd2cccaac076436139e74fe408f6f1d9d7.zip | |
amazon: Upgrade amazon target to kernel 2.6.37
This was just a little bit tested on an SAMSUNG SMT-G3020 and pci and usb do not work like before.
SVN-Revision: 26576
Diffstat (limited to 'target/linux/amazon/patches-2.6.37/000-mips-bad-intctl.patch')
| -rw-r--r-- | target/linux/amazon/patches-2.6.37/000-mips-bad-intctl.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/amazon/patches-2.6.37/000-mips-bad-intctl.patch b/target/linux/amazon/patches-2.6.37/000-mips-bad-intctl.patch new file mode 100644 index 0000000000..f89e078e70 --- /dev/null +++ b/target/linux/amazon/patches-2.6.37/000-mips-bad-intctl.patch @@ -0,0 +1,33 @@ +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c +@@ -1578,7 +1578,16 @@ 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 +@@ -138,9 +138,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 */ |