aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-2.6.24
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-04-27 17:40:02 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-04-27 17:40:02 +0000
commit408fd8097fd7ff54f354ef5f4c29aacac6b7f064 (patch)
tree3faef9f7adfb7a6ad79e3cda2b6a8362d50984ce /target/linux/atheros/patches-2.6.24
parenta4dd1adf4a718f4eec35a561be068e2e8f885ae2 (diff)
downloadupstream-408fd8097fd7ff54f354ef5f4c29aacac6b7f064.tar.gz
upstream-408fd8097fd7ff54f354ef5f4c29aacac6b7f064.tar.bz2
upstream-408fd8097fd7ff54f354ef5f4c29aacac6b7f064.zip
enable 2.6.24 to run on ar53xx
SVN-Revision: 10957
Diffstat (limited to 'target/linux/atheros/patches-2.6.24')
-rw-r--r--target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch12
-rw-r--r--target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch49
2 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch b/target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch
new file mode 100644
index 0000000000..d5e60624b9
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch
@@ -0,0 +1,12 @@
+Index: linux-2.6.24.2/arch/mips/kernel/cevt-r4k.c
+===================================================================
+--- linux-2.6.24.2.orig/arch/mips/kernel/cevt-r4k.c
++++ linux-2.6.24.2/arch/mips/kernel/cevt-r4k.c
+@@ -205,6 +205,7 @@ static int c0_compare_int_usable(void)
+ while ((int)(read_c0_count() - cnt) <= 0)
+ ; /* Wait for expiry */
+
++ irq_disable_hazard();
+ if (!c0_compare_int_pending())
+ return 0;
+
diff --git a/target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch b/target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch
new file mode 100644
index 0000000000..05da3864ae
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch
@@ -0,0 +1,49 @@
+Index: linux-2.6.24.2/arch/mips/kernel/traps.c
+===================================================================
+--- linux-2.6.24.2.orig/arch/mips/kernel/traps.c
++++ linux-2.6.24.2/arch/mips/kernel/traps.c
+@@ -42,6 +42,7 @@
+ #include <asm/mmu_context.h>
+ #include <asm/types.h>
+ #include <asm/stacktrace.h>
++#include <asm/time.h>
+
+ extern asmlinkage void handle_int(void);
+ extern asmlinkage void handle_tlbm(void);
+@@ -1360,6 +1361,8 @@ void __init per_cpu_trap_init(void)
+ */
+ if (cpu_has_mips_r2) {
+ cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
++ if (get_c0_compare_irq)
++ cp0_compare_irq = get_c0_compare_irq();
+ cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
+ if (cp0_perfcount_irq == cp0_compare_irq)
+ cp0_perfcount_irq = -1;
+Index: linux-2.6.24.2/include/asm-mips/time.h
+===================================================================
+--- linux-2.6.24.2.orig/include/asm-mips/time.h
++++ linux-2.6.24.2/include/asm-mips/time.h
+@@ -60,6 +60,7 @@ extern int (*perf_irq)(void);
+ #ifdef CONFIG_CEVT_R4K
+ extern int mips_clockevent_init(void);
+ extern unsigned int __weak get_c0_compare_int(void);
++extern unsigned int __weak get_c0_compare_irq(void);
+ #else
+ static inline int mips_clockevent_init(void)
+ {
+Index: linux-2.6.24.2/arch/mips/atheros/board.c
+===================================================================
+--- linux-2.6.24.2.orig/arch/mips/atheros/board.c
++++ linux-2.6.24.2/arch/mips/atheros/board.c
+@@ -205,6 +205,11 @@ void (*board_time_init)(void);
+ void __init plat_time_init(void) {
+ board_time_init();
+ }
++
++unsigned int __init get_c0_counter_irq(void)
++{
++ return CP0_LEGACY_COMPARE_IRQ;
++}
+ #endif
+
+ void __init arch_init_irq(void)