aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-11-28 22:17:37 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-11-28 22:17:37 +0000
commit2ee2679ac97098e9cf394ca4e78d2cc6ac5fad85 (patch)
treea94ddbd1439f5a86a7e15ba5c920a1ce039636ba /target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch
parent9714c8b6425d6fe28b7aac6fbdcb207c05409835 (diff)
downloadupstream-2ee2679ac97098e9cf394ca4e78d2cc6ac5fad85.tar.gz
upstream-2ee2679ac97098e9cf394ca4e78d2cc6ac5fad85.tar.bz2
upstream-2ee2679ac97098e9cf394ca4e78d2cc6ac5fad85.zip
Add kernel 2.6.30 support
The device is booting and Ethernet is working, but nothing more was tested. SVN-Revision: 18589
Diffstat (limited to 'target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch')
-rw-r--r--target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch b/target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch
new file mode 100644
index 0000000000..ac44c308fa
--- /dev/null
+++ b/target/linux/amazon/patches-2.6.30/010-mips_clocksource_init_war.patch
@@ -0,0 +1,33 @@
+--- a/arch/mips/kernel/cevt-r4k.c
++++ b/arch/mips/kernel/cevt-r4k.c
+@@ -21,6 +21,22 @@
+
+ #ifndef CONFIG_MIPS_MT_SMTC
+
++/*
++ * Compare interrupt can be routed and latched outside the core,
++ * so a single execution hazard barrier may not be enough to give
++ * it time to clear as seen in the Cause register. 4 time the
++ * pipeline depth seems reasonably conservative, and empirically
++ * works better in configurations with high CPU/bus clock ratios.
++ */
++
++#define compare_change_hazard() \
++ do { \
++ irq_disable_hazard(); \
++ irq_disable_hazard(); \
++ irq_disable_hazard(); \
++ irq_disable_hazard(); \
++ } while (0)
++
+ static int mips_next_event(unsigned long delta,
+ struct clock_event_device *evt)
+ {
+@@ -30,6 +46,7 @@ static int mips_next_event(unsigned long
+ cnt = read_c0_count();
+ cnt += delta;
+ write_c0_compare(cnt);
++ compare_change_hazard();
+ res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
+ return res;
+ }