Skip to content

Commit

Permalink
ARM: highbank: fix cache flush ordering for cpu hotplug
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Signed-off-by: Olof Johansson <[email protected]>
  • Loading branch information
Rob Herring authored and olofj committed Apr 18, 2013
1 parent 71bd98a commit 73053d9
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/arm/mach-highbank/hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

0 comments on commit 73053d9

Please sign in to comment.