![Linus Torvalds](/assets/img/avatar_default.png)
This is the bulk of new SoC enablement and other platform changes for 3.17: * Samsung S5PV210 has been converted to DT and multiplatform * Clock drivers and bindings for some of the lower-end i.MX 1/2 platforms * Kirkwood, one of the popular Marvell platforms, is folded into the mvebu platform code, removing mach-kirkwood. * Hwmod data for TI AM43xx and DRA7 platforms. * More additions of Renesas shmobile platform support * Removal of plat-samsung contents that can be removed with S5PV210 being multiplatform/DT-enabled and the other two old platforms being removed. New platforms (most with only basic support right now): * Hisilicon X5HD2 settop box chipset is introduced * Mediatek MT6589 (mobile chipset) is introduced * Broadcom BCM7xxx settop box chipset is introduced + as usual a lot other pieces all over the platform code. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJT5Dp+AAoJEIwa5zzehBx3w1sP/0vjT/LQOmC8Lv8RW2Ley2ua hNu3HcNPnT/N40JEdU9YNv3q0fdxGgcfKj011CNN+49zPSUf1xduk2wfCAk9yV50 8Sbt1PfDGm1YyUugGN420CzI431pPoM1OGXHZHkAmg+2J286RtUi3NckB//QDbCY QhEjhpYc9SXhAOCGwmB4ab7thOljOFSPzKTLMTu3+PNI5zRPRgkDkt6w9XlsAYmB nuR271BnzsROkMzAjycwaJ3kdim7wqrMRfk8g96o0jHSF5qf4zsT5uWYYAjTxdUQ 8Ajz6zjeHe4+95TwTDcq+lCX6rDLZgwkvCAc6hFbeg0uR7Dyek0h6XMEYtwdjaiU KNPwOENrYdENNDAGRpkFp1x4h/rY9Plfru0bBo5o6t7aPBvmNeCDzRtlTtLiUNDV dG8sfDMtrS/wFHVjylDSQ60Mb+wuW0XneC8D7chY/iRhIllUYi6YXXvt+/tH5C20 oYDOWqqcDFSb0sJhE5pn4KBV82ZaHx9jMBWGLl+erg2sDX/SK8SxOkLqKYZKtKB5 0leOGE3Y+C70xt3G9HftLz2sAvvt+C8UPsApPT+dHNE401TWJOYx6LphPkQKjeeK P1iwKi+It3l+FaBypgJy/LeMQRy7EyvDBK2I5WoVL/R2qq14EmP1ui3Tthjj0bhq tBBof6P9c8OnRVj1Lz3R =5TJ6 -----END PGP SIGNATURE----- Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform changes from Olof Johansson: "This is the bulk of new SoC enablement and other platform changes for 3.17: - Samsung S5PV210 has been converted to DT and multiplatform - Clock drivers and bindings for some of the lower-end i.MX 1/2 platforms - Kirkwood, one of the popular Marvell platforms, is folded into the mvebu platform code, removing mach-kirkwood - Hwmod data for TI AM43xx and DRA7 platforms - More additions of Renesas shmobile platform support - Removal of plat-samsung contents that can be removed with S5PV210 being multiplatform/DT-enabled and the other two old platforms being removed New platforms (most with only basic support right now): - Hisilicon X5HD2 settop box chipset is introduced - Mediatek MT6589 (mobile chipset) is introduced - Broadcom BCM7xxx settop box chipset is introduced + as usual a lot other pieces all over the platform code" * tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (240 commits) ARM: hisi: remove smp from machine descriptor power: reset: move hisilicon reboot code ARM: dts: Add hix5hd2-dkb dts file. ARM: debug: Rename Hi3716 to HIX5HD2 ARM: hisi: enable hix5hd2 SoC ARM: hisi: add ARCH_HISI MAINTAINERS: add entry for Broadcom ARM STB architecture ARM: brcmstb: select GISB arbiter and interrupt drivers ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs ARM: configs: enable SMP in bcm_defconfig ARM: add SMP support for Broadcom mobile SoCs Documentation: arm: misc updates to Marvell EBU SoC status Documentation: arm: add URLs to public datasheets for the Marvell Armada XP SoC ARM: mvebu: fix build without platforms selected ARM: mvebu: add cpuidle support for Armada 38x ARM: mvebu: add cpuidle support for Armada 370 cpuidle: mvebu: add Armada 38x support cpuidle: mvebu: add Armada 370 support cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7 ARM: mvebu: export the SCU address ...
330 lines
7.5 KiB
C
330 lines
7.5 KiB
C
/*
|
|
* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
|
|
* http://www.samsung.com
|
|
*
|
|
* Cloned from linux/arch/arm/mach-vexpress/platsmp.c
|
|
*
|
|
* Copyright (C) 2002 ARM Ltd.
|
|
* 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/of_address.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/smp_plat.h>
|
|
#include <asm/smp_scu.h>
|
|
#include <asm/firmware.h>
|
|
|
|
#include <mach/map.h>
|
|
|
|
#include "common.h"
|
|
#include "regs-pmu.h"
|
|
|
|
extern void exynos4_secondary_startup(void);
|
|
|
|
/**
|
|
* exynos_core_power_down : power down the specified cpu
|
|
* @cpu : the cpu to power down
|
|
*
|
|
* Power down the specified cpu. The sequence must be finished by a
|
|
* call to cpu_do_idle()
|
|
*
|
|
*/
|
|
void exynos_cpu_power_down(int cpu)
|
|
{
|
|
pmu_raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
|
|
}
|
|
|
|
/**
|
|
* exynos_cpu_power_up : power up the specified cpu
|
|
* @cpu : the cpu to power up
|
|
*
|
|
* Power up the specified cpu
|
|
*/
|
|
void exynos_cpu_power_up(int cpu)
|
|
{
|
|
pmu_raw_writel(S5P_CORE_LOCAL_PWR_EN,
|
|
EXYNOS_ARM_CORE_CONFIGURATION(cpu));
|
|
}
|
|
|
|
/**
|
|
* exynos_cpu_power_state : returns the power state of the cpu
|
|
* @cpu : the cpu to retrieve the power state from
|
|
*
|
|
*/
|
|
int exynos_cpu_power_state(int cpu)
|
|
{
|
|
return (pmu_raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) &
|
|
S5P_CORE_LOCAL_PWR_EN);
|
|
}
|
|
|
|
/**
|
|
* exynos_cluster_power_down : power down the specified cluster
|
|
* @cluster : the cluster to power down
|
|
*/
|
|
void exynos_cluster_power_down(int cluster)
|
|
{
|
|
pmu_raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
|
|
}
|
|
|
|
/**
|
|
* exynos_cluster_power_up : power up the specified cluster
|
|
* @cluster : the cluster to power up
|
|
*/
|
|
void exynos_cluster_power_up(int cluster)
|
|
{
|
|
pmu_raw_writel(S5P_CORE_LOCAL_PWR_EN,
|
|
EXYNOS_COMMON_CONFIGURATION(cluster));
|
|
}
|
|
|
|
/**
|
|
* exynos_cluster_power_state : returns the power state of the cluster
|
|
* @cluster : the cluster to retrieve the power state from
|
|
*
|
|
*/
|
|
int exynos_cluster_power_state(int cluster)
|
|
{
|
|
return (pmu_raw_readl(EXYNOS_COMMON_STATUS(cluster)) &
|
|
S5P_CORE_LOCAL_PWR_EN);
|
|
}
|
|
|
|
static inline void __iomem *cpu_boot_reg_base(void)
|
|
{
|
|
if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
|
|
return pmu_base_addr + S5P_INFORM5;
|
|
return sysram_base_addr;
|
|
}
|
|
|
|
static inline void __iomem *cpu_boot_reg(int cpu)
|
|
{
|
|
void __iomem *boot_reg;
|
|
|
|
boot_reg = cpu_boot_reg_base();
|
|
if (!boot_reg)
|
|
return ERR_PTR(-ENODEV);
|
|
if (soc_is_exynos4412())
|
|
boot_reg += 4*cpu;
|
|
else if (soc_is_exynos5420() || soc_is_exynos5800())
|
|
boot_reg += 4;
|
|
return boot_reg;
|
|
}
|
|
|
|
/*
|
|
* Write pen_release in a way that is guaranteed to be visible to all
|
|
* observers, irrespective of whether they're taking part in coherency
|
|
* or not. This is necessary for the hotplug code to work reliably.
|
|
*/
|
|
static void write_pen_release(int val)
|
|
{
|
|
pen_release = val;
|
|
smp_wmb();
|
|
sync_cache_w(&pen_release);
|
|
}
|
|
|
|
static void __iomem *scu_base_addr(void)
|
|
{
|
|
return (void __iomem *)(S5P_VA_SCU);
|
|
}
|
|
|
|
static DEFINE_SPINLOCK(boot_lock);
|
|
|
|
static void exynos_secondary_init(unsigned int cpu)
|
|
{
|
|
/*
|
|
* let the primary processor know we're out of the
|
|
* pen, then head off into the C entry point
|
|
*/
|
|
write_pen_release(-1);
|
|
|
|
/*
|
|
* Synchronise with the boot thread.
|
|
*/
|
|
spin_lock(&boot_lock);
|
|
spin_unlock(&boot_lock);
|
|
}
|
|
|
|
static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
unsigned long timeout;
|
|
u32 mpidr = cpu_logical_map(cpu);
|
|
u32 core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
|
int ret = -ENOSYS;
|
|
|
|
/*
|
|
* Set synchronisation state between this boot processor
|
|
* and the secondary one
|
|
*/
|
|
spin_lock(&boot_lock);
|
|
|
|
/*
|
|
* The secondary processor is waiting to be released from
|
|
* the holding pen - release it, then wait for it to flag
|
|
* that it has been released by resetting pen_release.
|
|
*
|
|
* Note that "pen_release" is the hardware CPU core ID, whereas
|
|
* "cpu" is Linux's internal ID.
|
|
*/
|
|
write_pen_release(core_id);
|
|
|
|
if (!exynos_cpu_power_state(core_id)) {
|
|
exynos_cpu_power_up(core_id);
|
|
timeout = 10;
|
|
|
|
/* wait max 10 ms until cpu1 is on */
|
|
while (exynos_cpu_power_state(core_id)
|
|
!= S5P_CORE_LOCAL_PWR_EN) {
|
|
if (timeout-- == 0)
|
|
break;
|
|
|
|
mdelay(1);
|
|
}
|
|
|
|
if (timeout == 0) {
|
|
printk(KERN_ERR "cpu1 power enable failed");
|
|
spin_unlock(&boot_lock);
|
|
return -ETIMEDOUT;
|
|
}
|
|
}
|
|
/*
|
|
* Send the secondary CPU a soft interrupt, thereby causing
|
|
* the boot monitor to read the system wide flags register,
|
|
* and branch to the address found there.
|
|
*/
|
|
|
|
timeout = jiffies + (1 * HZ);
|
|
while (time_before(jiffies, timeout)) {
|
|
unsigned long boot_addr;
|
|
|
|
smp_rmb();
|
|
|
|
boot_addr = virt_to_phys(exynos4_secondary_startup);
|
|
|
|
/*
|
|
* Try to set boot address using firmware first
|
|
* and fall back to boot register if it fails.
|
|
*/
|
|
ret = call_firmware_op(set_cpu_boot_addr, core_id, boot_addr);
|
|
if (ret && ret != -ENOSYS)
|
|
goto fail;
|
|
if (ret == -ENOSYS) {
|
|
void __iomem *boot_reg = cpu_boot_reg(core_id);
|
|
|
|
if (IS_ERR(boot_reg)) {
|
|
ret = PTR_ERR(boot_reg);
|
|
goto fail;
|
|
}
|
|
__raw_writel(boot_addr, cpu_boot_reg(core_id));
|
|
}
|
|
|
|
call_firmware_op(cpu_boot, core_id);
|
|
|
|
arch_send_wakeup_ipi_mask(cpumask_of(cpu));
|
|
|
|
if (pen_release == -1)
|
|
break;
|
|
|
|
udelay(10);
|
|
}
|
|
|
|
/*
|
|
* now the secondary core is starting up let it run its
|
|
* calibrations, then wait for it to finish
|
|
*/
|
|
fail:
|
|
spin_unlock(&boot_lock);
|
|
|
|
return pen_release != -1 ? ret : 0;
|
|
}
|
|
|
|
/*
|
|
* Initialise the CPU possible map early - this describes the CPUs
|
|
* which may be present or become present in the system.
|
|
*/
|
|
|
|
static void __init exynos_smp_init_cpus(void)
|
|
{
|
|
void __iomem *scu_base = scu_base_addr();
|
|
unsigned int i, ncores;
|
|
|
|
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
|
|
ncores = scu_base ? scu_get_core_count(scu_base) : 1;
|
|
else
|
|
/*
|
|
* CPU Nodes are passed thru DT and set_cpu_possible
|
|
* is set by "arm_dt_init_cpu_maps".
|
|
*/
|
|
return;
|
|
|
|
/* sanity check */
|
|
if (ncores > nr_cpu_ids) {
|
|
pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",
|
|
ncores, nr_cpu_ids);
|
|
ncores = nr_cpu_ids;
|
|
}
|
|
|
|
for (i = 0; i < ncores; i++)
|
|
set_cpu_possible(i, true);
|
|
}
|
|
|
|
static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
int i;
|
|
|
|
exynos_sysram_init();
|
|
|
|
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
|
|
scu_enable(scu_base_addr());
|
|
|
|
/*
|
|
* Write the address of secondary startup into the
|
|
* system-wide flags register. The boot monitor waits
|
|
* until it receives a soft interrupt, and then the
|
|
* secondary CPU branches to this address.
|
|
*
|
|
* Try using firmware operation first and fall back to
|
|
* boot register if it fails.
|
|
*/
|
|
for (i = 1; i < max_cpus; ++i) {
|
|
unsigned long boot_addr;
|
|
u32 mpidr;
|
|
u32 core_id;
|
|
int ret;
|
|
|
|
mpidr = cpu_logical_map(i);
|
|
core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
|
boot_addr = virt_to_phys(exynos4_secondary_startup);
|
|
|
|
ret = call_firmware_op(set_cpu_boot_addr, core_id, boot_addr);
|
|
if (ret && ret != -ENOSYS)
|
|
break;
|
|
if (ret == -ENOSYS) {
|
|
void __iomem *boot_reg = cpu_boot_reg(core_id);
|
|
|
|
if (IS_ERR(boot_reg))
|
|
break;
|
|
__raw_writel(boot_addr, cpu_boot_reg(core_id));
|
|
}
|
|
}
|
|
}
|
|
|
|
struct smp_operations exynos_smp_ops __initdata = {
|
|
.smp_init_cpus = exynos_smp_init_cpus,
|
|
.smp_prepare_cpus = exynos_smp_prepare_cpus,
|
|
.smp_secondary_init = exynos_secondary_init,
|
|
.smp_boot_secondary = exynos_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_die = exynos_cpu_die,
|
|
#endif
|
|
};
|