Skip to contentSkip to conversation

ARM: Alpine: smp support

PATCH Superseded Tsahee Zidenberg 2 participants 2 messages Feb 3, 2015

Subsystems (3)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 3/6 ARM: Alpine: smp support

This patch introduces support for waking up secondary CPU cores on Alpine platform.

---
 arch/arm/mach-alpine/Kconfig             |  2 +
 arch/arm/mach-alpine/Makefile            |  1 +
 arch/arm/mach-alpine/alpine_cpu_pm.c     | 70 ++++++++++++++++++++++++++++++++
 arch/arm/mach-alpine/alpine_cpu_pm.h     | 26 ++++++++++++
 arch/arm/mach-alpine/alpine_cpu_resume.h | 38 +++++++++++++++++
 arch/arm/mach-alpine/platsmp.c           | 49 ++++++++++++++++++++++
 6 files changed, 186 insertions(+)
 create mode 100644 arch/arm/mach-alpine/alpine_cpu_pm.c
 create mode 100644 arch/arm/mach-alpine/alpine_cpu_pm.h
 create mode 100644 arch/arm/mach-alpine/alpine_cpu_resume.h
 create mode 100644 arch/arm/mach-alpine/platsmp.c
arch/arm/mach-alpine/Kconfig +2 -0
index 4548f32..fd5062a 100644
@@ -4,5 +4,7 @@ config ARCH_ALPINE
 	select ARM_GIC
 	select GENERIC_IRQ_CHIP
 	select HAVE_ARM_ARCH_TIMER
+	select HAVE_SMP
+	select MFD_SYSCON
 	help
 	  This enables support for the Annapurna Labs Alpine V1 boards.
arch/arm/mach-alpine/Makefile +1 -0
index 8ba9e99..fad7a68 100644
@@ -3,3 +3,4 @@
 #
 
 obj-y				+= alpine_machine.o
+obj-$(CONFIG_SMP)		+= platsmp.o alpine_cpu_pm.o
arch/arm/mach-alpine/alpine_cpu_pm.c new file +70 -0

70 lines not on this page · raw message

arch/arm/mach-alpine/alpine_cpu_pm.h new file +26 -0
new file mode 100644
index 0000000..4d32716
@@ -0,0 +1,26 @@
+/*
+ * Low-level power-management support for Alpine platform.
+ *
+ * Copyright (C) 2015 Annapurna Labs Ltd.
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ */
+
+#ifndef __ALPINE_CPU_PM_H__
+#define __ALPINE_CPU_PM_H__
+
+/* Alpine CPU Power Management Services Initialization */
+void __init alpine_cpu_pm_init(void);
+
+/* Wake-up a CPU */
+int alpine_cpu_wakeup(unsigned int phys_cpu, uint32_t phys_resume_addr);
+
+#endif /* __ALPINE_CPU_PM_H__ */
arch/arm/mach-alpine/alpine_cpu_resume.h new file +38 -0
new file mode 100644
index 0000000..c80150c
@@ -0,0 +1,38 @@
+/*
+ * Annapurna labs cpu-resume register structure.
+ *
+ * Copyright (C) 2015 Annapurna Labs Ltd.
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ */
+
+#ifndef ALPINE_CPU_RESUME_H_
+#define ALPINE_CPU_RESUME_H_
+
+/* Per-cpu regs */
+struct al_cpu_resume_regs_per_cpu {
+	uint32_t	flags;
+	uint32_t	resume_addr;
+};
+
+/* general regs */
+struct al_cpu_resume_regs {
+	/* Watermark for validating the CPU resume struct */
+	uint32_t watermark;
+	uint32_t flags;
+	struct al_cpu_resume_regs_per_cpu per_cpu[];
+};
+
+/* The expected magic number for validating the resume addresses */
+#define AL_CPU_RESUME_MAGIC_NUM		0xf0e1d200
+#define AL_CPU_RESUME_MAGIC_NUM_MASK	0xffffff00
+
+#endif /* ALPINE_CPU_RESUME_H_ */
arch/arm/mach-alpine/platsmp.c new file +49 -0

49 lines not on this page · raw message

Signature · 1 line
1.9.1
#1 lore raw

PATCH v4 3/6 ARM: Alpine: smp support

Quoted 17 lines · Tsahee Zidenberg
arch/arm/mach-alpine/alpine_cpu_pm.h new file +11 -0
new file mode 100644
index 0000000..4d32716
@@ -0,0 +1,26 @@
+/*
+ * Low-level power-management support for Alpine platform.
+ *
+ * Copyright (C) 2015 Annapurna Labs Ltd.
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,

arch/arm/mach-alpine/alpine_cpu_pm.h line 21

Quoted 10 lines
arch/arm/mach-alpine/alpine_cpu_pm.h new file +10 -0
+ * 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.
+ */
+
+#ifndef __ALPINE_CPU_PM_H__
+#define __ALPINE_CPU_PM_H__
+
+/* Alpine CPU Power Management Services Initialization */
+void __init alpine_cpu_pm_init(void);

No need to have __init in header files.

Quoted 23 lines
arch/arm/mach-alpine/platsmp.c new file +16 -0
new file mode 100644
index 0000000..43b7641
@@ -0,0 +1,49 @@
+/*
+ * SMP operations for Alpine platform.
+ *
+ * Copyright (C) 2015 Annapurna Labs Ltd.
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ */
+

arch/arm/mach-alpine/platsmp.c line 26

Quoted 10 lines
arch/arm/mach-alpine/platsmp.c new file +10 -0
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/io.h>
+#include <linux/of.h>
+
+#include <asm/smp_plat.h>
+
+#include "alpine_cpu_pm.h"
+
+int __cpuinit alpine_boot_secondary(unsigned int cpu, struct task_struct *idle)

static? There's no such thing as __cpuinit anymore, please remove.

Quoted 4 lines
arch/arm/mach-alpine/platsmp.c new file +4 -0
+{
+	phys_addr_t addr;
+
+	addr = virt_to_phys(secondary_startup);

arch/arm/mach-alpine/platsmp.c line 40

Quoted 10 lines
arch/arm/mach-alpine/platsmp.c new file +10 -0
+
+	if (addr > (phys_addr_t)(uint32_t)(-1)) {
+		pr_err("FAIL: resume address over 32bit (%pa)", &addr);
+		return -EINVAL;
+	}
+
+	return alpine_cpu_wakeup(cpu_logical_map(cpu), (uint32_t)addr);
+}
+
+void __init alpine_smp_prepare_cpus(unsigned int max_cpus)

static?

arch/arm/mach-alpine/platsmp.c line 45

Quoted 5 lines
arch/arm/mach-alpine/platsmp.c new file +5 -0
+{
+	alpine_cpu_pm_init();
+}
+
+struct smp_operations __initdata alpine_smp_ops = {

static struct smp_operations alpine_smp_ops __initdata= {

Quoted 4 lines
arch/arm/mach-alpine/platsmp.c new file +4 -0
+	.smp_prepare_cpus	= alpine_smp_prepare_cpus,
+	.smp_boot_secondary	= alpine_boot_secondary,
+};
+CPU_METHOD_OF_DECLARE(alpine_smp, "al,alpine-smp", &alpine_smp_ops);
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project