U-Boot has provided PSCI on Allwinner A31 and A23/A33 since May 2015,
commit 014414f53695 ("ARM: sunxi: Enable PSCI for sun8i"). Since we can
assume PSCI is available on these platforms, the custom SMP bringup code
is no longer used, and it can be removed.
The platform SMP code has a hidden dependency on the legacy PRCM
bindings, so it would be broken anyway when those are retired.
Signed-off-by: Samuel Holland <samuel@xxxxxxxxxxxx>
---
arch/arm/mach-sunxi/Makefile | 1 -
arch/arm/mach-sunxi/platsmp.c | 194 ----------------------------------
2 files changed, 195 deletions(-)
delete mode 100644 arch/arm/mach-sunxi/platsmp.c
diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile
index 146e623c54d3..e5dc8530e98c 100644
--- a/arch/arm/mach-sunxi/Makefile
+++ b/arch/arm/mach-sunxi/Makefile
@@ -3,4 +3,3 @@ CFLAGS_mc_smp.o += -march=armv7-a
obj-$(CONFIG_ARCH_SUNXI) += sunxi.o
obj-$(CONFIG_ARCH_SUNXI_MC_SMP) += mc_smp.o headsmp.o
-obj-$(CONFIG_SMP) += platsmp.o
diff --git a/arch/arm/mach-sunxi/platsmp.c b/arch/arm/mach-sunxi/platsmp.c
deleted file mode 100644
index 052097e78e6e..000000000000
--- a/arch/arm/mach-sunxi/platsmp.c
+++ /dev/null
@@ -1,194 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * SMP support for Allwinner SoCs
- *
- * Copyright (C) 2013 Maxime Ripard
- *
- * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
- *
- * Based on code
- * Copyright (C) 2012-2013 Allwinner Ltd.
- *
- */
-
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/memory.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/smp.h>
-
-#define CPUCFG_CPU_PWR_CLAMP_STATUS_REG(cpu) ((cpu) * 0x40 + 0x64)
-#define CPUCFG_CPU_RST_CTRL_REG(cpu) (((cpu) + 1) * 0x40)
-#define CPUCFG_CPU_CTRL_REG(cpu) (((cpu) + 1) * 0x40 + 0x04)
-#define CPUCFG_CPU_STATUS_REG(cpu) (((cpu) + 1) * 0x40 + 0x08)
-#define CPUCFG_GEN_CTRL_REG 0x184
-#define CPUCFG_PRIVATE0_REG 0x1a4
-#define CPUCFG_PRIVATE1_REG 0x1a8
-#define CPUCFG_DBG_CTL0_REG 0x1e0
-#define CPUCFG_DBG_CTL1_REG 0x1e4
-
-#define PRCM_CPU_PWROFF_REG 0x100
-#define PRCM_CPU_PWR_CLAMP_REG(cpu) (((cpu) * 4) + 0x140)
-
-static void __iomem *cpucfg_membase;
-static void __iomem *prcm_membase;
-
-static DEFINE_SPINLOCK(cpu_lock);
-
-static void __init sun6i_smp_prepare_cpus(unsigned int max_cpus)
-{
- struct device_node *node;
-
- node = of_find_compatible_node(NULL, NULL, "allwinner,sun6i-a31-prcm");
- if (!node) {
- pr_err("Missing A31 PRCM node in the device tree\n");
- return;
- }
-
- prcm_membase = of_iomap(node, 0);
- of_node_put(node);
- if (!prcm_membase) {
- pr_err("Couldn't map A31 PRCM registers\n");
- return;
- }
-
- node = of_find_compatible_node(NULL, NULL,
- "allwinner,sun6i-a31-cpuconfig");
- if (!node) {
- pr_err("Missing A31 CPU config node in the device tree\n");
- return;
- }
-
- cpucfg_membase = of_iomap(node, 0);
- of_node_put(node);
- if (!cpucfg_membase)
- pr_err("Couldn't map A31 CPU config registers\n");
-
-}
-
-static int sun6i_smp_boot_secondary(unsigned int cpu,
- struct task_struct *idle)
-{
- u32 reg;
- int i;
-
- if (!(prcm_membase && cpucfg_membase))
- return -EFAULT;
-
- spin_lock(&cpu_lock);
-
- /* Set CPU boot address */
- writel(__pa_symbol(secondary_startup),
- cpucfg_membase + CPUCFG_PRIVATE0_REG);
-
- /* Assert the CPU core in reset */
- writel(0, cpucfg_membase + CPUCFG_CPU_RST_CTRL_REG(cpu));
-
- /* Assert the L1 cache in reset */
- reg = readl(cpucfg_membase + CPUCFG_GEN_CTRL_REG);
- writel(reg & ~BIT(cpu), cpucfg_membase + CPUCFG_GEN_CTRL_REG);
-
- /* Disable external debug access */
- reg = readl(cpucfg_membase + CPUCFG_DBG_CTL1_REG);
- writel(reg & ~BIT(cpu), cpucfg_membase + CPUCFG_DBG_CTL1_REG);
-
- /* Power up the CPU */
- for (i = 0; i <= 8; i++)
- writel(0xff >> i, prcm_membase + PRCM_CPU_PWR_CLAMP_REG(cpu));
- mdelay(10);
-
- /* Clear CPU power-off gating */
- reg = readl(prcm_membase + PRCM_CPU_PWROFF_REG);
- writel(reg & ~BIT(cpu), prcm_membase + PRCM_CPU_PWROFF_REG);
- mdelay(1);
-
- /* Deassert the CPU core reset */
- writel(3, cpucfg_membase + CPUCFG_CPU_RST_CTRL_REG(cpu));
-
- /* Enable back the external debug accesses */
- reg = readl(cpucfg_membase + CPUCFG_DBG_CTL1_REG);
- writel(reg | BIT(cpu), cpucfg_membase + CPUCFG_DBG_CTL1_REG);
-
- spin_unlock(&cpu_lock);
-
- return 0;
-}
-
-static const struct smp_operations sun6i_smp_ops __initconst = {
- .smp_prepare_cpus = sun6i_smp_prepare_cpus,
- .smp_boot_secondary = sun6i_smp_boot_secondary,
-};
-CPU_METHOD_OF_DECLARE(sun6i_a31_smp, "allwinner,sun6i-a31", &sun6i_smp_ops);
-
-static void __init sun8i_smp_prepare_cpus(unsigned int max_cpus)
-{
- struct device_node *node;
-
- node = of_find_compatible_node(NULL, NULL, "allwinner,sun8i-a23-prcm");
- if (!node) {
- pr_err("Missing A23 PRCM node in the device tree\n");
- return;
- }
-
- prcm_membase = of_iomap(node, 0);
- of_node_put(node);
- if (!prcm_membase) {
- pr_err("Couldn't map A23 PRCM registers\n");
- return;
- }
-
- node = of_find_compatible_node(NULL, NULL,
- "allwinner,sun8i-a23-cpuconfig");
- if (!node) {
- pr_err("Missing A23 CPU config node in the device tree\n");
- return;
- }
-
- cpucfg_membase = of_iomap(node, 0);
- of_node_put(node);
- if (!cpucfg_membase)
- pr_err("Couldn't map A23 CPU config registers\n");
-
-}
-
-static int sun8i_smp_boot_secondary(unsigned int cpu,
- struct task_struct *idle)
-{
- u32 reg;
-
- if (!(prcm_membase && cpucfg_membase))
- return -EFAULT;
-
- spin_lock(&cpu_lock);
-
- /* Set CPU boot address */
- writel(__pa_symbol(secondary_startup),
- cpucfg_membase + CPUCFG_PRIVATE0_REG);
-
- /* Assert the CPU core in reset */
- writel(0, cpucfg_membase + CPUCFG_CPU_RST_CTRL_REG(cpu));
-
- /* Assert the L1 cache in reset */
- reg = readl(cpucfg_membase + CPUCFG_GEN_CTRL_REG);
- writel(reg & ~BIT(cpu), cpucfg_membase + CPUCFG_GEN_CTRL_REG);
-
- /* Clear CPU power-off gating */
- reg = readl(prcm_membase + PRCM_CPU_PWROFF_REG);
- writel(reg & ~BIT(cpu), prcm_membase + PRCM_CPU_PWROFF_REG);
- mdelay(1);
-
- /* Deassert the CPU core reset */
- writel(3, cpucfg_membase + CPUCFG_CPU_RST_CTRL_REG(cpu));
-
- spin_unlock(&cpu_lock);
-
- return 0;
-}
-
-static const struct smp_operations sun8i_smp_ops __initconst = {
- .smp_prepare_cpus = sun8i_smp_prepare_cpus,
- .smp_boot_secondary = sun8i_smp_boot_secondary,
-};
-CPU_METHOD_OF_DECLARE(sun8i_a23_smp, "allwinner,sun8i-a23", &sun8i_smp_ops);
--
2.35.1
