diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-08-01 21:56:35 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-08-01 21:56:35 +0000 |
| commit | 6354265168e5c7b593c6579c3a211cd94e914f94 (patch) | |
| tree | 88a9fb14dbdecfde63ca70c49860b2269f0f3886 /target/linux/brcm63xx/patches-3.10/056-MIPS-BMIPS-Fix-thinko-to-release-slave-TP-from-reset.patch | |
| parent | 9762c605fe5fe106010f441c9daf42b08c1fcad8 (diff) | |
| download | upstream-6354265168e5c7b593c6579c3a211cd94e914f94.tar.gz upstream-6354265168e5c7b593c6579c3a211cd94e914f94.tar.bz2 upstream-6354265168e5c7b593c6579c3a211cd94e914f94.zip | |
brcm63xx: switch to 3.14
Now that BB is branched off, we can now switch to 3.14 and start
breaking stuff again.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41941 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/056-MIPS-BMIPS-Fix-thinko-to-release-slave-TP-from-reset.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.10/056-MIPS-BMIPS-Fix-thinko-to-release-slave-TP-from-reset.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/056-MIPS-BMIPS-Fix-thinko-to-release-slave-TP-from-reset.patch b/target/linux/brcm63xx/patches-3.10/056-MIPS-BMIPS-Fix-thinko-to-release-slave-TP-from-reset.patch deleted file mode 100644 index 58658290c3..0000000000 --- a/target/linux/brcm63xx/patches-3.10/056-MIPS-BMIPS-Fix-thinko-to-release-slave-TP-from-reset.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 976f39b139cdd06a88a5aadd8202b0c30cac9cda Mon Sep 17 00:00:00 2001 -From: Florian Fainelli <florian@openwrt.org> -Date: Wed, 17 Jul 2013 17:56:31 +0000 -Subject: [PATCH] MIPS: BMIPS: Fix thinko to release slave TP from reset - -Commit 4df715aa ["MIPS: BMIPS: support booting from physical CPU other -than 0"] introduced a thinko which will prevents slave CPUs from being -released from reset on systems where we boot from TP0. The problem is -that we are checking whether the slave CPU logical CPU map is 0, which -is never true for systems booting from TP0, so we do not release the -slave TP from reset and we are just stuck. Fix this by properly checking -that the CPU we intend to boot really is the physical slave CPU (logical -and physical value being 1). - -Signed-off-by: Florian Fainelli <florian@openwrt.org> -Cc: linux-mips@linux-mips.org -Cc: blogic@openwrt.org -Cc: jogo@openwrt.org -Cc: cernekee@gmail.com -Cc: Florian Fainelli <florian@openwrt.org> -Patchwork: https://patchwork.linux-mips.org/patch/5598/ -Signed-off-by: Ralf Baechle <ralf@linux-mips.org> ---- - arch/mips/kernel/smp-bmips.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/mips/kernel/smp-bmips.c -+++ b/arch/mips/kernel/smp-bmips.c -@@ -173,7 +173,7 @@ static void bmips_boot_secondary(int cpu - else { - #if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380) - /* Reset slave TP1 if booting from TP0 */ -- if (cpu_logical_map(cpu) == 0) -+ if (cpu_logical_map(cpu) == 1) - set_c0_brcm_cmt_ctrl(0x01); - #elif defined(CONFIG_CPU_BMIPS5000) - if (cpu & 0x01) |