summaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-2.6.30/001-get_c0_compare_int_fix.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-01 22:14:16 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-01 22:14:16 +0000
commit04aff2e833edde651fb7b4792439d9e05fbfaee2 (patch)
tree2672dd55d0215ac2bc4abd34639c4b01eaee618a /target/linux/atheros/patches-2.6.30/001-get_c0_compare_int_fix.patch
parente83dfd3b1dfb43dfc9dd5995d9ccb946c2a3a31e (diff)
atheros: add working patches/config for 2.6.30
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16288 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.30/001-get_c0_compare_int_fix.patch')
-rw-r--r--target/linux/atheros/patches-2.6.30/001-get_c0_compare_int_fix.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-2.6.30/001-get_c0_compare_int_fix.patch b/target/linux/atheros/patches-2.6.30/001-get_c0_compare_int_fix.patch
new file mode 100644
index 000000000..0f6873ddc
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.30/001-get_c0_compare_int_fix.patch
@@ -0,0 +1,39 @@
+Fix the usage of get_c0_compare_int: override cp0_compare_irq if the returned
+value is in the MIPS CPU IRQ range to ensure that c0_compare_int_usable()
+still works.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/arch/mips/kernel/cevt-r4k.c
++++ b/arch/mips/kernel/cevt-r4k.c
+@@ -167,20 +167,23 @@ int __cpuinit r4k_clockevent_init(void)
+ struct clock_event_device *cd;
+ unsigned int irq;
+
+- if (!cpu_has_counter || !mips_hpt_frequency)
+- return -ENXIO;
+-
+- if (!c0_compare_int_usable())
+- return -ENXIO;
+-
+ /*
+ * With vectored interrupts things are getting platform specific.
+ * get_c0_compare_int is a hook to allow a platform to return the
+ * interrupt number of it's liking.
+ */
+ irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
+- if (get_c0_compare_int)
++ if (get_c0_compare_int) {
+ irq = get_c0_compare_int();
++ if ((irq >= MIPS_CPU_IRQ_BASE) && (irq < MIPS_CPU_IRQ_BASE + 8))
++ cp0_compare_irq = irq - MIPS_CPU_IRQ_BASE;
++ }
++
++ if (!cpu_has_counter || !mips_hpt_frequency)
++ return -ENXIO;
++
++ if (!c0_compare_int_usable())
++ return -ENXIO;
+
+ cd = &per_cpu(mips_clockevent_device, cpu);
+