diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/generic/patches-3.10/003-MIPS-Enable-interrupts-in-arch_cpu_idle.patch | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/generic/patches-3.10/003-MIPS-Enable-interrupts-in-arch_cpu_idle.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/003-MIPS-Enable-interrupts-in-arch_cpu_idle.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/003-MIPS-Enable-interrupts-in-arch_cpu_idle.patch b/target/linux/generic/patches-3.10/003-MIPS-Enable-interrupts-in-arch_cpu_idle.patch new file mode 100644 index 000000000..2ffc75e25 --- /dev/null +++ b/target/linux/generic/patches-3.10/003-MIPS-Enable-interrupts-in-arch_cpu_idle.patch @@ -0,0 +1,45 @@ +From 4fec4a2d70efa390268d1098bd4b008dda0e399e Mon Sep 17 00:00:00 2001 +From: Thomas Gleixner <tglx@linutronix.de> +Date: Thu, 2 May 2013 13:33:52 +0000 +Subject: [PATCH 3/3] MIPS: Enable interrupts in arch_cpu_idle() + +commit cdbedc61c8 (mips: Use generic idle loop) broke MIPS as I did +not realize that MIPS wants to invoke the wait instructions with +interrupts enabled. Don't ask why that works correctly; Ralf suggested +to get thoroughly drunk before even thinking about it. Looking sober +at commit c65a5480 ([MIPS] Fix potential latency problem due to +non-atomic cpu_wait) is not recommended. + +Enable interrupts in arch_cpu_idle() on mips to repair the issue. + +Reported-and-tested-by: Jonas Gorski <jogo@openwrt.org> +Reported-by: EunBong Song <eunb.song@samsung.com> +Booze-recommended-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +--- + arch/mips/kernel/process.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/arch/mips/kernel/process.c ++++ b/arch/mips/kernel/process.c +@@ -51,13 +51,18 @@ void arch_cpu_idle_dead(void) + } + #endif + +-void arch_cpu_idle(void) ++static void smtc_idle_hook(void) + { + #ifdef CONFIG_MIPS_MT_SMTC + extern void smtc_idle_loop_hook(void); +- + smtc_idle_loop_hook(); + #endif ++} ++ ++void arch_cpu_idle(void) ++{ ++ local_irq_enable(); ++ smtc_idle_hook(); + if (cpu_wait) + (*cpu_wait)(); + else |