From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> To: horms@verge.net.au, linux-renesas-soc@vger.kernel.org Cc: magnus.damm@gmail.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 05/12] ARM: shmobile: r8a7792: add SMP support Date: Mon, 13 Jun 2016 00:04:43 +0300 [thread overview] Message-ID: <8892035.WlgqvXCvaR@wasted.cogentembedded.com> (raw) In-Reply-To: <14666252.G84Ipxe6EL@wasted.cogentembedded.com> Add R8A7792 SMP support using the shared APMU code. This SoC has 2 ARM Cortex-A15 CPU cores. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- Changes in version 3: - new patch. arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/r8a7792.h | 6 +++ arch/arm/mach-shmobile/setup-r8a7792.c | 2 + arch/arm/mach-shmobile/smp-r8a7792.c | 62 +++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+) Index: renesas/arch/arm/mach-shmobile/Makefile =================================================================== --- renesas.orig/arch/arm/mach-shmobile/Makefile +++ renesas/arch/arm/mach-shmobile/Makefile @@ -35,6 +35,7 @@ smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0. smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o platsmp-scu.o smp-$(CONFIG_ARCH_R8A7790) += smp-r8a7790.o smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o +smp-$(CONFIG_ARCH_R8A7792) += smp-r8a7792.o smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o # PM objects Index: renesas/arch/arm/mach-shmobile/r8a7792.h =================================================================== --- /dev/null +++ renesas/arch/arm/mach-shmobile/r8a7792.h @@ -0,0 +1,6 @@ +#ifndef __ASM_R8A7792_H__ +#define __ASM_R8A7792_H__ + +extern const struct smp_operations r8a7792_smp_ops; + +#endif /* __ASM_R8A7792_H__ */ Index: renesas/arch/arm/mach-shmobile/setup-r8a7792.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/setup-r8a7792.c +++ renesas/arch/arm/mach-shmobile/setup-r8a7792.c @@ -20,6 +20,7 @@ #include "common.h" #include "rcar-gen2.h" +#include "r8a7792.h" static const char * const r8a7792_boards_compat_dt[] __initconst = { "renesas,r8a7792", @@ -27,6 +28,7 @@ static const char * const r8a7792_boards }; DT_MACHINE_START(R8A7792_DT, "Generic R8A7792 (Flattened Device Tree)") + .smp = smp_ops(r8a7792_smp_ops), .init_early = shmobile_init_delay, .init_late = shmobile_init_late, .init_time = rcar_gen2_timer_init, Index: renesas/arch/arm/mach-shmobile/smp-r8a7792.c =================================================================== --- /dev/null +++ renesas/arch/arm/mach-shmobile/smp-r8a7792.c @@ -0,0 +1,62 @@ +/* + * SMP support for r8a7792 + * + * Copyright (C) 2014 Renesas Electronics Corporation + * Copyright (C) 2016 Cogent Embedded, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/smp.h> +#include <linux/io.h> +#include <linux/soc/renesas/rcar-sysc.h> + +#include <asm/smp_plat.h> + +#include "common.h" +#include "platsmp-apmu.h" +#include "rcar-gen2.h" +#include "r8a7792.h" + +static struct rcar_sysc_ch r8a7792_ca15_scu = { + .chan_offs = 0x180, /* PWRSR5 .. PWRER5 */ + .isr_bit = 12, /* CA15-SCU */ +}; + +static struct rcar_apmu_config r8a7792_apmu_config[] = { + { + .iomem = DEFINE_RES_MEM(0xe6152000, 0x188), + .cpus = { 0, 1 }, + }, +}; + +static void __init r8a7792_smp_prepare_cpus(unsigned int max_cpus) +{ + /* let APMU code install data related to shmobile_boot_vector */ + shmobile_smp_apmu_prepare_cpus(max_cpus, + r8a7792_apmu_config, + ARRAY_SIZE(r8a7792_apmu_config)); + + /* turn on power to SCU */ + rcar_gen2_pm_init(); + rcar_sysc_power_up(&r8a7792_ca15_scu); +} + +const struct smp_operations r8a7792_smp_ops __initconst = { + .smp_prepare_cpus = r8a7792_smp_prepare_cpus, + .smp_boot_secondary = shmobile_smp_apmu_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_can_disable = shmobile_smp_cpu_can_disable, + .cpu_die = shmobile_smp_apmu_cpu_die, + .cpu_kill = shmobile_smp_apmu_cpu_kill, +#endif +};
WARNING: multiple messages have this Message-ID (diff)
From: sergei.shtylyov@cogentembedded.com (Sergei Shtylyov) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 05/12] ARM: shmobile: r8a7792: add SMP support Date: Mon, 13 Jun 2016 00:04:43 +0300 [thread overview] Message-ID: <8892035.WlgqvXCvaR@wasted.cogentembedded.com> (raw) In-Reply-To: <14666252.G84Ipxe6EL@wasted.cogentembedded.com> Add R8A7792 SMP support using the shared APMU code. This SoC has 2 ARM Cortex-A15 CPU cores. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- Changes in version 3: - new patch. arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/r8a7792.h | 6 +++ arch/arm/mach-shmobile/setup-r8a7792.c | 2 + arch/arm/mach-shmobile/smp-r8a7792.c | 62 +++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+) Index: renesas/arch/arm/mach-shmobile/Makefile =================================================================== --- renesas.orig/arch/arm/mach-shmobile/Makefile +++ renesas/arch/arm/mach-shmobile/Makefile @@ -35,6 +35,7 @@ smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0. smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o platsmp-scu.o smp-$(CONFIG_ARCH_R8A7790) += smp-r8a7790.o smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o +smp-$(CONFIG_ARCH_R8A7792) += smp-r8a7792.o smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o # PM objects Index: renesas/arch/arm/mach-shmobile/r8a7792.h =================================================================== --- /dev/null +++ renesas/arch/arm/mach-shmobile/r8a7792.h @@ -0,0 +1,6 @@ +#ifndef __ASM_R8A7792_H__ +#define __ASM_R8A7792_H__ + +extern const struct smp_operations r8a7792_smp_ops; + +#endif /* __ASM_R8A7792_H__ */ Index: renesas/arch/arm/mach-shmobile/setup-r8a7792.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/setup-r8a7792.c +++ renesas/arch/arm/mach-shmobile/setup-r8a7792.c @@ -20,6 +20,7 @@ #include "common.h" #include "rcar-gen2.h" +#include "r8a7792.h" static const char * const r8a7792_boards_compat_dt[] __initconst = { "renesas,r8a7792", @@ -27,6 +28,7 @@ static const char * const r8a7792_boards }; DT_MACHINE_START(R8A7792_DT, "Generic R8A7792 (Flattened Device Tree)") + .smp = smp_ops(r8a7792_smp_ops), .init_early = shmobile_init_delay, .init_late = shmobile_init_late, .init_time = rcar_gen2_timer_init, Index: renesas/arch/arm/mach-shmobile/smp-r8a7792.c =================================================================== --- /dev/null +++ renesas/arch/arm/mach-shmobile/smp-r8a7792.c @@ -0,0 +1,62 @@ +/* + * SMP support for r8a7792 + * + * Copyright (C) 2014 Renesas Electronics Corporation + * Copyright (C) 2016 Cogent Embedded, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/smp.h> +#include <linux/io.h> +#include <linux/soc/renesas/rcar-sysc.h> + +#include <asm/smp_plat.h> + +#include "common.h" +#include "platsmp-apmu.h" +#include "rcar-gen2.h" +#include "r8a7792.h" + +static struct rcar_sysc_ch r8a7792_ca15_scu = { + .chan_offs = 0x180, /* PWRSR5 .. PWRER5 */ + .isr_bit = 12, /* CA15-SCU */ +}; + +static struct rcar_apmu_config r8a7792_apmu_config[] = { + { + .iomem = DEFINE_RES_MEM(0xe6152000, 0x188), + .cpus = { 0, 1 }, + }, +}; + +static void __init r8a7792_smp_prepare_cpus(unsigned int max_cpus) +{ + /* let APMU code install data related to shmobile_boot_vector */ + shmobile_smp_apmu_prepare_cpus(max_cpus, + r8a7792_apmu_config, + ARRAY_SIZE(r8a7792_apmu_config)); + + /* turn on power to SCU */ + rcar_gen2_pm_init(); + rcar_sysc_power_up(&r8a7792_ca15_scu); +} + +const struct smp_operations r8a7792_smp_ops __initconst = { + .smp_prepare_cpus = r8a7792_smp_prepare_cpus, + .smp_boot_secondary = shmobile_smp_apmu_boot_secondary, +#ifdef CONFIG_HOTPLUG_CPU + .cpu_can_disable = shmobile_smp_cpu_can_disable, + .cpu_die = shmobile_smp_apmu_cpu_die, + .cpu_kill = shmobile_smp_apmu_cpu_kill, +#endif +};
next prev parent reply other threads:[~2016-06-12 21:04 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-12 20:47 [PATCH v5 00/12] Add R8A7792/Blanche board support Sergei Shtylyov 2016-06-12 20:47 ` Sergei Shtylyov 2016-06-12 20:53 ` [PATCH v5 01/12] ARM: shmobile: r8a7792: add clock index macros Sergei Shtylyov 2016-06-12 20:54 ` [PATCH v5 02/12] ARM: shmobile: r8a7792: add power domain " Sergei Shtylyov 2016-06-12 20:56 ` [PATCH v5 03/12] soc: renesas: rcar-sysc: add R8A7792 support Sergei Shtylyov 2016-06-12 21:01 ` [PATCH v5 04/12] ARM: shmobile: r8a7792: basic SoC support Sergei Shtylyov 2016-06-12 21:01 ` Sergei Shtylyov 2016-06-12 21:04 ` Sergei Shtylyov [this message] 2016-06-12 21:04 ` [PATCH v5 05/12] ARM: shmobile: r8a7792: add SMP support Sergei Shtylyov 2016-06-15 2:30 ` Simon Horman 2016-06-15 2:30 ` Simon Horman 2016-06-15 10:43 ` Sergei Shtylyov 2016-06-15 10:43 ` Sergei Shtylyov 2016-06-16 5:19 ` Simon Horman 2016-06-16 5:19 ` Simon Horman 2016-06-12 21:06 ` [PATCH v5 06/12] ARM: dts: r8a7792: initial SoC device tree Sergei Shtylyov 2016-06-12 21:06 ` Sergei Shtylyov 2016-06-12 21:08 ` [PATCH v5 07/12] ARM: dts: r8a7792: add SYS-DMAC support Sergei Shtylyov 2016-06-12 21:08 ` Sergei Shtylyov 2016-06-12 21:09 ` [PATCH v5 08/12] ARM: dts: r8a7792: add [H]SCIF support Sergei Shtylyov 2016-06-12 21:09 ` Sergei Shtylyov 2016-06-12 21:12 ` [PATCH v5 09/12] ARM: dts: r8a7792: add IRQC support Sergei Shtylyov 2016-06-12 21:12 ` Sergei Shtylyov 2016-06-12 21:14 ` [PATCH v5 10/12] DT: arm: shmobile: document Blanche board Sergei Shtylyov 2016-06-12 21:15 ` [PATCH v5 11/12] ARM: dts: blanche: initial device tree Sergei Shtylyov 2016-06-12 21:15 ` Sergei Shtylyov 2016-06-12 21:17 ` [PATCH v5 12/12] ARM: dts: blanche: add Ethernet support Sergei Shtylyov 2016-06-12 21:17 ` Sergei Shtylyov 2016-06-20 22:31 ` [PATCH] ARM: dts: r8a7792: add SMP support Sergei Shtylyov 2016-06-20 22:31 ` Sergei Shtylyov 2016-06-20 22:31 ` Sergei Shtylyov [not found] ` <1627631.X1bJtVQHBF-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org> 2016-06-21 7:10 ` Geert Uytterhoeven 2016-06-21 7:10 ` Geert Uytterhoeven 2016-06-21 7:10 ` Geert Uytterhoeven 2016-06-29 16:46 ` Sergei Shtylyov 2016-06-29 16:46 ` Sergei Shtylyov 2016-06-30 12:27 ` Simon Horman 2016-06-30 12:27 ` Simon Horman 2016-06-30 17:52 ` Sergei Shtylyov 2016-06-30 17:52 ` Sergei Shtylyov 2016-06-21 22:03 ` [PATCH] ARM: dts: r8a7794: " Sergei Shtylyov 2016-06-21 22:03 ` Sergei Shtylyov 2016-06-21 22:03 ` Sergei Shtylyov [not found] ` <27171008.uuY7altQup-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org> 2016-06-22 7:20 ` Geert Uytterhoeven 2016-06-22 7:20 ` Geert Uytterhoeven 2016-06-22 7:20 ` Geert Uytterhoeven 2016-06-22 10:08 ` Sergei Shtylyov 2016-06-22 10:08 ` Sergei Shtylyov 2016-06-22 10:08 ` Sergei Shtylyov 2016-06-22 10:20 ` Geert Uytterhoeven 2016-06-22 10:20 ` Geert Uytterhoeven 2016-06-23 8:11 ` Geert Uytterhoeven 2016-06-23 8:11 ` Geert Uytterhoeven 2018-05-08 16:39 ` [PATCH] arm64: dts: renesas: r8a77970: " Sergei Shtylyov 2018-05-08 16:39 ` Sergei Shtylyov 2018-05-08 18:40 ` Geert Uytterhoeven 2018-05-08 18:40 ` Geert Uytterhoeven 2018-05-08 18:40 ` Geert Uytterhoeven 2018-05-08 18:47 ` Sergei Shtylyov 2018-05-08 18:47 ` Sergei Shtylyov 2018-05-08 18:47 ` Sergei Shtylyov 2018-05-09 19:05 ` Simon Horman 2018-05-09 19:05 ` Simon Horman 2018-05-09 19:05 ` Simon Horman 2018-05-10 16:43 ` Sergei Shtylyov 2018-05-10 16:43 ` Sergei Shtylyov 2018-05-10 16:43 ` Sergei Shtylyov 2018-05-12 14:08 ` Simon Horman 2018-05-12 14:08 ` Simon Horman 2018-05-12 14:08 ` Simon Horman 2018-05-17 20:19 ` [PATCH] arm64: dts: renesas: r8a77980: " Sergei Shtylyov 2018-05-17 20:19 ` Sergei Shtylyov 2018-05-17 20:23 ` Geert Uytterhoeven 2018-05-17 20:23 ` Geert Uytterhoeven 2018-05-17 20:23 ` Geert Uytterhoeven 2018-05-19 17:38 ` Sergei Shtylyov 2018-05-19 17:38 ` Sergei Shtylyov 2018-05-19 17:38 ` Sergei Shtylyov 2018-05-22 8:54 ` Simon Horman 2018-05-22 8:54 ` Simon Horman 2018-05-22 8:54 ` Simon Horman 2018-05-22 9:49 ` Geert Uytterhoeven 2018-05-22 9:49 ` Geert Uytterhoeven 2018-05-22 9:49 ` Geert Uytterhoeven 2018-05-23 8:30 ` Simon Horman 2018-05-23 8:30 ` Simon Horman 2018-05-23 8:30 ` Simon Horman 2018-05-22 8:54 ` Simon Horman 2018-05-22 8:54 ` Simon Horman 2018-05-22 8:54 ` Simon Horman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=8892035.WlgqvXCvaR@wasted.cogentembedded.com \ --to=sergei.shtylyov@cogentembedded.com \ --cc=horms@verge.net.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=magnus.damm@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.