Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd1aebf5 authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas
Browse files

arm64: reorganise smp_enable_ops 



For hotplug support, we're going to want a place to store operations
that do more than bring CPUs online, and it makes sense to group these
with our current smp_enable_ops. For cpuidle support, we'll want to
group additional functions, and we may want them even for UP kernels.

This patch renames smp_enable_ops to the more general cpu_operations,
and pulls the definitions out of smp code such that they can be used in
UP kernels. While we're at it, fix up instances of the cpu parameter to
be an unsigned int, drop the init markings and rename the *_cpu
functions to cpu_* to reduce future churn when cpu_operations is
extended.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 00ef54bb

arch/arm64/include/asm/cpu_ops.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * 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.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#ifndef __ASM_CPU_OPS_H

#define __ASM_CPU_OPS_H



#include <linux/init.h>

#include <linux/threads.h>



struct device_node;



struct cpu_operations {

	const char	*name;

	int		(*cpu_init)(struct device_node *, unsigned int);

	int		(*cpu_prepare)(unsigned int);

};



extern const struct cpu_operations *cpu_ops[NR_CPUS];

extern const struct cpu_operations * __init cpu_get_ops(const char *name);



#endif /* ifndef __ASM_CPU_OPS_H */

arch/arm64/include/asm/smp.h

+0 −11
Original line number Diff line number Diff line
@@ -66,15 +66,4 @@ extern volatile unsigned long secondary_holding_pen_release; 
extern void arch_send_call_function_single_ipi(int cpu);

extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);



struct device_node;



struct smp_enable_ops {

	const char	*name;

	int		(*init_cpu)(struct device_node *, int);

	int		(*prepare_cpu)(int);

};



extern const struct smp_enable_ops smp_spin_table_ops;

extern const struct smp_enable_ops smp_psci_ops;



#endif /* ifndef __ASM_SMP_H */

arch/arm64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET) 
arm64-obj-y		:= cputable.o debug-monitors.o entry.o irq.o fpsimd.o	\

			   entry-fpsimd.o process.o ptrace.o setup.o signal.o	\

			   sys.o stacktrace.o time.o traps.o io.o vdso.o	\

			   hyp-stub.o psci.o

			   hyp-stub.o psci.o cpu_ops.o



arm64-obj-$(CONFIG_COMPAT)		+= sys32.o kuser32.o signal32.o 	\

					   sys_compat.o

arch/arm64/kernel/cpu_ops.c

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 * CPU kernel entry/exit control

 *

 * Copyright (C) 2013 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * 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.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <asm/cpu_ops.h>

#include <linux/string.h>



extern const struct cpu_operations smp_spin_table_ops;

extern const struct cpu_operations cpu_psci_ops;



const struct cpu_operations *cpu_ops[NR_CPUS];



static const struct cpu_operations *supported_cpu_ops[] __initconst = {

#ifdef CONFIG_SMP

	&smp_spin_table_ops,

	&cpu_psci_ops,

#endif

	NULL,

};



const struct cpu_operations * __init cpu_get_ops(const char *name)

{

	const struct cpu_operations **ops = supported_cpu_ops;



	while (*ops) {

		if (!strcmp(name, (*ops)->name))

			return *ops;



		ops++;

	}



	return NULL;

}

arch/arm64/kernel/psci.c

+6 −5
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/smp.h>



#include <asm/compiler.h>

#include <asm/cpu_ops.h>

#include <asm/errno.h>

#include <asm/psci.h>

#include <asm/smp_plat.h>
@@ -231,12 +232,12 @@ int __init psci_init(void) 


#ifdef CONFIG_SMP



static int __init smp_psci_init_cpu(struct device_node *dn, int cpu)

static int __init cpu_psci_cpu_init(struct device_node *dn, unsigned int cpu)

{

	return 0;

}



static int __init smp_psci_prepare_cpu(int cpu)

static int __init cpu_psci_cpu_prepare(unsigned int cpu)

{

	int err;
@@ -254,10 +255,10 @@ static int __init smp_psci_prepare_cpu(int cpu) 
	return 0;

}



const struct smp_enable_ops smp_psci_ops __initconst = {

const struct cpu_operations cpu_psci_ops = {

	.name		= "psci",

	.init_cpu	= smp_psci_init_cpu,

	.prepare_cpu	= smp_psci_prepare_cpu,

	.cpu_init	= cpu_psci_cpu_init,

	.cpu_prepare	= cpu_psci_cpu_prepare,

};



#endif