Commit e690053e authored by Ondrej Jirman's avatar Ondrej Jirman Committed by Maxime Ripard

ARM: sunxi: Fix CPU powerdown on A83T

PRCM_PWROFF_GATING_REG has CPU0 at bit 4 on A83T. So without this
patch, instead of gating the CPU0, the whole cluster was power gated,
when shutting down first CPU in the cluster.

Fixes: 6961275e ("ARM: sun8i: smp: Add support for A83T")
Signed-off-by: default avatarOndrej Jirman <megous@megous.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent e614f341
...@@ -481,14 +481,18 @@ static void sunxi_mc_smp_cpu_die(unsigned int l_cpu) ...@@ -481,14 +481,18 @@ static void sunxi_mc_smp_cpu_die(unsigned int l_cpu)
static int sunxi_cpu_powerdown(unsigned int cpu, unsigned int cluster) static int sunxi_cpu_powerdown(unsigned int cpu, unsigned int cluster)
{ {
u32 reg; u32 reg;
int gating_bit = cpu;
pr_debug("%s: cluster %u cpu %u\n", __func__, cluster, cpu); pr_debug("%s: cluster %u cpu %u\n", __func__, cluster, cpu);
if (cpu >= SUNXI_CPUS_PER_CLUSTER || cluster >= SUNXI_NR_CLUSTERS) if (cpu >= SUNXI_CPUS_PER_CLUSTER || cluster >= SUNXI_NR_CLUSTERS)
return -EINVAL; return -EINVAL;
if (is_a83t && cpu == 0)
gating_bit = 4;
/* gate processor power */ /* gate processor power */
reg = readl(prcm_base + PRCM_PWROFF_GATING_REG(cluster)); reg = readl(prcm_base + PRCM_PWROFF_GATING_REG(cluster));
reg |= PRCM_PWROFF_GATING_REG_CORE(cpu); reg |= PRCM_PWROFF_GATING_REG_CORE(gating_bit);
writel(reg, prcm_base + PRCM_PWROFF_GATING_REG(cluster)); writel(reg, prcm_base + PRCM_PWROFF_GATING_REG(cluster));
udelay(20); udelay(20);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment