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

Commit 3e354370 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'v3.18/topic/for-stable' into linux-linaro-lsk-v3.18 

* v3.18/topic/for-stable:
  arm64: psci: move psci firmware calls out of line
  ARM: 8307/1: psci: move psci firmware calls out of line

 Conflicts:
	arch/arm64/kernel/Makefile
parents be347417 7e3ec66b

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 


obj-$(CONFIG_ARM_VIRT_EXT)	+= hyp-stub.o

ifeq ($(CONFIG_ARM_PSCI),y)

obj-y				+= psci.o

obj-y				+= psci.o psci-call.o

obj-$(CONFIG_SMP)		+= psci_smp.o

endif

arch/arm/kernel/psci-call.S

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

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

 *

 * Copyright (C) 2015 ARM Limited

 *

 * Author: Mark Rutland <mark.rutland@arm.com>

 */



#include <linux/linkage.h>



#include <asm/opcodes-sec.h>

#include <asm/opcodes-virt.h>



/* int __invoke_psci_fn_hvc(u32 function_id, u32 arg0, u32 arg1, u32 arg2) */

ENTRY(__invoke_psci_fn_hvc)

	__HVC(0)

	bx	lr

ENDPROC(__invoke_psci_fn_hvc)



/* int __invoke_psci_fn_smc(u32 function_id, u32 arg0, u32 arg1, u32 arg2) */

ENTRY(__invoke_psci_fn_smc)

	__SMC(0)

	bx	lr

ENDPROC(__invoke_psci_fn_smc)

arch/arm/kernel/psci.c

+3 −36
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 


#include <asm/compiler.h>

#include <asm/errno.h>

#include <asm/opcodes-sec.h>

#include <asm/opcodes-virt.h>

#include <asm/psci.h>

#include <asm/system_misc.h>
@@ -33,6 +31,9 @@ struct psci_operations psci_ops; 
static int (*invoke_psci_fn)(u32, u32, u32, u32);

typedef int (*psci_initcall_t)(const struct device_node *);



asmlinkage int __invoke_psci_fn_hvc(u32, u32, u32, u32);

asmlinkage int __invoke_psci_fn_smc(u32, u32, u32, u32);



enum psci_function {

	PSCI_FN_CPU_SUSPEND,

	PSCI_FN_CPU_ON,
@@ -71,40 +72,6 @@ static u32 psci_power_state_pack(struct psci_power_state state) 
		 & PSCI_0_2_POWER_STATE_AFFL_MASK);

}



/*

 * The following two functions are invoked via the invoke_psci_fn pointer

 * and will not be inlined, allowing us to piggyback on the AAPCS.

 */

static noinline int __invoke_psci_fn_hvc(u32 function_id, u32 arg0, u32 arg1,

					 u32 arg2)

{

	asm volatile(

			__asmeq("%0", "r0")

			__asmeq("%1", "r1")

			__asmeq("%2", "r2")

			__asmeq("%3", "r3")

			__HVC(0)

		: "+r" (function_id)

		: "r" (arg0), "r" (arg1), "r" (arg2));



	return function_id;

}



static noinline int __invoke_psci_fn_smc(u32 function_id, u32 arg0, u32 arg1,

					 u32 arg2)

{

	asm volatile(

			__asmeq("%0", "r0")

			__asmeq("%1", "r1")

			__asmeq("%2", "r2")

			__asmeq("%3", "r3")

			__SMC(0)

		: "+r" (function_id)

		: "r" (arg0), "r" (arg1), "r" (arg2));



	return function_id;

}



static int psci_get_version(void)

{

	int err;

arch/arm64/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ CFLAGS_REMOVE_return_address.o = -pg 
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 cpu_ops.o insn.o return_address.o	\

			   cpuinfo.o cpu_errata.o alternative.o

			   hyp-stub.o psci.o psci-call.o cpu_ops.o insn.o 	\

			   return_address.o cpuinfo.o cpu_errata.o alternative.o



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

					   sys_compat.o

arch/arm64/kernel/psci-call.S

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

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

 *

 * Copyright (C) 2015 ARM Limited

 *

 * Author: Will Deacon <will.deacon@arm.com>

 */



#include <linux/linkage.h>



/* int __invoke_psci_fn_hvc(u64 function_id, u64 arg0, u64 arg1, u64 arg2) */

ENTRY(__invoke_psci_fn_hvc)

	hvc	#0

	ret

ENDPROC(__invoke_psci_fn_hvc)



/* int __invoke_psci_fn_smc(u64 function_id, u64 arg0, u64 arg1, u64 arg2) */

ENTRY(__invoke_psci_fn_smc)

	smc	#0

	ret

ENDPROC(__invoke_psci_fn_smc)