diff options
author | Joseph Lo <josephl@nvidia.com> | 2013-01-03 01:43:00 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 12:21:48 -0500 |
commit | b811943160cf3b040341c50d23440cf6d68ae079 (patch) | |
tree | 62fead24de686ce4f8f12e27846d05fa6aa85089 /arch/arm/mach-tegra/hotplug.c | |
parent | 57886616ca7bff844a6427436d0c8faf74653f73 (diff) |
ARM: tegra: moving the clock gating procedure to tegra_cpu_kill
The tegra_cpu_die was be executed by the CPU itslf. So the clock gating
procedure won't be executed after the CPU hardware shutdown code. Moving
the clock gating procedure to tegra_cpu_kill that will be run by another
CPU after the CPU died.
Signed-off-by: Joseph Lo <josephl@nvidia.com>
Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/hotplug.c')
-rw-r--r-- | arch/arm/mach-tegra/hotplug.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c index d8c683b875d1..6a27de4001ee 100644 --- a/arch/arm/mach-tegra/hotplug.c +++ b/arch/arm/mach-tegra/hotplug.c | |||
@@ -19,6 +19,17 @@ | |||
19 | 19 | ||
20 | static void (*tegra_hotplug_shutdown)(void); | 20 | static void (*tegra_hotplug_shutdown)(void); |
21 | 21 | ||
22 | int tegra_cpu_kill(unsigned cpu) | ||
23 | { | ||
24 | cpu = cpu_logical_map(cpu); | ||
25 | |||
26 | /* Clock gate the CPU */ | ||
27 | tegra_wait_cpu_in_reset(cpu); | ||
28 | tegra_disable_cpu_clock(cpu); | ||
29 | |||
30 | return 1; | ||
31 | } | ||
32 | |||
22 | /* | 33 | /* |
23 | * platform-specific code to shutdown a CPU | 34 | * platform-specific code to shutdown a CPU |
24 | * | 35 | * |
@@ -26,18 +37,12 @@ static void (*tegra_hotplug_shutdown)(void); | |||
26 | */ | 37 | */ |
27 | void __ref tegra_cpu_die(unsigned int cpu) | 38 | void __ref tegra_cpu_die(unsigned int cpu) |
28 | { | 39 | { |
29 | cpu = cpu_logical_map(cpu); | ||
30 | |||
31 | /* Clean L1 data cache */ | 40 | /* Clean L1 data cache */ |
32 | tegra_disable_clean_inv_dcache(); | 41 | tegra_disable_clean_inv_dcache(); |
33 | 42 | ||
34 | /* Shut down the current CPU. */ | 43 | /* Shut down the current CPU. */ |
35 | tegra_hotplug_shutdown(); | 44 | tegra_hotplug_shutdown(); |
36 | 45 | ||
37 | /* Clock gate the CPU */ | ||
38 | tegra_wait_cpu_in_reset(cpu); | ||
39 | tegra_disable_cpu_clock(cpu); | ||
40 | |||
41 | /* Should never return here. */ | 46 | /* Should never return here. */ |
42 | BUG(); | 47 | BUG(); |
43 | } | 48 | } |