From patchwork Thu Dec 29 23:27:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 9491681 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3890E60453 for ; Thu, 29 Dec 2016 23:29:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24AB21FF65 for ; Thu, 29 Dec 2016 23:29:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 196B020007; Thu, 29 Dec 2016 23:29:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C25671FF65 for ; Thu, 29 Dec 2016 23:29:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cMk7R-0003H7-Fe; Thu, 29 Dec 2016 23:28:21 +0000 Received: from mail-oi0-x231.google.com ([2607:f8b0:4003:c06::231]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cMk72-00038G-Bk for linux-arm-kernel@lists.infradead.org; Thu, 29 Dec 2016 23:27:57 +0000 Received: by mail-oi0-x231.google.com with SMTP id b126so411152107oia.2 for ; Thu, 29 Dec 2016 15:27:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q01SEgpWz3aVhdZDw9PK2F1PR8ZxZ7TnZ+Rzq58FWxY=; b=eXse6zMJtuy7fMnK91GR4Eee5/axhCo8kn1HOzp0CXHdqGHnj5Wu8LD9rQ6V6Xwluo Y28l1xCPjKmD1hku3a6HDdEISNar4gYouEZlodkZjHhrbCi3GuNCLUVwWDQuXzj9L3sy 9+RbU9gFUnrccPzc3kqLyFgt61oiwJPw48aiI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Q01SEgpWz3aVhdZDw9PK2F1PR8ZxZ7TnZ+Rzq58FWxY=; b=mqrFrfIn+nrEJW7vmnaxUXrFsUTSTKA8QqsDv3xn4f5PAwnUOcPb0itba/fyUB4rH9 /9Y2jFu6i2MjjeBvVervhCU9pJwRder3gK0I+K/O1U8N9iYqWn4aAW7kP8QG3T/nWWr5 M95zF/3ucbJzJPJkvW+5JEJd/t/koqXDHaRnb1VJekZHpTRr6U4EjCNwHXQ6nJm9CW0f 3uSYw4tEs3dMVdM/vhXpeV3qiGmFxcnPc/xmIy7FyETV2TQZjKW3ZTUdThSXv9Rdpgdc vNGkC3ZwIpe5pFS5DiurkZNWP1ezKmPkzcCJNx0oc/3uYHu5hMcqyy82kAdegya6ifV4 qGIw== X-Gm-Message-State: AIkVDXJMfg5jvPm7jz97ANe5z3QdYdlXT+0w4FtFxwjmONVkz5b8roAXAGuLIAid9dze8D9T X-Received: by 10.157.38.189 with SMTP id l58mr14589223otb.114.1483054055242; Thu, 29 Dec 2016 15:27:35 -0800 (PST) Received: from localhost ([2602:306:3406:6500:1902:d2c:340d:eaac]) by smtp.gmail.com with ESMTPSA id 90sm25899889otw.15.2016.12.29.15.27.34 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 29 Dec 2016 15:27:34 -0800 (PST) From: Andy Gross To: linux-kernel@vger.kernel.org Subject: [Patch v2 2/2] firmware: qcom: scm: Fix interrupted SCM calls Date: Thu, 29 Dec 2016 17:27:26 -0600 Message-Id: <1483054046-3327-3-git-send-email-andy.gross@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483054046-3327-1-git-send-email-andy.gross@linaro.org> References: <1483054046-3327-1-git-send-email-andy.gross@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161229_152756_529329_7B2A60D0 X-CRM114-Status: GOOD ( 15.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lorenzo.pieralisi@arm.com, linux-arm-msm@vger.kernel.org, will.deacon@arm.com, linux@armlinux.org.uk, Bjorn Andersson , Srinivas Kandagatla , Kevin Hilman , Andy Gross , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds a Qualcomm specific quirk to the arm_smccc_smc call. On Qualcomm ARM64 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 quirk stores off the session ID from the interrupted call in the quirk structure so that it can be used by the caller. This patch folds in a fix given by Sricharan R: https://lkml.org/lkml/2016/9/28/272 Signed-off-by: Andy Gross Reviewed-by: Will Deacon --- arch/arm64/kernel/smccc-call.S | 9 ++++++++- drivers/firmware/qcom_scm-64.c | 13 ++++++++++--- include/linux/arm-smccc.h | 11 ++++++++--- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/smccc-call.S b/arch/arm64/kernel/smccc-call.S index 6290696..72ecdca 100644 --- a/arch/arm64/kernel/smccc-call.S +++ b/arch/arm64/kernel/smccc-call.S @@ -12,6 +12,7 @@ * */ #include +#include #include .macro SMCCC instr @@ -20,7 +21,13 @@ ldr x4, [sp] stp x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS] stp x2, x3, [x4, #ARM_SMCCC_RES_X2_OFFS] - ret + ldr x4, [sp, #8] + cbz x4, 1f /* no quirk structure */ + ldr x9, [x4, #ARM_SMCCC_QUIRK_ID_OFFS] + cmp x9, #ARM_SMCCC_QUIRK_QCOM_A6 + b.ne 1f + str x6, [x4, ARM_SMCCC_QUIRK_STATE_OFFS] +1: ret .cfi_endproc .endm diff --git a/drivers/firmware/qcom_scm-64.c b/drivers/firmware/qcom_scm-64.c index 4a0f5ea..1e2e519 100644 --- a/drivers/firmware/qcom_scm-64.c +++ b/drivers/firmware/qcom_scm-64.c @@ -91,6 +91,7 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id, dma_addr_t args_phys = 0; void *args_virt = NULL; size_t alloc_len; + struct arm_smccc_quirk quirk = {.id = ARM_SMCCC_QUIRK_QCOM_A6}; if (unlikely(arglen > N_REGISTER_ARGS)) { alloc_len = N_EXT_QCOM_SCM_ARGS * sizeof(u64); @@ -131,10 +132,16 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id, qcom_smccc_convention, ARM_SMCCC_OWNER_SIP, fn_id); + quirk.state.a6 = 0; + do { - arm_smccc_smc(cmd, desc->arginfo, desc->args[0], - desc->args[1], desc->args[2], x5, 0, 0, - res); + arm_smccc_smc_quirk(cmd, desc->arginfo, desc->args[0], + desc->args[1], desc->args[2], x5, + quirk.state.a6, 0, res, &quirk); + + if (res->a0 == QCOM_SCM_INTERRUPTED) + cmd = res->a0; + } while (res->a0 == QCOM_SCM_INTERRUPTED); mutex_unlock(&qcom_scm_lock); diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index cde4f1f..64d0454 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -14,9 +14,6 @@ #ifndef __LINUX_ARM_SMCCC_H #define __LINUX_ARM_SMCCC_H -#include -#include - /* * This file provides common defines for ARM SMC Calling Convention as * specified in @@ -60,6 +57,13 @@ #define ARM_SMCCC_OWNER_TRUSTED_OS 50 #define ARM_SMCCC_OWNER_TRUSTED_OS_END 63 +#define ARM_SMCCC_QUIRK_NONE 0 +#define ARM_SMCCC_QUIRK_QCOM_A6 1 /* Save/restore register a6 */ + +#ifndef __ASSEMBLY__ + +#include +#include /** * struct arm_smccc_res - Result from SMC/HVC call * @a0-a3 result values from registers 0 to 3 @@ -121,4 +125,5 @@ asmlinkage void arm_smccc_hvc(unsigned long a0, unsigned long a1, #define arm_smccc_smc_quirk(a0, a1, a2, a3, a4, a5, a6, a7, res, quirk) \ __arm_smccc_smc(a0, a1, a2, a3, a4, a5, a6, a7, res, quirk) +#endif /*__ASSEMBLY__*/ #endif /*__LINUX_ARM_SMCCC_H*/