From patchwork Thu May 20 09:22:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443162 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2110427jac; Thu, 20 May 2021 02:25:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRcwrsNviTUM4QPeK/YRsupUngYaPFYqXsoueE+ZYfDjkCRNTwappSa+6atokPDWLIE8an X-Received: by 2002:a05:6638:1650:: with SMTP id a16mr4778317jat.23.1621502727875; Thu, 20 May 2021 02:25:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621502727; cv=none; d=google.com; s=arc-20160816; b=DYCPZnzDsNOKuO0TNJalliCAMxDl/ILpr9vJavDaFJgXUA4Dh7dPpeBhCCeIBE9tVo qCugwD9e0OW/mLgJVE0gCgrnjzudYQafMk7gCYrq5Px9JEZKy3HJQGmPfAOjVoJlDPcO Q3WQx6xnhkpR60YToQCS0JYTEx72tleRDMYPos+DApNvPDI+fdVKnLf+HpRfkIJl00EA FnO7FJ3G5pmHao/E17VxjfzaFt/YJP58G55HQHs5cU0T8IRFVgcWKL12tJzd7J7e0I/V LBru76dvTaqpE+AQ3gLOLAxkIOFfDwedD8WL1wPJPlzqRmbgWXy62+PPKiq8thkndgqe e2PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m3O7wbHR6K2GktpqTcn6PKKHp3U1GNc2Uz5TPA1Pawo=; b=pBexehkbGBTZd30/0Dzj9LlYmwcepUZmh1z1y9H415YHFG2wW/9ey3OhLUcqI5/0l/ hqH0r5ZvIdjoLCRgPWPW8QIQhLVpnEKWxBaZPDVno5EUYwDi25i3R65oUpwva11GmOuz 4O+4r/0cEUdAQjtZJWwO06bkeMh42y5uoEJeY2d5nqLKYyhoptq/4O6QRsQVcNVr5Nyi pLjaya1bCnqBCBRoWs3/0XvBHHlIDSLCMMnkiNosDsBqopFgYv8c9/wfBTayNGOy4JlH DX1Fl+Q9jHQHZMEUZ66XnhJo0vMMFvyq8H38cQC9E1cZBdFhiEsmpC2sU6MJRGcLI2bd 0hzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VDVHjkoU; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a2si2245241ilp.43.2021.05.20.02.25.27; Thu, 20 May 2021 02:25:27 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VDVHjkoU; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231709AbhETJ0r (ORCPT + 12 others); Thu, 20 May 2021 05:26:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:52886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231713AbhETJ00 (ORCPT ); Thu, 20 May 2021 05:26:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B0F961261; Thu, 20 May 2021 09:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621502704; bh=gFCcF5BTHerYyZCaGQSR28fzhZp33fOtxwvk3P1bJTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VDVHjkoUdUM9aM9BfGJ3Bz+mtx7ZcNNHzOw6J8wiilTU2QCsZQVwH+uCbvLzQJB8V SzCoku/c8zLUKFuFYRL2pQAF5prN2pwSQ3dZE/Rsjh0PmGtZPgn0R21//82j2ZZmCr bNy1oGMTp2mIyHMuFOo/DOH1awY6zifL9D9Q7Pjk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Manivannan Sadhasivam , Bjorn Andersson , Russell King , Sasha Levin 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> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092053.516042993@linuxfoundation.org> References: <20210520092053.516042993@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Manivannan Sadhasivam [ 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 Reviewed-by: Bjorn Andersson Signed-off-by: Russell King Signed-off-by: Sasha Levin --- 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 #include #include +#include #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 +#include +#include #include #include #include @@ -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