From: Guo Ren <ren_guo@c-sky.com> To: akpm@linux-foundation.org, arnd@arndb.de, daniel.lezcano@linaro.org, davem@davemloft.net, gregkh@linuxfoundation.org, hch@infradead.org, marc.zyngier@arm.com, mark.rutland@arm.com, peterz@infradead.org, robh@kernel.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, c-sky_gcc_upstream@c-sky.com, Guo Ren <ren_guo@c-sky.com> Subject: [PATCH V9 16/21] csky: SMP support Date: Tue, 16 Oct 2018 10:58:35 +0800 [thread overview] Message-ID: <4fca35ebfae9208ed6117bbe41c863a33730681e.1539655732.git.ren_guo@c-sky.com> (raw) In-Reply-To: <cover.1539655731.git.ren_guo@c-sky.com> In-Reply-To: <cover.1539655731.git.ren_guo@c-sky.com> This patch adds boot, ipi, hotplug codes for SMP. Signed-off-by: Guo Ren <ren_guo@c-sky.com> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnd Bergmann <arnd@arndb.de> --- Changelog: - Use PER_CPU_DEFINE for ipi_data. - Remove unused variable and add static for enable_smp_ipi(). - Add comment to explain pass args from primary CPU to secondary CPU. - Remove set_ipi_irq_mapping callback. - Convert the cpumask to an interrupt-controller specific representation in driver's code, and not the SMP code's. - csky: remove irq_mapping from smp.c There are some feedbacks from irqchip, and we need to adjust "smp.c & smp.h" to match the csky_mp_intc modification. - Move IPI_IRQ define into drivers/irqchip/csky_mpintc.c, because it's a interrupt controller specific. - Bugfix request_irq with IPI_IRQ, we must use irq_mapping return value not directly use IPI_IRQ. The modification also involves csky_mp_intc. --- --- arch/csky/include/asm/smp.h | 26 +++++ arch/csky/kernel/smp.c | 237 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+) create mode 100644 arch/csky/include/asm/smp.h create mode 100644 arch/csky/kernel/smp.c diff --git a/arch/csky/include/asm/smp.h b/arch/csky/include/asm/smp.h new file mode 100644 index 0000000..4a929c4 --- /dev/null +++ b/arch/csky/include/asm/smp.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_CSKY_SMP_H +#define __ASM_CSKY_SMP_H + +#include <linux/cpumask.h> +#include <linux/irqreturn.h> +#include <linux/threads.h> + +#ifdef CONFIG_SMP + +void __init setup_smp(void); + +void __init setup_smp_ipi(void); + +void arch_send_call_function_ipi_mask(struct cpumask *mask); + +void arch_send_call_function_single_ipi(int cpu); + +void __init set_send_ipi(void (*func)(const struct cpumask *mask), int irq); + +#define raw_smp_processor_id() (current_thread_info()->cpu) + +#endif /* CONFIG_SMP */ + +#endif /* __ASM_CSKY_SMP_H */ diff --git a/arch/csky/kernel/smp.c b/arch/csky/kernel/smp.c new file mode 100644 index 0000000..36ebaf9 --- /dev/null +++ b/arch/csky/kernel/smp.c @@ -0,0 +1,237 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/mm.h> +#include <linux/sched.h> +#include <linux/kernel_stat.h> +#include <linux/notifier.h> +#include <linux/cpu.h> +#include <linux/percpu.h> +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/irq.h> +#include <linux/irqdomain.h> +#include <linux/of.h> +#include <linux/sched/task_stack.h> +#include <linux/sched/mm.h> +#include <asm/irq.h> +#include <asm/traps.h> +#include <asm/sections.h> +#include <asm/mmu_context.h> +#include <asm/pgalloc.h> + +struct ipi_data_struct { + unsigned long bits ____cacheline_aligned; +}; +static DEFINE_PER_CPU(struct ipi_data_struct, ipi_data); + +enum ipi_message_type { + IPI_EMPTY, + IPI_RESCHEDULE, + IPI_CALL_FUNC, + IPI_MAX +}; + +static irqreturn_t handle_ipi(int irq, void *dev) +{ + while (true) { + unsigned long ops; + + ops = xchg(&this_cpu_ptr(&ipi_data)->bits, 0); + if (ops == 0) + return IRQ_HANDLED; + + if (ops & (1 << IPI_RESCHEDULE)) + scheduler_ipi(); + + if (ops & (1 << IPI_CALL_FUNC)) + generic_smp_call_function_interrupt(); + + BUG_ON((ops >> IPI_MAX) != 0); + } + + return IRQ_HANDLED; +} + +static void (*send_arch_ipi)(const struct cpumask *mask); + +static int ipi_irq; +void __init set_send_ipi(void (*func)(const struct cpumask *mask), int irq) +{ + if (send_arch_ipi) + return; + + send_arch_ipi = func; + ipi_irq = irq; +} + +static void +send_ipi_message(const struct cpumask *to_whom, enum ipi_message_type operation) +{ + int i; + + for_each_cpu(i, to_whom) + set_bit(operation, &per_cpu_ptr(&ipi_data, i)->bits); + + smp_mb(); + send_arch_ipi(to_whom); +} + +void arch_send_call_function_ipi_mask(struct cpumask *mask) +{ + send_ipi_message(mask, IPI_CALL_FUNC); +} + +void arch_send_call_function_single_ipi(int cpu) +{ + send_ipi_message(cpumask_of(cpu), IPI_CALL_FUNC); +} + +static void ipi_stop(void *unused) +{ + while (1); +} + +void smp_send_stop(void) +{ + on_each_cpu(ipi_stop, NULL, 1); +} + +void smp_send_reschedule(int cpu) +{ + send_ipi_message(cpumask_of(cpu), IPI_RESCHEDULE); +} + +void __init smp_prepare_boot_cpu(void) +{ +} + +void __init smp_prepare_cpus(unsigned int max_cpus) +{ +} + +static void __init enable_smp_ipi(void) +{ + enable_percpu_irq(ipi_irq, 0); +} + +static int ipi_dummy_dev; +void __init setup_smp_ipi(void) +{ + int rc; + + if (ipi_irq == 0) + panic("%s IRQ mapping failed\n", __func__); + + rc = request_percpu_irq(ipi_irq, handle_ipi, "IPI Interrupt", + &ipi_dummy_dev); + if (rc) + panic("%s IRQ request failed\n", __func__); + + enable_smp_ipi(); +} + +void __init setup_smp(void) +{ + struct device_node *node = NULL; + int cpu; + + while ((node = of_find_node_by_type(node, "cpu"))) { + if (!of_device_is_available(node)) + continue; + + if (of_property_read_u32(node, "reg", &cpu)) + continue; + + if (cpu >= NR_CPUS) + continue; + + set_cpu_possible(cpu, true); + set_cpu_present(cpu, true); + } +} + +extern void _start_smp_secondary(void); + +volatile unsigned int secondary_hint; +volatile unsigned int secondary_ccr; +volatile unsigned int secondary_stack; + +int __cpu_up(unsigned int cpu, struct task_struct *tidle) +{ + unsigned int tmp; + + secondary_stack = (unsigned int)tidle->stack + THREAD_SIZE; + + secondary_hint = mfcr("cr31"); + + secondary_ccr = mfcr("cr18"); + + /* + * Because other CPUs are in reset status, we must flush data + * from cache to out and secondary CPUs use them in + * csky_start_secondary(void) + */ + mtcr("cr17", 0x22); + + /* Enable cpu in SMP reset ctrl reg */ + tmp = mfcr("cr<29, 0>"); + tmp |= 1 << cpu; + mtcr("cr<29, 0>", tmp); + + /* Wait for the cpu online */ + while (!cpu_online(cpu)); + + secondary_stack = 0; + + return 0; +} + +void __init smp_cpus_done(unsigned int max_cpus) +{ +} + +int setup_profiling_timer(unsigned int multiplier) +{ + return -EINVAL; +} + +void csky_start_secondary(void) +{ + struct mm_struct *mm = &init_mm; + unsigned int cpu = smp_processor_id(); + + mtcr("cr31", secondary_hint); + mtcr("cr18", secondary_ccr); + + mtcr("vbr", vec_base); + + flush_tlb_all(); + write_mmu_pagemask(0); + TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir); + TLBMISS_HANDLER_SETUP_PGD_KERNEL(swapper_pg_dir); + + asid_cache(smp_processor_id()) = ASID_FIRST_VERSION; + +#ifdef CONFIG_CPU_HAS_FPU + init_fpu(); +#endif + + enable_smp_ipi(); + + mmget(mm); + mmgrab(mm); + current->active_mm = mm; + cpumask_set_cpu(cpu, mm_cpumask(mm)); + + notify_cpu_starting(cpu); + set_cpu_online(cpu, true); + + pr_info("CPU%u Online: %s...\n", cpu, __func__); + + local_irq_enable(); + preempt_disable(); + cpu_startup_entry(CPUHP_AP_ONLINE_IDLE); +} -- 2.7.4
next prev parent reply other threads:[~2018-10-16 3:10 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-16 2:58 [PATCH V9 00/21] C-SKY(csky) Linux Kernel Port Guo Ren 2018-10-16 2:58 ` [PATCH V9 01/21] csky: Build infrastructure Guo Ren 2018-10-23 0:08 ` Guo Ren 2018-10-24 22:53 ` Arnd Bergmann 2018-10-25 17:04 ` Guo Ren 2018-10-16 2:58 ` [PATCH V9 02/21] csky: defconfig Guo Ren 2018-10-17 14:56 ` Arnd Bergmann 2018-10-16 2:58 ` [PATCH V9 03/21] csky: Kernel booting Guo Ren 2018-10-17 14:58 ` Arnd Bergmann 2018-10-16 2:58 ` [PATCH V9 04/21] csky: Exception handling and mm-fault Guo Ren 2018-10-17 14:59 ` Arnd Bergmann 2018-10-16 2:58 ` [PATCH V9 05/21] csky: System Call Guo Ren 2018-10-17 15:02 ` Arnd Bergmann 2018-10-18 2:02 ` Guo Ren 2018-10-16 2:58 ` [PATCH V9 06/21] csky: Cache and TLB routines Guo Ren 2018-10-17 15:08 ` Arnd Bergmann 2018-10-16 2:58 ` [PATCH V9 07/21] csky: MMU and page table management Guo Ren 2018-10-17 15:06 ` Arnd Bergmann 2018-10-18 2:05 ` Guo Ren 2018-10-16 2:58 ` [PATCH V9 08/21] csky: Process management and Signal Guo Ren 2018-10-17 15:11 ` Arnd Bergmann 2018-10-18 2:37 ` Guo Ren 2018-10-16 2:58 ` [PATCH V9 09/21] csky: VDSO and rt_sigreturn Guo Ren 2018-10-17 15:13 ` Arnd Bergmann 2018-10-16 2:58 ` [PATCH V9 10/21] csky: IRQ handling Guo Ren 2018-10-17 15:14 ` Arnd Bergmann 2018-10-18 2:39 ` Guo Ren 2018-10-16 2:58 ` [PATCH V9 11/21] csky: Atomic operations Guo Ren 2018-10-17 15:17 ` Arnd Bergmann 2018-10-18 2:40 ` Guo Ren 2018-10-21 20:55 ` Peter Zijlstra 2018-10-22 1:52 ` Guo Ren 2018-10-16 2:58 ` [PATCH V9 12/21] csky: ELF and module probe Guo Ren 2018-10-17 15:18 ` Arnd Bergmann 2018-10-18 2:49 ` Guo Ren 2018-10-18 8:31 ` Arnd Bergmann 2018-10-16 2:58 ` [PATCH V9 13/21] csky: Library functions Guo Ren 2018-10-17 15:24 ` Arnd Bergmann 2018-10-18 3:10 ` Guo Ren 2018-10-16 2:58 ` [PATCH V9 14/21] csky: User access Guo Ren 2018-10-17 15:37 ` Arnd Bergmann 2018-10-16 2:58 ` [PATCH V9 15/21] csky: Debug and Ptrace GDB Guo Ren 2018-10-17 15:46 ` Arnd Bergmann 2018-10-18 3:17 ` Guo Ren 2018-10-16 2:58 ` Guo Ren [this message] 2018-10-17 15:47 ` [PATCH V9 16/21] csky: SMP support Arnd Bergmann 2018-10-16 2:58 ` [PATCH V9 17/21] csky: Misc headers Guo Ren 2018-10-17 15:49 ` Arnd Bergmann 2018-10-16 2:58 ` [PATCH V9 18/21] dt-bindings: csky CPU Bindings Guo Ren 2018-10-17 15:50 ` Arnd Bergmann 2018-10-18 3:21 ` Guo Ren 2018-10-18 3:45 ` Guo Ren 2018-10-18 14:31 ` Rob Herring 2018-10-19 2:19 ` Guo Ren 2018-10-16 2:58 ` [PATCH V9 19/21] dt-bindings: Add vendor prefix for csky Guo Ren 2018-10-16 2:58 ` [PATCH V9 20/21] MAINTAINERS: Add csky Guo Ren 2018-10-17 15:51 ` Arnd Bergmann 2018-10-16 5:48 ` [PATCH V9 21/21] csky: support dword access for get_user_size() Guo Ren 2018-10-17 15:44 ` Arnd Bergmann 2018-10-18 3:41 ` Guo Ren 2018-10-18 8:34 ` Arnd Bergmann 2018-10-18 8:57 ` Guo Ren 2018-10-24 7:17 ` Arnd Bergmann 2018-10-25 17:08 ` Guo Ren 2018-10-17 15:58 ` [PATCH V9 00/21] C-SKY(csky) Linux Kernel Port Arnd Bergmann 2018-10-18 4:10 ` Guo Ren 2018-10-18 8:36 ` Arnd Bergmann 2018-10-18 9:03 ` Guo Ren
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=4fca35ebfae9208ed6117bbe41c863a33730681e.1539655732.git.ren_guo@c-sky.com \ --to=ren_guo@c-sky.com \ --cc=akpm@linux-foundation.org \ --cc=arnd@arndb.de \ --cc=c-sky_gcc_upstream@c-sky.com \ --cc=daniel.lezcano@linaro.org \ --cc=davem@davemloft.net \ --cc=devicetree@vger.kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=hch@infradead.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=peterz@infradead.org \ --cc=robh+dt@kernel.org \ --cc=robh@kernel.org \ --cc=tglx@linutronix.de \ --subject='Re: [PATCH V9 16/21] csky: SMP support' \ /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: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).