mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 17:22:07 +00:00
57ac51667d
On Qualcomm ARM32 platforms, the SMC call can return before it has
completed. If this occurs, the call can be restarted, but it requires
using the returned session ID value from the interrupted SMC call.
The ARM32 SMCC code already has the provision to add platform specific
quirks for things like this. So let's make use of it and add the
Qualcomm specific quirk (ARM_SMCCC_QUIRK_QCOM_A6) used by the QCOM_SCM
driver.
This change is similar to the below one added for ARM64 a while ago:
commit 82bcd08702 ("firmware: qcom: scm: Fix interrupted SCM calls")
Without this change, the Qualcomm ARM32 platforms like SDX55 will return
-EINVAL for SMC calls used for modem firmware loading and validation.
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
65 lines
1.4 KiB
ArmAsm
65 lines
1.4 KiB
ArmAsm
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (c) 2015, Linaro Limited
|
|
*/
|
|
#include <linux/linkage.h>
|
|
#include <linux/arm-smccc.h>
|
|
|
|
#include <asm/asm-offsets.h>
|
|
#include <asm/opcodes-sec.h>
|
|
#include <asm/opcodes-virt.h>
|
|
#include <asm/unwind.h>
|
|
|
|
/*
|
|
* Wrap c macros in asm macros to delay expansion until after the
|
|
* SMCCC asm macro is expanded.
|
|
*/
|
|
.macro SMCCC_SMC
|
|
__SMC(0)
|
|
.endm
|
|
|
|
.macro SMCCC_HVC
|
|
__HVC(0)
|
|
.endm
|
|
|
|
.macro SMCCC instr
|
|
UNWIND( .fnstart)
|
|
mov r12, sp
|
|
push {r4-r7}
|
|
UNWIND( .save {r4-r7})
|
|
ldm r12, {r4-r7}
|
|
\instr
|
|
ldr r4, [sp, #36]
|
|
cmp r4, #0
|
|
beq 1f // No quirk structure
|
|
ldr r5, [r4, #ARM_SMCCC_QUIRK_ID_OFFS]
|
|
cmp r5, #ARM_SMCCC_QUIRK_QCOM_A6
|
|
bne 1f // No quirk present
|
|
str r6, [r4, #ARM_SMCCC_QUIRK_STATE_OFFS]
|
|
1: pop {r4-r7}
|
|
ldr r12, [sp, #(4 * 4)]
|
|
stm r12, {r0-r3}
|
|
bx lr
|
|
UNWIND( .fnend)
|
|
.endm
|
|
|
|
/*
|
|
* void smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2,
|
|
* unsigned long a3, unsigned long a4, unsigned long a5,
|
|
* unsigned long a6, unsigned long a7, struct arm_smccc_res *res,
|
|
* struct arm_smccc_quirk *quirk)
|
|
*/
|
|
ENTRY(__arm_smccc_smc)
|
|
SMCCC SMCCC_SMC
|
|
ENDPROC(__arm_smccc_smc)
|
|
|
|
/*
|
|
* void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,
|
|
* unsigned long a3, unsigned long a4, unsigned long a5,
|
|
* unsigned long a6, unsigned long a7, struct arm_smccc_res *res,
|
|
* struct arm_smccc_quirk *quirk)
|
|
*/
|
|
ENTRY(__arm_smccc_hvc)
|
|
SMCCC SMCCC_HVC
|
|
ENDPROC(__arm_smccc_hvc)
|