49754ffef5
This commit changes the PMSU driver to no longer map itself the CPU reset registers, and instead call into the CPU reset driver to deassert the secondary CPUs for SMP booting. In order to provide Device Tree backward compatibility, the CPU reset driver is extended to not only support its official compatible string "marvell,armada-370-cpu-reset", but to also look at the PMSU compatible string "marvell,armada-370-xp-pmsu" to find the CPU reset registers address. This allows old Device Tree to work correctly with newer kernel versions. Therefore, the CPU reset driver implements the following logic: * If one of the normal compatible strings "marvell,armada-370-cpu-reset" is found, then we map its first memory resource as the CPU reset registers. * Otherwise, if none of the normal compatible strings have been found, we look for the "marvell,armada-370-xp-pmsu" compatible string, and we map the second memory as the CPU reset registers. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1397483433-25836-3-git-send-email-thomas.petazzoni@free-electrons.com Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
78 lines
1.8 KiB
C
78 lines
1.8 KiB
C
/*
|
|
* Power Management Service Unit(PMSU) support for Armada 370/XP platforms.
|
|
*
|
|
* Copyright (C) 2012 Marvell
|
|
*
|
|
* Yehuda Yitschak <yehuday@marvell.com>
|
|
* Gregory Clement <gregory.clement@free-electrons.com>
|
|
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*
|
|
* The Armada 370 and Armada XP SOCs have a power management service
|
|
* unit which is responsible for powering down and waking up CPUs and
|
|
* other SOC units
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/io.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/resource.h>
|
|
#include <asm/smp_plat.h>
|
|
#include "common.h"
|
|
#include "pmsu.h"
|
|
|
|
static void __iomem *pmsu_mp_base;
|
|
|
|
#define PMSU_BOOT_ADDR_REDIRECT_OFFSET(cpu) ((cpu * 0x100) + 0x24)
|
|
|
|
static struct of_device_id of_pmsu_table[] = {
|
|
{.compatible = "marvell,armada-370-xp-pmsu"},
|
|
{ /* end of list */ },
|
|
};
|
|
|
|
#ifdef CONFIG_SMP
|
|
int armada_xp_boot_cpu(unsigned int cpu_id, void *boot_addr)
|
|
{
|
|
int hw_cpu, ret;
|
|
|
|
if (!pmsu_mp_base) {
|
|
pr_warn("Can't boot CPU. PMSU is uninitialized\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
hw_cpu = cpu_logical_map(cpu_id);
|
|
|
|
writel(virt_to_phys(boot_addr), pmsu_mp_base +
|
|
PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu));
|
|
|
|
ret = mvebu_cpu_reset_deassert(hw_cpu);
|
|
if (ret) {
|
|
pr_warn("unable to boot CPU: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static int __init armada_370_xp_pmsu_init(void)
|
|
{
|
|
struct device_node *np;
|
|
|
|
np = of_find_matching_node(NULL, of_pmsu_table);
|
|
if (np) {
|
|
pr_info("Initializing Power Management Service Unit\n");
|
|
pmsu_mp_base = of_iomap(np, 0);
|
|
of_node_put(np);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
early_initcall(armada_370_xp_pmsu_init);
|