b811943160
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>
74 lines
1.5 KiB
C
74 lines
1.5 KiB
C
/*
|
|
*
|
|
* Copyright (C) 2002 ARM Ltd.
|
|
* All Rights Reserved
|
|
* Copyright (c) 2010, 2012 NVIDIA Corporation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/smp.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/smp_plat.h>
|
|
|
|
#include "sleep.h"
|
|
#include "tegra_cpu_car.h"
|
|
|
|
static void (*tegra_hotplug_shutdown)(void);
|
|
|
|
int tegra_cpu_kill(unsigned cpu)
|
|
{
|
|
cpu = cpu_logical_map(cpu);
|
|
|
|
/* Clock gate the CPU */
|
|
tegra_wait_cpu_in_reset(cpu);
|
|
tegra_disable_cpu_clock(cpu);
|
|
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* platform-specific code to shutdown a CPU
|
|
*
|
|
* Called with IRQs disabled
|
|
*/
|
|
void __ref tegra_cpu_die(unsigned int cpu)
|
|
{
|
|
/* Clean L1 data cache */
|
|
tegra_disable_clean_inv_dcache();
|
|
|
|
/* Shut down the current CPU. */
|
|
tegra_hotplug_shutdown();
|
|
|
|
/* Should never return here. */
|
|
BUG();
|
|
}
|
|
|
|
int tegra_cpu_disable(unsigned int cpu)
|
|
{
|
|
/*
|
|
* we don't allow CPU 0 to be shutdown (it is still too special
|
|
* e.g. clock tick interrupts)
|
|
*/
|
|
return cpu == 0 ? -EPERM : 0;
|
|
}
|
|
|
|
#ifdef CONFIG_ARCH_TEGRA_2x_SOC
|
|
extern void tegra20_hotplug_shutdown(void);
|
|
void __init tegra20_hotplug_init(void)
|
|
{
|
|
tegra_hotplug_shutdown = tegra20_hotplug_shutdown;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_TEGRA_3x_SOC
|
|
extern void tegra30_hotplug_shutdown(void);
|
|
void __init tegra30_hotplug_init(void)
|
|
{
|
|
tegra_hotplug_shutdown = tegra30_hotplug_shutdown;
|
|
}
|
|
#endif
|