* [PATCH 1/6] ARM: shmobile: rcar-gen2: Remove explicit SYSC config and init
2018-05-30 15:25 [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Geert Uytterhoeven
@ 2018-05-30 15:25 ` Geert Uytterhoeven
2018-05-30 15:25 ` [PATCH 2/6] ARM: shmobile: r8a7779: Stop powering down secondary CPUs during early boot Geert Uytterhoeven
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2018-05-30 15:25 UTC (permalink / raw)
To: linux-arm-kernel
If the R-Car system controller is described in DT, the rcar-sysc driver
configures SYSCIER and SYSCIMR based on the SoC-specific power area
definitions in r8a779*-sysc. The platform code still passed this
information to the rcar-sysc driver, for compatibility with old R-Car H2
and M2-W DTBs predating commit 8574de861978d518 ("ARM: dts: r8a7791: Add
SYSC PM Domains") in v4.7. The time has come to drop backwards
compatibility, and delegate everything to the DT enabled rcar-sysc
driver.
After the removal of the legacy SMP fallbacks, which powered up the SCUs
explicitly, there is no longer a need to force an early initialization
of the rcar-sysc driver. It will be initialized in time for secondary
CPU bringup by its early_initcall().
Hence all explicit SYSC configuration and initialization can be removed
from the R-Car Gen2 platform code.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/pm-rcar-gen2.c | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c
index 5a798b406af05be0..345af3ebcc3aeeb6 100644
--- a/arch/arm/mach-shmobile/pm-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/pm-rcar-gen2.c
@@ -15,7 +15,6 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/smp.h>
-#include <linux/soc/renesas/rcar-sysc.h>
#include <asm/io.h>
#include <asm/cputype.h>
#include "common.h"
@@ -46,23 +45,6 @@ static inline u32 phys_to_sbar(phys_addr_t addr)
return (addr >> 8) & 0xfffffc00;
}
-/* SYSC */
-#define SYSCIER 0x0c
-#define SYSCIMR 0x10
-
-#if defined(CONFIG_SMP)
-
-static void __init rcar_gen2_sysc_init(u32 syscier)
-{
- rcar_sysc_init(0xe6180000, syscier);
-}
-
-#else /* CONFIG_SMP */
-
-static inline void rcar_gen2_sysc_init(u32 syscier) {}
-
-#endif /* CONFIG_SMP */
-
void __init rcar_gen2_pm_init(void)
{
void __iomem *p;
@@ -72,7 +54,6 @@ void __init rcar_gen2_pm_init(void)
bool has_a7 = false;
bool has_a15 = false;
struct resource res;
- u32 syscier = 0;
int error;
if (once++)
@@ -89,11 +70,6 @@ void __init rcar_gen2_pm_init(void)
has_a7 = true;
}
- if (of_machine_is_compatible("renesas,r8a7790"))
- syscier = 0x013111ef;
- else if (of_machine_is_compatible("renesas,r8a7791"))
- syscier = 0x00111003;
-
np = of_find_compatible_node(NULL, NULL, "renesas,smp-sram");
if (!np) {
/* No smp-sram in DT, fall back to hardcoded address */
@@ -155,6 +131,5 @@ void __init rcar_gen2_pm_init(void)
}
iounmap(p);
- rcar_gen2_sysc_init(syscier);
shmobile_smp_apmu_suspend_init();
}
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/6] ARM: shmobile: r8a7779: Stop powering down secondary CPUs during early boot
2018-05-30 15:25 [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Geert Uytterhoeven
2018-05-30 15:25 ` [PATCH 1/6] ARM: shmobile: rcar-gen2: Remove explicit SYSC config and init Geert Uytterhoeven
@ 2018-05-30 15:25 ` Geert Uytterhoeven
2018-05-30 15:25 ` [PATCH 3/6] soc: renesas: rcar-sysc: Provide helpers to power up/down CPUs Geert Uytterhoeven
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2018-05-30 15:25 UTC (permalink / raw)
To: linux-arm-kernel
At .smp_prepare_cpus() time, CPUs 1-3 are still powered down:
- The bootloader doesn't enable CPUs 1-3,
- Non-boot CPUs are disabled by kexec before starting the new kernel.
Hence there is no need to try to power them down again, as it will fail
silently with -EIO anyway.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/smp-r8a7779.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index c6951ee245889b8f..ff1e6fc0b861c4fc 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -97,11 +97,6 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
shmobile_smp_scu_prepare_cpus(R8A7779_SCU_BASE, max_cpus);
r8a7779_pm_init();
-
- /* power off secondary CPUs */
- r8a7779_platform_cpu_kill(1);
- r8a7779_platform_cpu_kill(2);
- r8a7779_platform_cpu_kill(3);
}
#ifdef CONFIG_HOTPLUG_CPU
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/6] soc: renesas: rcar-sysc: Provide helpers to power up/down CPUs
2018-05-30 15:25 [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Geert Uytterhoeven
2018-05-30 15:25 ` [PATCH 1/6] ARM: shmobile: rcar-gen2: Remove explicit SYSC config and init Geert Uytterhoeven
2018-05-30 15:25 ` [PATCH 2/6] ARM: shmobile: r8a7779: Stop powering down secondary CPUs during early boot Geert Uytterhoeven
@ 2018-05-30 15:25 ` Geert Uytterhoeven
2018-05-30 15:25 ` [PATCH 4/6] ARM: shmobile: r8a7779: Use rcar_sysc_power_{down, up}_cpu() Geert Uytterhoeven
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2018-05-30 15:25 UTC (permalink / raw)
To: linux-arm-kernel
Provide helpers to control CPU power areas from platform code, taking
just a CPU index. This will avoid having to pass full CPU power area
parameter blocks, and thus duplicating information already provided by
SoC-specific SYSC drivers.
This will be used on R-Car H1 only.
Later R-Car generations rely on APMU/RST for CPU power area control.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/soc/renesas/rcar-sysc.c | 40 +++++++++++++++++++++++++++++++++++
include/linux/soc/renesas/rcar-sysc.h | 2 ++
2 files changed, 42 insertions(+)
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 95120acc4d806da6..4ad6dcd19420a045 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -310,6 +310,8 @@ struct rcar_pm_domains {
struct generic_pm_domain *domains[RCAR_PD_ALWAYS_ON + 1];
};
+static struct genpd_onecell_data *rcar_sysc_onecell_data;
+
static int __init rcar_sysc_pd_init(void)
{
const struct rcar_sysc_info *info;
@@ -356,6 +358,7 @@ static int __init rcar_sysc_pd_init(void)
domains->onecell_data.domains = domains->domains;
domains->onecell_data.num_domains = ARRAY_SIZE(domains->domains);
+ rcar_sysc_onecell_data = &domains->onecell_data;
for (i = 0, syscier = 0; i < info->num_areas; i++)
syscier |= BIT(info->areas[i].isr_bit);
@@ -449,3 +452,40 @@ void __init rcar_sysc_init(phys_addr_t base, u32 syscier)
pr_debug("%s: syscier = 0x%08x\n", __func__, syscier);
iowrite32(syscier, rcar_sysc_base + SYSCIER);
}
+
+#ifdef CONFIG_ARCH_R8A7779
+static int rcar_sysc_power_cpu(unsigned int idx, bool on)
+{
+ struct generic_pm_domain *genpd;
+ struct rcar_sysc_pd *pd;
+ unsigned int i;
+
+ if (!rcar_sysc_onecell_data)
+ return -ENODEV;
+
+ for (i = 0; i < rcar_sysc_onecell_data->num_domains; i++) {
+ genpd = rcar_sysc_onecell_data->domains[i];
+ if (!genpd)
+ continue;
+
+ pd = to_rcar_pd(genpd);
+ if (!(pd->flags & PD_CPU) || pd->ch.chan_bit != idx)
+ continue;
+
+ return on ? rcar_sysc_power_up(&pd->ch)
+ : rcar_sysc_power_down(&pd->ch);
+ }
+
+ return -ENOENT;
+}
+
+int rcar_sysc_power_down_cpu(unsigned int cpu)
+{
+ return rcar_sysc_power_cpu(cpu, false);
+}
+
+int rcar_sysc_power_up_cpu(unsigned int cpu)
+{
+ return rcar_sysc_power_cpu(cpu, true);
+}
+#endif /* CONFIG_ARCH_R8A7779 */
diff --git a/include/linux/soc/renesas/rcar-sysc.h b/include/linux/soc/renesas/rcar-sysc.h
index 8a6086d2e9c37585..9020da2111fdeea9 100644
--- a/include/linux/soc/renesas/rcar-sysc.h
+++ b/include/linux/soc/renesas/rcar-sysc.h
@@ -13,5 +13,7 @@ struct rcar_sysc_ch {
int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch);
int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch);
void rcar_sysc_init(phys_addr_t base, u32 syscier);
+int rcar_sysc_power_down_cpu(unsigned int cpu);
+int rcar_sysc_power_up_cpu(unsigned int cpu);
#endif /* __LINUX_SOC_RENESAS_RCAR_SYSC_H__ */
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/6] ARM: shmobile: r8a7779: Use rcar_sysc_power_{down, up}_cpu()
2018-05-30 15:25 [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Geert Uytterhoeven
` (2 preceding siblings ...)
2018-05-30 15:25 ` [PATCH 3/6] soc: renesas: rcar-sysc: Provide helpers to power up/down CPUs Geert Uytterhoeven
@ 2018-05-30 15:25 ` Geert Uytterhoeven
2018-05-30 15:25 ` [PATCH 5/6] ARM: shmobile: r8a7779: Remove explicit SYSC config and init Geert Uytterhoeven
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2018-05-30 15:25 UTC (permalink / raw)
To: linux-arm-kernel
The r8a7779 SMP code calls rcar_sysc_power_{down,up}() to control power
to the SYSC power areas containing CPUs. This requires passing full CPU
power area parameter blocks.
Migrate the code to call the new rcar_sysc_power_{down,up}_cpu()
helpers, which just take a CPU index, and use the SYSC power area
definitions from the r8a7779-sysc driver.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/smp-r8a7779.c | 47 +++++-------------------------------
1 file changed, 6 insertions(+), 41 deletions(-)
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index ff1e6fc0b861c4fc..3036f910046118ee 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -31,59 +31,24 @@
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000
-static const struct rcar_sysc_ch r8a7779_ch_cpu1 = {
- .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */
- .chan_bit = 1, /* ARM1 */
- .isr_bit = 1, /* ARM1 */
-};
-
-static const struct rcar_sysc_ch r8a7779_ch_cpu2 = {
- .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */
- .chan_bit = 2, /* ARM2 */
- .isr_bit = 2, /* ARM2 */
-};
-
-static const struct rcar_sysc_ch r8a7779_ch_cpu3 = {
- .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */
- .chan_bit = 3, /* ARM3 */
- .isr_bit = 3, /* ARM3 */
-};
-
-static const struct rcar_sysc_ch * const r8a7779_ch_cpu[4] = {
- [1] = &r8a7779_ch_cpu1,
- [2] = &r8a7779_ch_cpu2,
- [3] = &r8a7779_ch_cpu3,
-};
-
static int r8a7779_platform_cpu_kill(unsigned int cpu)
{
- const struct rcar_sysc_ch *ch = NULL;
int ret = -EIO;
cpu = cpu_logical_map(cpu);
-
- if (cpu < ARRAY_SIZE(r8a7779_ch_cpu))
- ch = r8a7779_ch_cpu[cpu];
-
- if (ch)
- ret = rcar_sysc_power_down(ch);
+ if (cpu)
+ ret = rcar_sysc_power_down_cpu(cpu);
return ret ? ret : 1;
}
static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
- const struct rcar_sysc_ch *ch = NULL;
- unsigned int lcpu = cpu_logical_map(cpu);
- int ret;
-
- if (lcpu < ARRAY_SIZE(r8a7779_ch_cpu))
- ch = r8a7779_ch_cpu[lcpu];
+ int ret = -EIO;
- if (ch)
- ret = rcar_sysc_power_up(ch);
- else
- ret = -EIO;
+ cpu = cpu_logical_map(cpu);
+ if (cpu)
+ ret = rcar_sysc_power_up_cpu(cpu);
return ret;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/6] ARM: shmobile: r8a7779: Remove explicit SYSC config and init
2018-05-30 15:25 [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Geert Uytterhoeven
` (3 preceding siblings ...)
2018-05-30 15:25 ` [PATCH 4/6] ARM: shmobile: r8a7779: Use rcar_sysc_power_{down, up}_cpu() Geert Uytterhoeven
@ 2018-05-30 15:25 ` Geert Uytterhoeven
2018-05-30 15:25 ` [PATCH 6/6] soc: renesas: rcar-sysc: Drop legacy handling Geert Uytterhoeven
2018-06-04 10:13 ` [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Simon Horman
6 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2018-05-30 15:25 UTC (permalink / raw)
To: linux-arm-kernel
If the R-Car H1 system controller is described in DT, the rcar-sysc
driver configures SYSCIER and SYSCIMR based on the SoC-specific power
area definitions in r8a7779-sysc. The platform code still passed this
information to the rcar-sysc driver, for compatibility with old DTBs
predating commit b2df3aa487395a1b ("ARM: dts: r8a7779: Add SYSC PM
Domains") in v4.7. The time has come to drop backwards compatibility,
and delegate everything to the DT enabled rcar-sysc driver.
After stopping powering down secondary CPUs during early boot, there is
no longer a need to force an early initialization of the rcar-sysc
driver. It will be initialized in time for secondary CPU bringup by its
early_initcall().
Hence all explicit SYSC configuration and initialization can be removed
from the R-Car H1 platform code.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-------------------------------------------------------
---
arch/arm/mach-shmobile/Makefile | 2 +-
arch/arm/mach-shmobile/pm-r8a7779.c | 41 ------------------------------------
arch/arm/mach-shmobile/r8a7779.h | 2 --
arch/arm/mach-shmobile/smp-r8a7779.c | 2 --
4 files changed, 1 insertion(+), 46 deletions(-)
delete mode 100644 arch/arm/mach-shmobile/pm-r8a7779.c
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 2b8d3896e1ebbe6a..05ba728ed4f67cf2 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o
obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o
obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o
obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
-obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o pm-r8a7779.o
+obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o
obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c
deleted file mode 100644
index 5c9a93f5e650181a..0000000000000000
--- a/arch/arm/mach-shmobile/pm-r8a7779.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * r8a7779 Power management support
- *
- * Copyright (C) 2011 Renesas Solutions Corp.
- * Copyright (C) 2011 Magnus Damm
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/soc/renesas/rcar-sysc.h>
-
-#include <asm/io.h>
-
-#include "r8a7779.h"
-
-/* SYSC */
-#define SYSCIER 0x0c
-#define SYSCIMR 0x10
-
-#if defined(CONFIG_PM) || defined(CONFIG_SMP)
-
-static void __init r8a7779_sysc_init(void)
-{
- rcar_sysc_init(0xffd85000, 0x0131000e);
-}
-
-#else /* CONFIG_PM || CONFIG_SMP */
-
-static inline void r8a7779_sysc_init(void) {}
-
-#endif /* CONFIG_PM || CONFIG_SMP */
-
-void __init r8a7779_pm_init(void)
-{
- static int once;
-
- if (!once++)
- r8a7779_sysc_init();
-}
diff --git a/arch/arm/mach-shmobile/r8a7779.h b/arch/arm/mach-shmobile/r8a7779.h
index 30668aa6acc34647..ca9db8fde2f791cc 100644
--- a/arch/arm/mach-shmobile/r8a7779.h
+++ b/arch/arm/mach-shmobile/r8a7779.h
@@ -2,8 +2,6 @@
#ifndef __ASM_R8A7779_H__
#define __ASM_R8A7779_H__
-extern void r8a7779_pm_init(void);
-
extern const struct smp_operations r8a7779_smp_ops;
#endif /* __ASM_R8A7779_H__ */
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 3036f910046118ee..0d3ec5c2b8fcbe7c 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -60,8 +60,6 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
/* setup r8a7779 specific SCU bits */
shmobile_smp_scu_prepare_cpus(R8A7779_SCU_BASE, max_cpus);
-
- r8a7779_pm_init();
}
#ifdef CONFIG_HOTPLUG_CPU
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/6] soc: renesas: rcar-sysc: Drop legacy handling
2018-05-30 15:25 [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Geert Uytterhoeven
` (4 preceding siblings ...)
2018-05-30 15:25 ` [PATCH 5/6] ARM: shmobile: r8a7779: Remove explicit SYSC config and init Geert Uytterhoeven
@ 2018-05-30 15:25 ` Geert Uytterhoeven
2018-06-04 10:13 ` [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Simon Horman
6 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2018-05-30 15:25 UTC (permalink / raw)
To: linux-arm-kernel
Now the R-Car platform code no longer supports DTBs lacking a SYSC
device node in DT, all legacy handling can be dropped from the R-Car
SYSC driver:
- Make rcar_sysc_ch private to the driver,
- Make rcar_sysc_power_{down,up}() static (they have been replaced by
rcar_sysc_power_{down,up}_cpu()),
- Remove the legacy wrapper rcar_sysc_init(), and the check for double
initialization (only the early_initcall is left).
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/soc/renesas/rcar-sysc.c | 38 ++++++++---------------------------
include/linux/soc/renesas/rcar-sysc.h | 11 ----------
2 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 4ad6dcd19420a045..41af9c7b912f09ca 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -58,6 +58,12 @@
#define RCAR_PD_ALWAYS_ON 32 /* Always-on power area */
+struct rcar_sysc_ch {
+ u16 chan_offs;
+ u8 chan_bit;
+ u8 isr_bit;
+};
+
static void __iomem *rcar_sysc_base;
static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
@@ -143,12 +149,12 @@ static int rcar_sysc_power(const struct rcar_sysc_ch *sysc_ch, bool on)
return ret;
}
-int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch)
+static int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch)
{
return rcar_sysc_power(sysc_ch, false);
}
-int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch)
+static int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch)
{
return rcar_sysc_power(sysc_ch, true);
}
@@ -323,9 +329,6 @@ static int __init rcar_sysc_pd_init(void)
unsigned int i;
int error;
- if (rcar_sysc_base)
- return 0;
-
np = of_find_matching_node_and_match(NULL, rcar_sysc_matches, &match);
if (!np)
return -ENODEV;
@@ -428,31 +431,6 @@ void __init rcar_sysc_nullify(struct rcar_sysc_area *areas,
}
}
-void __init rcar_sysc_init(phys_addr_t base, u32 syscier)
-{
- u32 syscimr;
-
- if (!rcar_sysc_pd_init())
- return;
-
- rcar_sysc_base = ioremap_nocache(base, PAGE_SIZE);
-
- /*
- * Mask all interrupt sources to prevent the CPU from receiving them.
- * Make sure not to clear reserved bits that were set before.
- */
- syscimr = ioread32(rcar_sysc_base + SYSCIMR);
- syscimr |= syscier;
- pr_debug("%s: syscimr = 0x%08x\n", __func__, syscimr);
- iowrite32(syscimr, rcar_sysc_base + SYSCIMR);
-
- /*
- * SYSC needs all interrupt sources enabled to control power.
- */
- pr_debug("%s: syscier = 0x%08x\n", __func__, syscier);
- iowrite32(syscier, rcar_sysc_base + SYSCIER);
-}
-
#ifdef CONFIG_ARCH_R8A7779
static int rcar_sysc_power_cpu(unsigned int idx, bool on)
{
diff --git a/include/linux/soc/renesas/rcar-sysc.h b/include/linux/soc/renesas/rcar-sysc.h
index 9020da2111fdeea9..00fae6fd234d7895 100644
--- a/include/linux/soc/renesas/rcar-sysc.h
+++ b/include/linux/soc/renesas/rcar-sysc.h
@@ -2,17 +2,6 @@
#ifndef __LINUX_SOC_RENESAS_RCAR_SYSC_H__
#define __LINUX_SOC_RENESAS_RCAR_SYSC_H__
-#include <linux/types.h>
-
-struct rcar_sysc_ch {
- u16 chan_offs;
- u8 chan_bit;
- u8 isr_bit;
-};
-
-int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch);
-int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch);
-void rcar_sysc_init(phys_addr_t base, u32 syscier);
int rcar_sysc_power_down_cpu(unsigned int cpu);
int rcar_sysc_power_up_cpu(unsigned int cpu);
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks
2018-05-30 15:25 [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Geert Uytterhoeven
` (5 preceding siblings ...)
2018-05-30 15:25 ` [PATCH 6/6] soc: renesas: rcar-sysc: Drop legacy handling Geert Uytterhoeven
@ 2018-06-04 10:13 ` Simon Horman
2018-06-04 12:34 ` Simon Horman
6 siblings, 1 reply; 9+ messages in thread
From: Simon Horman @ 2018-06-04 10:13 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, May 30, 2018 at 05:25:10PM +0200, Geert Uytterhoeven wrote:
> Hi Simon, Magnus,
>
> When DT SYSC support was introduced in v4.7, legacy fallbacks were kept
> to keep secondary CPUs working on R-Car H1, H2, and M2-W using old DTBs.
> However, the time has come to drop these fallbacks, and clean up the
> resulting code.
>
> Most of this was written when I worked on DT SYSC support, but postponed
> until the time was ripe. So basically I've been running this during the
> last +2 years.
>
> I avoided touching drivers/soc/renesas and arch/arm/mach-shmobile code
> in the same patch. If you prefer some patches to be squashed, please
> let me know.
>
> Tested on Marzen (R-Car H1), Lager (R-Car H2), and Koelsch (R-Car M2-W).
>
> Thanks!
>
> Geert Uytterhoeven (6):
> ARM: shmobile: rcar-gen2: Remove explicit SYSC config and init
> ARM: shmobile: r8a7779: Stop powering down secondary CPUs during early
> boot
> soc: renesas: rcar-sysc: Provide helpers to power up/down CPUs
> ARM: shmobile: r8a7779: Use rcar_sysc_power_{down,up}_cpu()
> ARM: shmobile: r8a7779: Remove explicit SYSC config and init
> soc: renesas: rcar-sysc: Drop legacy handling
>
> arch/arm/mach-shmobile/Makefile | 2 +-
> arch/arm/mach-shmobile/pm-r8a7779.c | 41 ----------------------
> arch/arm/mach-shmobile/pm-rcar-gen2.c | 25 --------------
> arch/arm/mach-shmobile/r8a7779.h | 2 --
> arch/arm/mach-shmobile/smp-r8a7779.c | 54 ++++-------------------------
> drivers/soc/renesas/rcar-sysc.c | 64 ++++++++++++++++++++++-------------
> include/linux/soc/renesas/rcar-sysc.h | 13 ++-----
> 7 files changed, 50 insertions(+), 151 deletions(-)
> delete mode 100644 arch/arm/mach-shmobile/pm-r8a7779.c
Thanks, I have applied this and intend to push shortly.
I had a conflict in the Makefile when applying patch 5/6.
Please check to make sure I applied that patch correctly.
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks
2018-06-04 10:13 ` [PATCH 0/6] ARM: shmobile: rcar: Drop lehacy SYSC fallbacks Simon Horman
@ 2018-06-04 12:34 ` Simon Horman
0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2018-06-04 12:34 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jun 04, 2018 at 12:13:08PM +0200, Simon Horman wrote:
> On Wed, May 30, 2018 at 05:25:10PM +0200, Geert Uytterhoeven wrote:
> > Hi Simon, Magnus,
> >
> > When DT SYSC support was introduced in v4.7, legacy fallbacks were kept
> > to keep secondary CPUs working on R-Car H1, H2, and M2-W using old DTBs.
> > However, the time has come to drop these fallbacks, and clean up the
> > resulting code.
> >
> > Most of this was written when I worked on DT SYSC support, but postponed
> > until the time was ripe. So basically I've been running this during the
> > last +2 years.
> >
> > I avoided touching drivers/soc/renesas and arch/arm/mach-shmobile code
> > in the same patch. If you prefer some patches to be squashed, please
> > let me know.
> >
> > Tested on Marzen (R-Car H1), Lager (R-Car H2), and Koelsch (R-Car M2-W).
> >
> > Thanks!
> >
> > Geert Uytterhoeven (6):
> > ARM: shmobile: rcar-gen2: Remove explicit SYSC config and init
> > ARM: shmobile: r8a7779: Stop powering down secondary CPUs during early
> > boot
> > soc: renesas: rcar-sysc: Provide helpers to power up/down CPUs
> > ARM: shmobile: r8a7779: Use rcar_sysc_power_{down,up}_cpu()
> > ARM: shmobile: r8a7779: Remove explicit SYSC config and init
> > soc: renesas: rcar-sysc: Drop legacy handling
> >
> > arch/arm/mach-shmobile/Makefile | 2 +-
> > arch/arm/mach-shmobile/pm-r8a7779.c | 41 ----------------------
> > arch/arm/mach-shmobile/pm-rcar-gen2.c | 25 --------------
> > arch/arm/mach-shmobile/r8a7779.h | 2 --
> > arch/arm/mach-shmobile/smp-r8a7779.c | 54 ++++-------------------------
> > drivers/soc/renesas/rcar-sysc.c | 64 ++++++++++++++++++++++-------------
> > include/linux/soc/renesas/rcar-sysc.h | 13 ++-----
> > 7 files changed, 50 insertions(+), 151 deletions(-)
> > delete mode 100644 arch/arm/mach-shmobile/pm-r8a7779.c
>
> Thanks, I have applied this and intend to push shortly.
>
> I had a conflict in the Makefile when applying patch 5/6.
> Please check to make sure I applied that patch correctly.
Sorry for the noise. I found that the conflict was caused by
an error on my part. I fixed that and the series applied cleanly.
The result is in renesas-devel-20180604-v4.17-rc7.
^ permalink raw reply [flat|nested] 9+ messages in thread