aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-highbank/hotplug.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-04-17 10:46:52 -0500
committerOlof Johansson <olof@lixom.net>2013-04-18 09:37:46 -0700
commit73053d973dd6f56472309cffa5a5d15a62dd6f96 (patch)
tree0a53ecdc88999040c5c1d760740b06c80aed05b9 /arch/arm/mach-highbank/hotplug.c
parent71bd98aff05a644a2cfc3ac6ca848a586fa210b9 (diff)
downloadlinaro-lsk-73053d973dd6f56472309cffa5a5d15a62dd6f96.tar.gz
ARM: highbank: fix cache flush ordering for cpu hotplug
The L1 data cache flush needs to be after highbank_set_cpu_jump call which pollutes the cache with the l2x0_lock. This causes other cores to deadlock waiting for the l2x0_lock. Moving the flush of the entire data cache after highbank_set_cpu_jump fixes the problem. Use flush_cache_louis instead of flush_cache_all are that is sufficient to flush only the L1 data cache. flush_cache_louis did not exist when highbank_cpu_die was originally written. With PL310 errata 769419 enabled, a wmb is inserted into idle which takes the l2x0_lock. This makes the problem much more easily hit and causes reset to hang. Reported-by: Paolo Pisati <p.pisati@gmail.com> Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-highbank/hotplug.c')
-rw-r--r--arch/arm/mach-highbank/hotplug.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c
index f30c5284339..890cae23c12 100644
--- a/arch/arm/mach-highbank/hotplug.c
+++ b/arch/arm/mach-highbank/hotplug.c
@@ -28,13 +28,11 @@ extern void secondary_startup(void);
*/
void __ref highbank_cpu_die(unsigned int cpu)
{
- flush_cache_all();
-
highbank_set_cpu_jump(cpu, phys_to_virt(0));
- highbank_set_core_pwr();
- cpu_do_idle();
+ flush_cache_louis();
+ highbank_set_core_pwr();
- /* We should never return from idle */
- panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu);
+ while (1)
+ cpu_do_idle();
}