Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates from Olof Johansson: "Our SoC branch usually contains expanded support for new SoCs and other core platform code. In this case, that includes: - support for the new Annapurna Labs "Alpine" platform - a rework greatly simplifying adding new platform support to the MCPM subsystem (Multi-cluster power management) - cpuidle and PM improvements for Exynos3250 - misc updates for Renesas, OMAP, Meson, i.MX. Some of these could have gone in other branches but ended up here for various reasons" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits) ARM: alpine: add support for generic pci ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction ARM: vexpress: DCSCB: tighten CPU validity assertion ARM: vexpress: migrate TC2 to the new MCPM backend abstraction ARM: MCPM: move the algorithmic complexity to the core code ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC ARM: EXYNOS: add AFTR mode support for Exynos3250 ARM: EXYNOS: add code for setting/clearing boot flag ARM: EXYNOS: fix CPU1 hotplug on Exynos3250 ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore ARM: cygnus: fix const declaration bcm_cygnus_dt_compat ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4 ARM: DRA7: hwmod: Add data for GPTimers 13 through 16 ARM: EXYNOS: Remove left over 'extra_save' ARM: EXYNOS: Constify exynos_pm_data array ARM: EXYNOS: use static in suspend.c ARM: EXYNOS: Use platform device name as power domain name ARM: EXYNOS: add support for async-bridge clocks for pm_domains ARM: omap-device: add missed callback for suspend-to-disk ...
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/vexpress.h>
|
||||
@@ -36,163 +35,102 @@
|
||||
#define KFC_CFG_W 0x2c
|
||||
#define DCS_CFG_R 0x30
|
||||
|
||||
/*
|
||||
* We can't use regular spinlocks. In the switcher case, it is possible
|
||||
* for an outbound CPU to call power_down() while its inbound counterpart
|
||||
* is already live using the same logical CPU number which trips lockdep
|
||||
* debugging.
|
||||
*/
|
||||
static arch_spinlock_t dcscb_lock = __ARCH_SPIN_LOCK_UNLOCKED;
|
||||
|
||||
static void __iomem *dcscb_base;
|
||||
static int dcscb_use_count[4][2];
|
||||
static int dcscb_allcpus_mask[2];
|
||||
|
||||
static int dcscb_power_up(unsigned int cpu, unsigned int cluster)
|
||||
static int dcscb_cpu_powerup(unsigned int cpu, unsigned int cluster)
|
||||
{
|
||||
unsigned int rst_hold, cpumask = (1 << cpu);
|
||||
unsigned int all_mask;
|
||||
|
||||
pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
|
||||
if (cpu >= 4 || cluster >= 2)
|
||||
if (cluster >= 2 || !(cpumask & dcscb_allcpus_mask[cluster]))
|
||||
return -EINVAL;
|
||||
|
||||
all_mask = dcscb_allcpus_mask[cluster];
|
||||
|
||||
/*
|
||||
* Since this is called with IRQs enabled, and no arch_spin_lock_irq
|
||||
* variant exists, we need to disable IRQs manually here.
|
||||
*/
|
||||
local_irq_disable();
|
||||
arch_spin_lock(&dcscb_lock);
|
||||
|
||||
dcscb_use_count[cpu][cluster]++;
|
||||
if (dcscb_use_count[cpu][cluster] == 1) {
|
||||
rst_hold = readl_relaxed(dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
if (rst_hold & (1 << 8)) {
|
||||
/* remove cluster reset and add individual CPU's reset */
|
||||
rst_hold &= ~(1 << 8);
|
||||
rst_hold |= all_mask;
|
||||
}
|
||||
rst_hold &= ~(cpumask | (cpumask << 4));
|
||||
writel_relaxed(rst_hold, dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
} else if (dcscb_use_count[cpu][cluster] != 2) {
|
||||
/*
|
||||
* The only possible values are:
|
||||
* 0 = CPU down
|
||||
* 1 = CPU (still) up
|
||||
* 2 = CPU requested to be up before it had a chance
|
||||
* to actually make itself down.
|
||||
* Any other value is a bug.
|
||||
*/
|
||||
BUG();
|
||||
}
|
||||
|
||||
arch_spin_unlock(&dcscb_lock);
|
||||
local_irq_enable();
|
||||
|
||||
rst_hold = readl_relaxed(dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
rst_hold &= ~(cpumask | (cpumask << 4));
|
||||
writel_relaxed(rst_hold, dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dcscb_power_down(void)
|
||||
static int dcscb_cluster_powerup(unsigned int cluster)
|
||||
{
|
||||
unsigned int mpidr, cpu, cluster, rst_hold, cpumask, all_mask;
|
||||
bool last_man = false, skip_wfi = false;
|
||||
unsigned int rst_hold;
|
||||
|
||||
mpidr = read_cpuid_mpidr();
|
||||
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
||||
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
|
||||
cpumask = (1 << cpu);
|
||||
pr_debug("%s: cluster %u\n", __func__, cluster);
|
||||
if (cluster >= 2)
|
||||
return -EINVAL;
|
||||
|
||||
/* remove cluster reset and add individual CPU's reset */
|
||||
rst_hold = readl_relaxed(dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
rst_hold &= ~(1 << 8);
|
||||
rst_hold |= dcscb_allcpus_mask[cluster];
|
||||
writel_relaxed(rst_hold, dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dcscb_cpu_powerdown_prepare(unsigned int cpu, unsigned int cluster)
|
||||
{
|
||||
unsigned int rst_hold;
|
||||
|
||||
pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
|
||||
BUG_ON(cpu >= 4 || cluster >= 2);
|
||||
BUG_ON(cluster >= 2 || !((1 << cpu) & dcscb_allcpus_mask[cluster]));
|
||||
|
||||
all_mask = dcscb_allcpus_mask[cluster];
|
||||
rst_hold = readl_relaxed(dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
rst_hold |= (1 << cpu);
|
||||
writel_relaxed(rst_hold, dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
}
|
||||
|
||||
__mcpm_cpu_going_down(cpu, cluster);
|
||||
static void dcscb_cluster_powerdown_prepare(unsigned int cluster)
|
||||
{
|
||||
unsigned int rst_hold;
|
||||
|
||||
arch_spin_lock(&dcscb_lock);
|
||||
BUG_ON(__mcpm_cluster_state(cluster) != CLUSTER_UP);
|
||||
dcscb_use_count[cpu][cluster]--;
|
||||
if (dcscb_use_count[cpu][cluster] == 0) {
|
||||
rst_hold = readl_relaxed(dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
rst_hold |= cpumask;
|
||||
if (((rst_hold | (rst_hold >> 4)) & all_mask) == all_mask) {
|
||||
rst_hold |= (1 << 8);
|
||||
last_man = true;
|
||||
}
|
||||
writel_relaxed(rst_hold, dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
} else if (dcscb_use_count[cpu][cluster] == 1) {
|
||||
/*
|
||||
* A power_up request went ahead of us.
|
||||
* Even if we do not want to shut this CPU down,
|
||||
* the caller expects a certain state as if the WFI
|
||||
* was aborted. So let's continue with cache cleaning.
|
||||
*/
|
||||
skip_wfi = true;
|
||||
} else
|
||||
BUG();
|
||||
pr_debug("%s: cluster %u\n", __func__, cluster);
|
||||
BUG_ON(cluster >= 2);
|
||||
|
||||
if (last_man && __mcpm_outbound_enter_critical(cpu, cluster)) {
|
||||
arch_spin_unlock(&dcscb_lock);
|
||||
rst_hold = readl_relaxed(dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
rst_hold |= (1 << 8);
|
||||
writel_relaxed(rst_hold, dcscb_base + RST_HOLD0 + cluster * 4);
|
||||
}
|
||||
|
||||
/* Flush all cache levels for this cluster. */
|
||||
v7_exit_coherency_flush(all);
|
||||
static void dcscb_cpu_cache_disable(void)
|
||||
{
|
||||
/* Disable and flush the local CPU cache. */
|
||||
v7_exit_coherency_flush(louis);
|
||||
}
|
||||
|
||||
/*
|
||||
* A full outer cache flush could be needed at this point
|
||||
* on platforms with such a cache, depending on where the
|
||||
* outer cache sits. In some cases the notion of a "last
|
||||
* cluster standing" would need to be implemented if the
|
||||
* outer cache is shared across clusters. In any case, when
|
||||
* the outer cache needs flushing, there is no concurrent
|
||||
* access to the cache controller to worry about and no
|
||||
* special locking besides what is already provided by the
|
||||
* MCPM state machinery is needed.
|
||||
*/
|
||||
static void dcscb_cluster_cache_disable(void)
|
||||
{
|
||||
/* Flush all cache levels for this cluster. */
|
||||
v7_exit_coherency_flush(all);
|
||||
|
||||
/*
|
||||
* Disable cluster-level coherency by masking
|
||||
* incoming snoops and DVM messages:
|
||||
*/
|
||||
cci_disable_port_by_cpu(mpidr);
|
||||
/*
|
||||
* A full outer cache flush could be needed at this point
|
||||
* on platforms with such a cache, depending on where the
|
||||
* outer cache sits. In some cases the notion of a "last
|
||||
* cluster standing" would need to be implemented if the
|
||||
* outer cache is shared across clusters. In any case, when
|
||||
* the outer cache needs flushing, there is no concurrent
|
||||
* access to the cache controller to worry about and no
|
||||
* special locking besides what is already provided by the
|
||||
* MCPM state machinery is needed.
|
||||
*/
|
||||
|
||||
__mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN);
|
||||
} else {
|
||||
arch_spin_unlock(&dcscb_lock);
|
||||
|
||||
/* Disable and flush the local CPU cache. */
|
||||
v7_exit_coherency_flush(louis);
|
||||
}
|
||||
|
||||
__mcpm_cpu_down(cpu, cluster);
|
||||
|
||||
/* Now we are prepared for power-down, do it: */
|
||||
dsb();
|
||||
if (!skip_wfi)
|
||||
wfi();
|
||||
|
||||
/* Not dead at this point? Let our caller cope. */
|
||||
/*
|
||||
* Disable cluster-level coherency by masking
|
||||
* incoming snoops and DVM messages:
|
||||
*/
|
||||
cci_disable_port_by_cpu(read_cpuid_mpidr());
|
||||
}
|
||||
|
||||
static const struct mcpm_platform_ops dcscb_power_ops = {
|
||||
.power_up = dcscb_power_up,
|
||||
.power_down = dcscb_power_down,
|
||||
.cpu_powerup = dcscb_cpu_powerup,
|
||||
.cluster_powerup = dcscb_cluster_powerup,
|
||||
.cpu_powerdown_prepare = dcscb_cpu_powerdown_prepare,
|
||||
.cluster_powerdown_prepare = dcscb_cluster_powerdown_prepare,
|
||||
.cpu_cache_disable = dcscb_cpu_cache_disable,
|
||||
.cluster_cache_disable = dcscb_cluster_cache_disable,
|
||||
};
|
||||
|
||||
static void __init dcscb_usage_count_init(void)
|
||||
{
|
||||
unsigned int mpidr, cpu, cluster;
|
||||
|
||||
mpidr = read_cpuid_mpidr();
|
||||
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
||||
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
|
||||
|
||||
pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
|
||||
BUG_ON(cpu >= 4 || cluster >= 2);
|
||||
dcscb_use_count[cpu][cluster] = 1;
|
||||
}
|
||||
|
||||
extern void dcscb_power_up_setup(unsigned int affinity_level);
|
||||
|
||||
static int __init dcscb_init(void)
|
||||
@@ -213,7 +151,6 @@ static int __init dcscb_init(void)
|
||||
cfg = readl_relaxed(dcscb_base + DCS_CFG_R);
|
||||
dcscb_allcpus_mask[0] = (1 << (((cfg >> 16) >> (0 << 2)) & 0xf)) - 1;
|
||||
dcscb_allcpus_mask[1] = (1 << (((cfg >> 16) >> (1 << 2)) & 0xf)) - 1;
|
||||
dcscb_usage_count_init();
|
||||
|
||||
ret = mcpm_platform_register(&dcscb_power_ops);
|
||||
if (!ret)
|
||||
|
@@ -18,7 +18,6 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/irqchip/arm-gic.h>
|
||||
|
||||
@@ -44,101 +43,36 @@
|
||||
|
||||
static void __iomem *scc;
|
||||
|
||||
/*
|
||||
* We can't use regular spinlocks. In the switcher case, it is possible
|
||||
* for an outbound CPU to call power_down() after its inbound counterpart
|
||||
* is already live using the same logical CPU number which trips lockdep
|
||||
* debugging.
|
||||
*/
|
||||
static arch_spinlock_t tc2_pm_lock = __ARCH_SPIN_LOCK_UNLOCKED;
|
||||
|
||||
#define TC2_CLUSTERS 2
|
||||
#define TC2_MAX_CPUS_PER_CLUSTER 3
|
||||
|
||||
static unsigned int tc2_nr_cpus[TC2_CLUSTERS];
|
||||
|
||||
/* Keep per-cpu usage count to cope with unordered up/down requests */
|
||||
static int tc2_pm_use_count[TC2_MAX_CPUS_PER_CLUSTER][TC2_CLUSTERS];
|
||||
|
||||
#define tc2_cluster_unused(cluster) \
|
||||
(!tc2_pm_use_count[0][cluster] && \
|
||||
!tc2_pm_use_count[1][cluster] && \
|
||||
!tc2_pm_use_count[2][cluster])
|
||||
|
||||
static int tc2_pm_power_up(unsigned int cpu, unsigned int cluster)
|
||||
static int tc2_pm_cpu_powerup(unsigned int cpu, unsigned int cluster)
|
||||
{
|
||||
pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
|
||||
if (cluster >= TC2_CLUSTERS || cpu >= tc2_nr_cpus[cluster])
|
||||
return -EINVAL;
|
||||
|
||||
/*
|
||||
* Since this is called with IRQs enabled, and no arch_spin_lock_irq
|
||||
* variant exists, we need to disable IRQs manually here.
|
||||
*/
|
||||
local_irq_disable();
|
||||
arch_spin_lock(&tc2_pm_lock);
|
||||
|
||||
if (tc2_cluster_unused(cluster))
|
||||
ve_spc_powerdown(cluster, false);
|
||||
|
||||
tc2_pm_use_count[cpu][cluster]++;
|
||||
if (tc2_pm_use_count[cpu][cluster] == 1) {
|
||||
ve_spc_set_resume_addr(cluster, cpu,
|
||||
virt_to_phys(mcpm_entry_point));
|
||||
ve_spc_cpu_wakeup_irq(cluster, cpu, true);
|
||||
} else if (tc2_pm_use_count[cpu][cluster] != 2) {
|
||||
/*
|
||||
* The only possible values are:
|
||||
* 0 = CPU down
|
||||
* 1 = CPU (still) up
|
||||
* 2 = CPU requested to be up before it had a chance
|
||||
* to actually make itself down.
|
||||
* Any other value is a bug.
|
||||
*/
|
||||
BUG();
|
||||
}
|
||||
|
||||
arch_spin_unlock(&tc2_pm_lock);
|
||||
local_irq_enable();
|
||||
|
||||
ve_spc_set_resume_addr(cluster, cpu,
|
||||
virt_to_phys(mcpm_entry_point));
|
||||
ve_spc_cpu_wakeup_irq(cluster, cpu, true);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void tc2_pm_down(u64 residency)
|
||||
static int tc2_pm_cluster_powerup(unsigned int cluster)
|
||||
{
|
||||
unsigned int mpidr, cpu, cluster;
|
||||
bool last_man = false, skip_wfi = false;
|
||||
|
||||
mpidr = read_cpuid_mpidr();
|
||||
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
||||
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
|
||||
pr_debug("%s: cluster %u\n", __func__, cluster);
|
||||
if (cluster >= TC2_CLUSTERS)
|
||||
return -EINVAL;
|
||||
ve_spc_powerdown(cluster, false);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void tc2_pm_cpu_powerdown_prepare(unsigned int cpu, unsigned int cluster)
|
||||
{
|
||||
pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
|
||||
BUG_ON(cluster >= TC2_CLUSTERS || cpu >= TC2_MAX_CPUS_PER_CLUSTER);
|
||||
|
||||
__mcpm_cpu_going_down(cpu, cluster);
|
||||
|
||||
arch_spin_lock(&tc2_pm_lock);
|
||||
BUG_ON(__mcpm_cluster_state(cluster) != CLUSTER_UP);
|
||||
tc2_pm_use_count[cpu][cluster]--;
|
||||
if (tc2_pm_use_count[cpu][cluster] == 0) {
|
||||
ve_spc_cpu_wakeup_irq(cluster, cpu, true);
|
||||
if (tc2_cluster_unused(cluster)) {
|
||||
ve_spc_powerdown(cluster, true);
|
||||
ve_spc_global_wakeup_irq(true);
|
||||
last_man = true;
|
||||
}
|
||||
} else if (tc2_pm_use_count[cpu][cluster] == 1) {
|
||||
/*
|
||||
* A power_up request went ahead of us.
|
||||
* Even if we do not want to shut this CPU down,
|
||||
* the caller expects a certain state as if the WFI
|
||||
* was aborted. So let's continue with cache cleaning.
|
||||
*/
|
||||
skip_wfi = true;
|
||||
} else
|
||||
BUG();
|
||||
|
||||
ve_spc_cpu_wakeup_irq(cluster, cpu, true);
|
||||
/*
|
||||
* If the CPU is committed to power down, make sure
|
||||
* the power controller will be in charge of waking it
|
||||
@@ -146,55 +80,38 @@ static void tc2_pm_down(u64 residency)
|
||||
* to the CPU by disabling the GIC CPU IF to prevent wfi
|
||||
* from completing execution behind power controller back
|
||||
*/
|
||||
if (!skip_wfi)
|
||||
gic_cpu_if_down();
|
||||
|
||||
if (last_man && __mcpm_outbound_enter_critical(cpu, cluster)) {
|
||||
arch_spin_unlock(&tc2_pm_lock);
|
||||
|
||||
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A15) {
|
||||
/*
|
||||
* On the Cortex-A15 we need to disable
|
||||
* L2 prefetching before flushing the cache.
|
||||
*/
|
||||
asm volatile(
|
||||
"mcr p15, 1, %0, c15, c0, 3 \n\t"
|
||||
"isb \n\t"
|
||||
"dsb "
|
||||
: : "r" (0x400) );
|
||||
}
|
||||
|
||||
v7_exit_coherency_flush(all);
|
||||
|
||||
cci_disable_port_by_cpu(mpidr);
|
||||
|
||||
__mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN);
|
||||
} else {
|
||||
/*
|
||||
* If last man then undo any setup done previously.
|
||||
*/
|
||||
if (last_man) {
|
||||
ve_spc_powerdown(cluster, false);
|
||||
ve_spc_global_wakeup_irq(false);
|
||||
}
|
||||
|
||||
arch_spin_unlock(&tc2_pm_lock);
|
||||
|
||||
v7_exit_coherency_flush(louis);
|
||||
}
|
||||
|
||||
__mcpm_cpu_down(cpu, cluster);
|
||||
|
||||
/* Now we are prepared for power-down, do it: */
|
||||
if (!skip_wfi)
|
||||
wfi();
|
||||
|
||||
/* Not dead at this point? Let our caller cope. */
|
||||
gic_cpu_if_down();
|
||||
}
|
||||
|
||||
static void tc2_pm_power_down(void)
|
||||
static void tc2_pm_cluster_powerdown_prepare(unsigned int cluster)
|
||||
{
|
||||
tc2_pm_down(0);
|
||||
pr_debug("%s: cluster %u\n", __func__, cluster);
|
||||
BUG_ON(cluster >= TC2_CLUSTERS);
|
||||
ve_spc_powerdown(cluster, true);
|
||||
ve_spc_global_wakeup_irq(true);
|
||||
}
|
||||
|
||||
static void tc2_pm_cpu_cache_disable(void)
|
||||
{
|
||||
v7_exit_coherency_flush(louis);
|
||||
}
|
||||
|
||||
static void tc2_pm_cluster_cache_disable(void)
|
||||
{
|
||||
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A15) {
|
||||
/*
|
||||
* On the Cortex-A15 we need to disable
|
||||
* L2 prefetching before flushing the cache.
|
||||
*/
|
||||
asm volatile(
|
||||
"mcr p15, 1, %0, c15, c0, 3 \n\t"
|
||||
"isb \n\t"
|
||||
"dsb "
|
||||
: : "r" (0x400) );
|
||||
}
|
||||
|
||||
v7_exit_coherency_flush(all);
|
||||
cci_disable_port_by_cpu(read_cpuid_mpidr());
|
||||
}
|
||||
|
||||
static int tc2_core_in_reset(unsigned int cpu, unsigned int cluster)
|
||||
@@ -217,27 +134,21 @@ static int tc2_pm_wait_for_powerdown(unsigned int cpu, unsigned int cluster)
|
||||
BUG_ON(cluster >= TC2_CLUSTERS || cpu >= TC2_MAX_CPUS_PER_CLUSTER);
|
||||
|
||||
for (tries = 0; tries < TIMEOUT_MSEC / POLL_MSEC; ++tries) {
|
||||
/*
|
||||
* Only examine the hardware state if the target CPU has
|
||||
* caught up at least as far as tc2_pm_down():
|
||||
*/
|
||||
if (ACCESS_ONCE(tc2_pm_use_count[cpu][cluster]) == 0) {
|
||||
pr_debug("%s(cpu=%u, cluster=%u): RESET_CTRL = 0x%08X\n",
|
||||
__func__, cpu, cluster,
|
||||
readl_relaxed(scc + RESET_CTRL));
|
||||
pr_debug("%s(cpu=%u, cluster=%u): RESET_CTRL = 0x%08X\n",
|
||||
__func__, cpu, cluster,
|
||||
readl_relaxed(scc + RESET_CTRL));
|
||||
|
||||
/*
|
||||
* We need the CPU to reach WFI, but the power
|
||||
* controller may put the cluster in reset and
|
||||
* power it off as soon as that happens, before
|
||||
* we have a chance to see STANDBYWFI.
|
||||
*
|
||||
* So we need to check for both conditions:
|
||||
*/
|
||||
if (tc2_core_in_reset(cpu, cluster) ||
|
||||
ve_spc_cpu_in_wfi(cpu, cluster))
|
||||
return 0; /* success: the CPU is halted */
|
||||
}
|
||||
/*
|
||||
* We need the CPU to reach WFI, but the power
|
||||
* controller may put the cluster in reset and
|
||||
* power it off as soon as that happens, before
|
||||
* we have a chance to see STANDBYWFI.
|
||||
*
|
||||
* So we need to check for both conditions:
|
||||
*/
|
||||
if (tc2_core_in_reset(cpu, cluster) ||
|
||||
ve_spc_cpu_in_wfi(cpu, cluster))
|
||||
return 0; /* success: the CPU is halted */
|
||||
|
||||
/* Otherwise, wait and retry: */
|
||||
msleep(POLL_MSEC);
|
||||
@@ -246,72 +157,40 @@ static int tc2_pm_wait_for_powerdown(unsigned int cpu, unsigned int cluster)
|
||||
return -ETIMEDOUT; /* timeout */
|
||||
}
|
||||
|
||||
static void tc2_pm_suspend(u64 residency)
|
||||
static void tc2_pm_cpu_suspend_prepare(unsigned int cpu, unsigned int cluster)
|
||||
{
|
||||
unsigned int mpidr, cpu, cluster;
|
||||
|
||||
mpidr = read_cpuid_mpidr();
|
||||
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
||||
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
|
||||
ve_spc_set_resume_addr(cluster, cpu, virt_to_phys(mcpm_entry_point));
|
||||
tc2_pm_down(residency);
|
||||
}
|
||||
|
||||
static void tc2_pm_powered_up(void)
|
||||
static void tc2_pm_cpu_is_up(unsigned int cpu, unsigned int cluster)
|
||||
{
|
||||
unsigned int mpidr, cpu, cluster;
|
||||
unsigned long flags;
|
||||
|
||||
mpidr = read_cpuid_mpidr();
|
||||
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
||||
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
|
||||
|
||||
pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
|
||||
BUG_ON(cluster >= TC2_CLUSTERS || cpu >= TC2_MAX_CPUS_PER_CLUSTER);
|
||||
|
||||
local_irq_save(flags);
|
||||
arch_spin_lock(&tc2_pm_lock);
|
||||
|
||||
if (tc2_cluster_unused(cluster)) {
|
||||
ve_spc_powerdown(cluster, false);
|
||||
ve_spc_global_wakeup_irq(false);
|
||||
}
|
||||
|
||||
if (!tc2_pm_use_count[cpu][cluster])
|
||||
tc2_pm_use_count[cpu][cluster] = 1;
|
||||
|
||||
ve_spc_cpu_wakeup_irq(cluster, cpu, false);
|
||||
ve_spc_set_resume_addr(cluster, cpu, 0);
|
||||
}
|
||||
|
||||
arch_spin_unlock(&tc2_pm_lock);
|
||||
local_irq_restore(flags);
|
||||
static void tc2_pm_cluster_is_up(unsigned int cluster)
|
||||
{
|
||||
pr_debug("%s: cluster %u\n", __func__, cluster);
|
||||
BUG_ON(cluster >= TC2_CLUSTERS);
|
||||
ve_spc_powerdown(cluster, false);
|
||||
ve_spc_global_wakeup_irq(false);
|
||||
}
|
||||
|
||||
static const struct mcpm_platform_ops tc2_pm_power_ops = {
|
||||
.power_up = tc2_pm_power_up,
|
||||
.power_down = tc2_pm_power_down,
|
||||
.cpu_powerup = tc2_pm_cpu_powerup,
|
||||
.cluster_powerup = tc2_pm_cluster_powerup,
|
||||
.cpu_suspend_prepare = tc2_pm_cpu_suspend_prepare,
|
||||
.cpu_powerdown_prepare = tc2_pm_cpu_powerdown_prepare,
|
||||
.cluster_powerdown_prepare = tc2_pm_cluster_powerdown_prepare,
|
||||
.cpu_cache_disable = tc2_pm_cpu_cache_disable,
|
||||
.cluster_cache_disable = tc2_pm_cluster_cache_disable,
|
||||
.wait_for_powerdown = tc2_pm_wait_for_powerdown,
|
||||
.suspend = tc2_pm_suspend,
|
||||
.powered_up = tc2_pm_powered_up,
|
||||
.cpu_is_up = tc2_pm_cpu_is_up,
|
||||
.cluster_is_up = tc2_pm_cluster_is_up,
|
||||
};
|
||||
|
||||
static bool __init tc2_pm_usage_count_init(void)
|
||||
{
|
||||
unsigned int mpidr, cpu, cluster;
|
||||
|
||||
mpidr = read_cpuid_mpidr();
|
||||
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
||||
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
|
||||
|
||||
pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
|
||||
if (cluster >= TC2_CLUSTERS || cpu >= tc2_nr_cpus[cluster]) {
|
||||
pr_err("%s: boot CPU is out of bound!\n", __func__);
|
||||
return false;
|
||||
}
|
||||
tc2_pm_use_count[cpu][cluster] = 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Enable cluster-level coherency, in preparation for turning on the MMU.
|
||||
*/
|
||||
@@ -323,23 +202,9 @@ static void __naked tc2_pm_power_up_setup(unsigned int affinity_level)
|
||||
" b cci_enable_port_for_self ");
|
||||
}
|
||||
|
||||
static void __init tc2_cache_off(void)
|
||||
{
|
||||
pr_info("TC2: disabling cache during MCPM loopback test\n");
|
||||
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A15) {
|
||||
/* disable L2 prefetching on the Cortex-A15 */
|
||||
asm volatile(
|
||||
"mcr p15, 1, %0, c15, c0, 3 \n\t"
|
||||
"isb \n\t"
|
||||
"dsb "
|
||||
: : "r" (0x400) );
|
||||
}
|
||||
v7_exit_coherency_flush(all);
|
||||
cci_disable_port_by_cpu(read_cpuid_mpidr());
|
||||
}
|
||||
|
||||
static int __init tc2_pm_init(void)
|
||||
{
|
||||
unsigned int mpidr, cpu, cluster;
|
||||
int ret, irq;
|
||||
u32 a15_cluster_id, a7_cluster_id, sys_info;
|
||||
struct device_node *np;
|
||||
@@ -379,14 +244,20 @@ static int __init tc2_pm_init(void)
|
||||
if (!cci_probed())
|
||||
return -ENODEV;
|
||||
|
||||
if (!tc2_pm_usage_count_init())
|
||||
mpidr = read_cpuid_mpidr();
|
||||
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
|
||||
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
|
||||
pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
|
||||
if (cluster >= TC2_CLUSTERS || cpu >= tc2_nr_cpus[cluster]) {
|
||||
pr_err("%s: boot CPU is out of bound!\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = mcpm_platform_register(&tc2_pm_power_ops);
|
||||
if (!ret) {
|
||||
mcpm_sync_init(tc2_pm_power_up_setup);
|
||||
/* test if we can (re)enable the CCI on our own */
|
||||
BUG_ON(mcpm_loopback(tc2_cache_off) != 0);
|
||||
BUG_ON(mcpm_loopback(tc2_pm_cluster_cache_disable) != 0);
|
||||
pr_info("TC2 power management initialized\n");
|
||||
}
|
||||
return ret;
|
||||
|
Reference in New Issue
Block a user