Commit 73053d97 authored by Rob Herring's avatar Rob Herring Committed by Olof Johansson

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: default avatarPaolo Pisati <p.pisati@gmail.com>
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 71bd98af
...@@ -28,13 +28,11 @@ extern void secondary_startup(void); ...@@ -28,13 +28,11 @@ extern void secondary_startup(void);
*/ */
void __ref highbank_cpu_die(unsigned int cpu) void __ref highbank_cpu_die(unsigned int cpu)
{ {
flush_cache_all();
highbank_set_cpu_jump(cpu, phys_to_virt(0)); 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 */ while (1)
panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu); cpu_do_idle();
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment