diff options
| author |   Ondrej Jirman <megous@megous.com> | 2019-10-28 22:49:14 +0100 |
|---|---|---|
| committer |   Maxime Ripard <mripard@kernel.org> | 2019-10-29 09:09:56 +0100 |
| commit | e690053e97e7a9c968df9a97cef9089dfa8e6a44 (patch) | |
| tree | 086ceb8d99d5c88a8100ded0332b068909a76504 /arch/arm | |
| parent | ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend (diff) | |
| download | linux-dev-e690053e97e7a9c968df9a97cef9089dfa8e6a44.tar.xz linux-dev-e690053e97e7a9c968df9a97cef9089dfa8e6a44.zip | |
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: 6961275e72a8c1 ("ARM: sun8i: smp: Add support for A83T")
Signed-off-by: Ondrej Jirman <megous@megous.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Cc: stable@vger.kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-sunxi/mc_smp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c index 239084cf8192..26cbce135338 100644 --- a/arch/arm/mach-sunxi/mc_smp.c +++ b/arch/arm/mach-sunxi/mc_smp.c @@ -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) { u32 reg; + int gating_bit = cpu; pr_debug("%s: cluster %u cpu %u\n", __func__, cluster, cpu); if (cpu >= SUNXI_CPUS_PER_CLUSTER || cluster >= SUNXI_NR_CLUSTERS) return -EINVAL; + if (is_a83t && cpu == 0) + gating_bit = 4; + /* gate processor power */ 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)); udelay(20); |