[5.12,21/45] ARM: 9075/1: kernel: Fix interrupted SMC calls

Message ID	20210520092054.208150206@linuxfoundation.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, Bjorn Andersson <bjorn.andersson@linaro.org>, Russell King <rmk+kernel@armlinux.org.uk>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.12 21/45] ARM: 9075/1: kernel: Fix interrupted SMC calls Date: Thu, 20 May 2021 11:22:09 +0200 Message-Id: <20210520092054.208150206@linuxfoundation.org> In-Reply-To: <20210520092053.516042993@linuxfoundation.org> References: <20210520092053.516042993@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.12,02/45] drm/i915/display: fix compiler warning about array overrun [5.12,03/45] airo: work around stack usage warning [5.12,04/45] kgdb: fix gcc-11 warning on indentation [5.12,05/45] usb: sl811-hcd: improve misleading indentation [5.12,06/45] ARM: 9058/1: cache-v7: refactor v7_invalidate_l1 to avoid clobbering r5/r6 [5.12,07/45] PCI: thunder: Fix compile testing [5.12,08/45] dmaengine: dw-edma: Fix crash on loading/unloading driver [5.12,09/45] ARM: 9066/1: ftrace: pause/unpause function graph tracer in cpu_suspend() [5.12,10/45] NFS: Fix fscache invalidation in nfs_set_cache_invalid() [5.12,11/45] ACPI / hotplug / PCI: Fix reference count leak in enable_slot() [5.12,12/45] PCI: tegra: Fix runtime PM imbalance in pex_ep_event_pex_rst_deassert() [5.12,13/45] Input: elants_i2c - do not bind to i2c-hid compatible ACPI instantiated devices [5.12,14/45] Input: silead - add workaround for x86 BIOS-es which bring the chip up in a stuck state [5.12,15/45] NFS: NFS_INO_REVAL_PAGECACHE should mark the change attribute invalid [5.12,16/45] f2fs: fix to avoid NULL pointer dereference [5.12,17/45] svcrdma: Dont leak send_ctxt on Send errors [5.12,18/45] um: Mark all kernel symbols as local [5.12,19/45] um: Disable CONFIG_GCOV with MODULES [5.12,20/45] PCI: tegra: Add Tegra194 MCFG quirks for ECAM errata [5.12,21/45] ARM: 9075/1: kernel: Fix interrupted SMC calls [5.12,22/45] platform/chrome: cros_ec_typec: Add DP mode check [5.12,23/45] riscv: Use $(LD) instead of $(CC) to link vDSO [5.12,24/45] scripts/recordmcount.pl: Fix RISC-V regex for clang [5.12,25/45] riscv: Workaround mcount name prior to clang-13 [5.12,26/45] scsi: lpfc: Fix illegal memory access on Abort IOCBs [5.12,27/45] ceph: fix fscache invalidation [5.12,28/45] ceph: dont clobber i_snap_caps on non-I_NEW inode [5.12,29/45] ceph: dont allow access to MDS-private inodes [5.12,30/45] scsi: target: tcmu: Return from tcmu_handle_completions() if cmd_id not found [5.12,31/45] amdgpu/pm: Prevent force of DCEFCLK on NAVI10 and SIENNA_CICHLID [5.12,32/45] bridge: Fix possible races between assigning rx_handler_data and setting IFF_BRIDGE_... [5.12,33/45] net: hsr: check skb can contain struct hsr_ethhdr in fill_frame_info [5.12,34/45] nvmet: remove unsupported command noise [5.12,35/45] drm/amd/display: Fix two cursor duplication when using overlay [5.12,36/45] gpiolib: acpi: Add quirk to ignore EC wakeups on Dell Venue 10 Pro 5055 [5.12,37/45] net:CXGB4: fix leak if sk_buff is not used [5.12,38/45] ALSA: hda: generic: change the DAC ctl name for LO+SPK or LO+HP [5.12,39/45] block: reexpand iov_iter after read/write [5.12,40/45] lib: stackdepot: turn depot_lock spinlock to raw_spinlock [5.12,41/45] net: stmmac: Do not enable RX FIFO overflow interrupts [5.12,42/45] ip6_gre: proper dev_{hold\|put} in ndo_[un]init methods [5.12,43/45] sit: proper dev_{hold\|put} in ndo_[un]init methods [5.12,44/45] ip6_tunnel: sit: proper dev_{hold\|put} in ndo_[un]init methods [5.12,45/45] ipv6: remove extra dev_hold() for fallback tunnels

Message ID

20210520092054.208150206@linuxfoundation.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org
	designates 23.128.96.18 as permitted sender)
	client-ip=23.128.96.18; 
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org,
	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Russell King <rmk+kernel@armlinux.org.uk>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.12 21/45] ARM: 9075/1: kernel: Fix interrupted SMC calls
Date: Thu, 20 May 2021 11:22:09 +0200
Message-Id: <20210520092054.208150206@linuxfoundation.org>
In-Reply-To: <20210520092053.516042993@linuxfoundation.org>
References: <20210520092053.516042993@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH May 20, 2021, 9:22 a.m. UTC

From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>


[ Upstream commit 57ac51667d8cd62731223d687e5fe7b41c502f89 ]

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 82bcd087029f ("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>

Signed-off-by: Sasha Levin <sashal@kernel.org>

---
 arch/arm/kernel/asm-offsets.c |  3 +++
 arch/arm/kernel/smccc-call.S  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

-- 
2.30.2

diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
index be8050b0c3df..70993af22d80 100644
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
@@ -24,6 +24,7 @@ 
 #include <asm/vdso_datapage.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <linux/kbuild.h>
+#include <linux/arm-smccc.h>
 #include "signal.h"
 
 /*
@@ -148,6 +149,8 @@  int main(void)
   DEFINE(SLEEP_SAVE_SP_PHYS,	offsetof(struct sleep_save_sp, save_ptr_stash_phys));
   DEFINE(SLEEP_SAVE_SP_VIRT,	offsetof(struct sleep_save_sp, save_ptr_stash));
 #endif
+  DEFINE(ARM_SMCCC_QUIRK_ID_OFFS,	offsetof(struct arm_smccc_quirk, id));
+  DEFINE(ARM_SMCCC_QUIRK_STATE_OFFS,	offsetof(struct arm_smccc_quirk, state));
   BLANK();
   DEFINE(DMA_BIDIRECTIONAL,	DMA_BIDIRECTIONAL);
   DEFINE(DMA_TO_DEVICE,		DMA_TO_DEVICE);
diff --git a/arch/arm/kernel/smccc-call.S b/arch/arm/kernel/smccc-call.S
index 00664c78faca..931df62a7831 100644
--- a/arch/arm/kernel/smccc-call.S
+++ b/arch/arm/kernel/smccc-call.S
@@ -3,7 +3,9 @@ 
  * 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>
@@ -27,7 +29,14 @@  UNWIND(	.fnstart)
 UNWIND(	.save	{r4-r7})
 	ldm	r12, {r4-r7}
 	\instr
-	pop	{r4-r7}
+	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

[5.12,21/45] ARM: 9075/1: kernel: Fix interrupted SMC calls

Commit Message

Patch