Merge tag '3.10-rc2-psci-ops-11-tag' of... (78ecad01) · Commits · 戴 / test

arch/arm/include/asm/mach/arch.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@
		* published by the Free Software Foundation.
		*/

		#include <linux/types.h>

		#ifndef __ASSEMBLY__

		struct tag;
		@@ -16,8 +18,10 @@ struct pt_regs;
		struct smp_operations;
		#ifdef CONFIG_SMP
		#define smp_ops(ops) (&(ops))
		#define smp_init_ops(ops) (&(ops))
		#else
		#define smp_ops(ops) (struct smp_operations *)NULL
		#define smp_init_ops(ops) (bool (*)(void))NULL
		#endif

		struct machine_desc {
		@@ -41,6 +45,7 @@ struct machine_desc {
		unsigned char reserve_lp2 :1; /* never has lp2 */
		char restart_mode; /* default restart mode */
		struct smp_operations smp; / SMP operations */
		bool (*smp_init)(void);
		void (fixup)(struct tag , char **,
		struct meminfo *);
		void (reserve)(void);/ reserve mem blocks */

arch/arm/include/asm/psci.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -32,5 +32,14 @@ struct psci_operations {
		};

		extern struct psci_operations psci_ops;
		extern struct smp_operations psci_smp_ops;

		#ifdef CONFIG_ARM_PSCI
		void psci_init(void);
		bool psci_smp_available(void);
		#else
		static inline void psci_init(void) { }
		static inline bool psci_smp_available(void) { return false; }
		#endif

		#endif /* __ASM_ARM_PSCI_H */

arch/arm/kernel/Makefile

+4 −1

Original line number	Diff line number	Diff line
		@@ -88,6 +88,9 @@ obj-$(CONFIG_DEBUG_LL) += debug.o
		obj-$(CONFIG_EARLY_PRINTK) += early_printk.o

		obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o
		obj-$(CONFIG_ARM_PSCI) += psci.o
		ifeq ($(CONFIG_ARM_PSCI),y)
		obj-y += psci.o
		obj-$(CONFIG_SMP) += psci_smp.o
		endif

		extra-y := $(head-y) vmlinux.lds

arch/arm/kernel/psci.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ static const struct of_device_id psci_of_match[] __initconst = {
		{},
		};

		static int __init psci_init(void)
		void __init psci_init(void)
		{
		struct device_node *np;
		const char *method;
		@@ -166,7 +166,7 @@ static int __init psci_init(void)

		np = of_find_matching_node(NULL, psci_of_match);
		if (!np)
		return 0;
		return;

		pr_info("probing function IDs from device-tree\n");

		@@ -206,6 +206,5 @@ static int __init psci_init(void)

		out_put_node:
		of_node_put(np);
		return 0;
		return;
		}
		early_initcall(psci_init);

arch/arm/mach-virt/platsmp.c→arch/arm/kernel/psci_smp.c

+84 −0

Original line number	Diff line number	Diff line
		/*
		* Dummy Virtual Machine - does what it says on the tin.
		*
		* Copyright (C) 2012 ARM Ltd
		* Author: Will Deacon <will.deacon@arm.com>
		*
		* 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.
		@@ -13,38 +8,77 @@
		* 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/>.
		* Copyright (C) 2012 ARM Limited
		*
		* Author: Will Deacon <will.deacon@arm.com>
		*/

		#include <linux/init.h>
		#include <linux/irqchip/arm-gic.h>
		#include <linux/smp.h>
		#include <linux/of.h>

		#include <asm/psci.h>
		#include <asm/smp_plat.h>

		/*
		* psci_smp assumes that the following is true about PSCI:
		*
		* cpu_suspend Suspend the execution on a CPU
		* @state we don't currently describe affinity levels, so just pass 0.
		* @entry_point the first instruction to be executed on return
		* returns 0 success, < 0 on failure
		*
		* cpu_off Power down a CPU
		* @state we don't currently describe affinity levels, so just pass 0.
		* no return on successful call
		*
		* cpu_on Power up a CPU
		* @cpuid cpuid of target CPU, as from MPIDR
		* @entry_point the first instruction to be executed on return
		* returns 0 success, < 0 on failure
		*
		* migrate Migrate the context to a different CPU
		* @cpuid cpuid of target CPU, as from MPIDR
		* returns 0 success, < 0 on failure
		*
		*/

		extern void secondary_startup(void);

		static void __init virt_smp_init_cpus(void)
		static int __cpuinit psci_boot_secondary(unsigned int cpu,
		struct task_struct *idle)
		{
		if (psci_ops.cpu_on)
		return psci_ops.cpu_on(cpu_logical_map(cpu),
		__pa(secondary_startup));
		return -ENODEV;
		}

		static void __init virt_smp_prepare_cpus(unsigned int max_cpus)
		#ifdef CONFIG_HOTPLUG_CPU
		void __ref psci_cpu_die(unsigned int cpu)
		{
		const struct psci_power_state ps = {
		.type = PSCI_POWER_STATE_TYPE_POWER_DOWN,
		};

		if (psci_ops.cpu_off)
		psci_ops.cpu_off(ps);

		/* We should never return */
		panic("psci: cpu %d failed to shutdown\n", cpu);
		}
		#else
		#define psci_cpu_die NULL
		#endif

		static int __cpuinit virt_boot_secondary(unsigned int cpu,
		struct task_struct *idle)
		bool __init psci_smp_available(void)
		{
		if (psci_ops.cpu_on)
		return psci_ops.cpu_on(cpu_logical_map(cpu),
		__pa(secondary_startup));
		return -ENODEV;
		/* is cpu_on available at least? */
		return (psci_ops.cpu_on != NULL);
		}

		struct smp_operations __initdata virt_smp_ops = {
		.smp_init_cpus = virt_smp_init_cpus,
		.smp_prepare_cpus = virt_smp_prepare_cpus,
		.smp_boot_secondary = virt_boot_secondary,
		struct smp_operations __initdata psci_smp_ops = {
		.smp_boot_secondary = psci_boot_secondary,
		.cpu_die = psci_cpu_die,
		};

Admin message