This branch includes various cleanup of the core Tegra support. * Unification of the separate board-dt-tegra*.c files into a single tegra.c, now that everything is DT-driven and basically identical. * Use of_clk_get() in the Tegra clocksource driver so that clocks are described in DT rather than hard-coding clock names. * Some cleanup of the PMC-related code, with the aim that the PMC "driver" contains more of the code that touches PMC registers, rather than spreading PMC register accesses through other files. * Conversion of the "PMC" driver to acquire resources describe in device tree rather than hard-coding them. * Use of common code for the CPU sleep TLB invalidation. This branch is based on the previous fixes pull request. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJRXvqoAAoJEMzrak5tbycx4C0P/R6urrFPiYsPgith5+dpP6zv duAIAt0+chtEjva0veewQsBneRtTVNU115FQ/QZaMjSszAuIjC7nRa2iBa88FX1+ pzQYmRUrIupjeQ1WxxKYOILDXrMJNejbgoLu7kcHzWDEGsJmnwNh8kmiklvIJpa8 UDpz7RWhr6aWzrmiwj1cPF1/NJBl1nbx/TZCUo1u8yq46C9oVUi3DCdAnDVEsAzA vJaNSVWxeBOytd0jlLOiDAYtlrCtysCt/x7YjnN+9x7r99pzXHd0FOPOkKWBrOAN TOk+bhyXMFkucEk229A8xRYxhRynYecqYl48kF6Wt7HssrUJptk4qXZTZeDIyvZS 33YCRDjCJSrCkHjgDIVddtiz4+iZs6D7f/p9lZ+ikLfTyNXf0a+Wo5zRRyrrYJ2J Is4ZW0U3lvF4XmbNQRW3RhIGINSRhEY4POqygjO5h4fw7uAESAV3Pd3z/e59tMQi Dh3A1f+yIXDwYQmyN/nFVTjFcFPlCD6BW9G/u+R/5YkPSmGqw8cUUw4BlO244wHL NVF7VQBjtkELYPPsHnp6Pp+aJ0uxmmGcSNM56RHZERiMZlz1lv5CwT6b/6PqFEu6 IpXsAhV5SRvX+6Ky5mtb8A6JdNA6EuwVol3nmaNqFlbqHcR1HHyAsgCiTDkwkGYE Ggk40fKiWRcras9gRJI+ =3GM9 -----END PGP SIGNATURE----- Merge tag 'tegra-for-3.10-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup From Stephen Warren <swarren@wwwdotorg.org>: ARM: tegra: cleanup This branch includes various cleanup of the core Tegra support. * Unification of the separate board-dt-tegra*.c files into a single tegra.c, now that everything is DT-driven and basically identical. * Use of_clk_get() in the Tegra clocksource driver so that clocks are described in DT rather than hard-coding clock names. * Some cleanup of the PMC-related code, with the aim that the PMC "driver" contains more of the code that touches PMC registers, rather than spreading PMC register accesses through other files. * Conversion of the "PMC" driver to acquire resources describe in device tree rather than hard-coding them. * Use of common code for the CPU sleep TLB invalidation. This branch is based on the previous fixes pull request. * tag 'tegra-for-3.10-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: use setup_mm_for_reboot rather than explicit pgd switch ARM: tegra: replace the CPU power on function with PMC call ARM: tegra: pmc: add power on function for secondary CPUs ARM: tegra: pmc: convert PMC driver to support DT only ARM: tegra: fix the PMC compatible string in DT ARM: tegra: pmc: add specific compatible DT string for Tegra30 and Tegra114 ARM: tegra: refactor tegra{20,30}_boot_secondary clocksource: tegra: move to of_clk_get ARM: tegra: Unify Device tree board files ARM: tegra: Rename board-dt-tegra20.c to tegra.c ARM: tegra: Unify tegra{20,30,114}_init_early() Conflicts: drivers/clocksource/tegra20_timer.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
171 lines
4.5 KiB
C
171 lines
4.5 KiB
C
/*
|
|
* linux/arch/arm/mach-tegra/platsmp.c
|
|
*
|
|
* Copyright (C) 2002 ARM Ltd.
|
|
* All Rights Reserved
|
|
*
|
|
* Copyright (C) 2009 Palm
|
|
* 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/init.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/device.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/io.h>
|
|
#include <linux/clk/tegra.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/smp_scu.h>
|
|
#include <asm/smp_plat.h>
|
|
|
|
#include "fuse.h"
|
|
#include "flowctrl.h"
|
|
#include "reset.h"
|
|
#include "pmc.h"
|
|
|
|
#include "common.h"
|
|
#include "iomap.h"
|
|
|
|
static cpumask_t tegra_cpu_init_mask;
|
|
|
|
static void __cpuinit tegra_secondary_init(unsigned int cpu)
|
|
{
|
|
cpumask_set_cpu(cpu, &tegra_cpu_init_mask);
|
|
}
|
|
|
|
|
|
static int tegra20_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
cpu = cpu_logical_map(cpu);
|
|
|
|
/*
|
|
* Force the CPU into reset. The CPU must remain in reset when
|
|
* the flow controller state is cleared (which will cause the
|
|
* flow controller to stop driving reset if the CPU has been
|
|
* power-gated via the flow controller). This will have no
|
|
* effect on first boot of the CPU since it should already be
|
|
* in reset.
|
|
*/
|
|
tegra_put_cpu_in_reset(cpu);
|
|
|
|
/*
|
|
* Unhalt the CPU. If the flow controller was used to
|
|
* power-gate the CPU this will cause the flow controller to
|
|
* stop driving reset. The CPU will remain in reset because the
|
|
* clock and reset block is now driving reset.
|
|
*/
|
|
flowctrl_write_cpu_halt(cpu, 0);
|
|
|
|
tegra_enable_cpu_clock(cpu);
|
|
flowctrl_write_cpu_csr(cpu, 0); /* Clear flow controller CSR. */
|
|
tegra_cpu_out_of_reset(cpu);
|
|
return 0;
|
|
}
|
|
|
|
static int tegra30_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
int ret;
|
|
unsigned long timeout;
|
|
|
|
cpu = cpu_logical_map(cpu);
|
|
tegra_put_cpu_in_reset(cpu);
|
|
flowctrl_write_cpu_halt(cpu, 0);
|
|
|
|
/*
|
|
* The power up sequence of cold boot CPU and warm boot CPU
|
|
* was different.
|
|
*
|
|
* For warm boot CPU that was resumed from CPU hotplug, the
|
|
* power will be resumed automatically after un-halting the
|
|
* flow controller of the warm boot CPU. We need to wait for
|
|
* the confirmaiton that the CPU is powered then removing
|
|
* the IO clamps.
|
|
* For cold boot CPU, do not wait. After the cold boot CPU be
|
|
* booted, it will run to tegra_secondary_init() and set
|
|
* tegra_cpu_init_mask which influences what tegra30_boot_secondary()
|
|
* next time around.
|
|
*/
|
|
if (cpumask_test_cpu(cpu, &tegra_cpu_init_mask)) {
|
|
timeout = jiffies + msecs_to_jiffies(50);
|
|
do {
|
|
if (tegra_pmc_cpu_is_powered(cpu))
|
|
goto remove_clamps;
|
|
udelay(10);
|
|
} while (time_before(jiffies, timeout));
|
|
}
|
|
|
|
/*
|
|
* The power status of the cold boot CPU is power gated as
|
|
* default. To power up the cold boot CPU, the power should
|
|
* be un-gated by un-toggling the power gate register
|
|
* manually.
|
|
*/
|
|
if (!tegra_pmc_cpu_is_powered(cpu)) {
|
|
ret = tegra_pmc_cpu_power_on(cpu);
|
|
if (ret)
|
|
return ret;
|
|
|
|
/* Wait for the power to come up. */
|
|
timeout = jiffies + msecs_to_jiffies(100);
|
|
while (tegra_pmc_cpu_is_powered(cpu)) {
|
|
if (time_after(jiffies, timeout))
|
|
return -ETIMEDOUT;
|
|
udelay(10);
|
|
}
|
|
}
|
|
|
|
remove_clamps:
|
|
/* CPU partition is powered. Enable the CPU clock. */
|
|
tegra_enable_cpu_clock(cpu);
|
|
udelay(10);
|
|
|
|
/* Remove I/O clamps. */
|
|
ret = tegra_pmc_cpu_remove_clamping(cpu);
|
|
if (ret)
|
|
return ret;
|
|
|
|
udelay(10);
|
|
|
|
flowctrl_write_cpu_csr(cpu, 0); /* Clear flow controller CSR. */
|
|
tegra_cpu_out_of_reset(cpu);
|
|
return 0;
|
|
}
|
|
|
|
static int __cpuinit tegra_boot_secondary(unsigned int cpu,
|
|
struct task_struct *idle)
|
|
{
|
|
if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && tegra_chip_id == TEGRA20)
|
|
return tegra20_boot_secondary(cpu, idle);
|
|
if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC) && tegra_chip_id == TEGRA30)
|
|
return tegra30_boot_secondary(cpu, idle);
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
static void __init tegra_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
/* Always mark the boot CPU (CPU0) as initialized. */
|
|
cpumask_set_cpu(0, &tegra_cpu_init_mask);
|
|
|
|
if (scu_a9_has_base())
|
|
scu_enable(IO_ADDRESS(scu_a9_get_base()));
|
|
}
|
|
|
|
struct smp_operations tegra_smp_ops __initdata = {
|
|
.smp_prepare_cpus = tegra_smp_prepare_cpus,
|
|
.smp_secondary_init = tegra_secondary_init,
|
|
.smp_boot_secondary = tegra_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_kill = tegra_cpu_kill,
|
|
.cpu_die = tegra_cpu_die,
|
|
.cpu_disable = tegra_cpu_disable,
|
|
#endif
|
|
};
|