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

Commit 109ba986 authored by Rishabh Bhatnagar's avatar Rishabh Bhatnagar Committed by Gerrit - the friendly Code Review server
Browse files

arch: arm: Handle quirk structure after secure call return 



Secure call may return session-id in the registers if the call
is interrupted. Before restoring the registers extract the
session id and store it in quirk structure.

Change-Id: I2a07ebdea704b8e86472dccb4b95e60f8e4c6736
Signed-off-by: default avatarRishabh Bhatnagar <rishabhb@codeaurora.org>
parent 76a04e42

arch/arm/kernel/smccc-call.S

+11 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <asm/opcodes-sec.h>

#include <asm/opcodes-virt.h>

#include <asm/unwind.h>

#include <linux/arm-smccc.h>



	/*

	 * Wrap c macros in asm macros to delay expansion until after the
@@ -27,9 +28,17 @@ UNWIND( .fnstart) 
UNWIND(	.save	{r4-r7})

	ldm	r12, {r4-r7}

	\instr

	pop	{r4-r7}

	ldr	r12, [sp, #(4 * 4)]

	ldr	r12, [sp, #(4 * 8)]

	stm	r12, {r0-r3}

	ldr	r12, [sp, #(4 * 9)]

	cmp	r12, #0

	beq	1f

	ldr	r8, [r12]

	cmp 	r8, #ARM_SMCCC_QUIRK_QCOM_A6

	bne	1f

	str	r6, [r12, #4]

1:

	pop	{r4-r7}

	bx	lr

UNWIND(	.fnend)

	.endm