Skip to content

Commit

Permalink
ARM: tegra: update the cache maintenance order for CPU shutdown
Browse files Browse the repository at this point in the history
Updating the cache maintenance order before CPU shutdown when doing CPU
hotplug.
The old order:
* clean L1 by flush_cache_all
* exit SMP
* CPU shutdown
Adapt to:
* disable L1 data cache by clear C bit
* clean L1 by v7_flush_dcache_louis
* exit SMP
* CPU shutdown

For CPU hotplug case, it's no need to do "flush_cache_all". And we should
disable L1 data cache before clean L1 data cache. Then leaving the SMP
coherency.

Signed-off-by: Joseph Lo <josephl@nvidia.com>
Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
  • Loading branch information
Joseph Lo authored and Stephen Warren committed Jan 28, 2013
1 parent 130bfed commit 5788661
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-tegra/hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ void __ref tegra_cpu_die(unsigned int cpu)
{
cpu = cpu_logical_map(cpu);

/* Flush the L1 data cache. */
flush_cache_all();
/* Clean L1 data cache */
tegra_disable_clean_inv_dcache();

/* Shut down the current CPU. */
tegra_hotplug_shutdown();
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/mach-tegra/sleep-tegra20.S
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
* should never return
*/
ENTRY(tegra20_hotplug_shutdown)
/* Turn off SMP coherency */
exit_smp r4, r5

/* Put this CPU down */
cpu_id r0
bl tegra20_cpu_shutdown
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/mach-tegra/sleep-tegra30.S
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
* Should never return.
*/
ENTRY(tegra30_hotplug_shutdown)
/* Turn off SMP coherency */
exit_smp r4, r5

/* Powergate this CPU */
mov r0, #TEGRA30_POWER_HOTPLUG_SHUTDOWN
bl tegra30_cpu_shutdown
Expand Down
4 changes: 3 additions & 1 deletion arch/arm/mach-tegra/sleep.S
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "flowctrl.h"
#include "sleep.h"

#ifdef CONFIG_PM_SLEEP
#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_PM_SLEEP)
/*
* tegra_disable_clean_inv_dcache
*
Expand All @@ -60,7 +60,9 @@ ENTRY(tegra_disable_clean_inv_dcache)

ldmfd sp!, {r0, r4-r5, r7, r9-r11, pc}
ENDPROC(tegra_disable_clean_inv_dcache)
#endif

#ifdef CONFIG_PM_SLEEP
/*
* tegra_sleep_cpu_finish(unsigned long v2p)
*
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-tegra/sleep.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
#else
void tegra_resume(void);
int tegra_sleep_cpu_finish(unsigned long);
void tegra_disable_clean_inv_dcache(void);

#ifdef CONFIG_HOTPLUG_CPU
void tegra20_hotplug_init(void);
Expand Down

0 comments on commit 5788661

Please sign in to comment.