From patchwork Wed Jan 11 22:31:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 91001 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1347618qgi; Wed, 11 Jan 2017 14:32:42 -0800 (PST) X-Received: by 10.98.152.79 with SMTP id q76mr12769472pfd.147.1484173962601; Wed, 11 Jan 2017 14:32:42 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k68si7063943pfb.181.2017.01.11.14.32.42; Wed, 11 Jan 2017 14:32:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964864AbdAKWcX (ORCPT + 25 others); Wed, 11 Jan 2017 17:32:23 -0500 Received: from mail-oi0-f49.google.com ([209.85.218.49]:34186 "EHLO mail-oi0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757280AbdAKWcI (ORCPT ); Wed, 11 Jan 2017 17:32:08 -0500 Received: by mail-oi0-f49.google.com with SMTP id 3so2738712oih.1 for ; Wed, 11 Jan 2017 14:32:08 -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=AdA74sYhuGp5YjP1VpOY0BWqCYQ5MuSQvaf8CR7hAyA=; b=FKCp3XXOM20s2diSWuj3uKYyhV9sk8hDJaAioRUC0xmvVufByeRtOAOfOjzNBEhjkg 7n9MLx4zUCit8OE2G5c8dvc68kPfOMQDU4cPzVyFKX5sEf+FizO8UrdP7eu1luKK1W6F /mGZUCfGOH8700grN3X0xAna4prLNSLm7Xmy8= 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=AdA74sYhuGp5YjP1VpOY0BWqCYQ5MuSQvaf8CR7hAyA=; b=mttP2mXMq7z90vP4vtYu8Ej1R4PN/eDZ3JJ7aY7pmClAqAWx0ZdPJYpGc9ezp0Mxm1 Ex/7bn91naYYcvGTkY7KsekYFInmWRcaeqL17xfCv4CEdJZKFhJGZdXZJBZkzAHe3PIP Vyu6RKrv1f9DIAw1mhhMnqHscIBgklehI2Qi2gHE+Z1GXM8oD3P0q+Bu4dArVuA5wYZg 4zj3F2WLFuJjw/u1lX6qgdxV6npkjEKuAhS5we90ZonzUsBxRMADveub8dIoWo/Z7Vyr aSllKPS5FBAf6PFJQzFZL9hiqHJDBmSSReCfMmv82wYJjI1ZxF+TWoJx7z+X+h3UdJav X89A== X-Gm-Message-State: AIkVDXL6ZxIJzZ883r0Lw5b7x75Xr0OjzoEu7+MIDYVfTosD6P2ADF9REKbi37ArozqI+433 X-Received: by 10.157.1.112 with SMTP id 103mr4991782otu.115.1484173927675; Wed, 11 Jan 2017 14:32:07 -0800 (PST) Received: from localhost ([2602:306:3406:6500:3c9a:46d:ea1b:62ad]) by smtp.gmail.com with ESMTPSA id c8sm3138160oia.14.2017.01.11.14.32.06 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 11 Jan 2017 14:32:07 -0800 (PST) From: Andy Gross To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, will.deacon@arm.com, lorenzo.pieralisi@arm.com, Kevin Hilman , Srinivas Kandagatla , Bjorn Andersson , linux@armlinux.org.uk, Andy Gross Subject: [Patch v3 2/2] firmware: qcom: scm: Fix interrupted SCM calls Date: Wed, 11 Jan 2017 16:31:58 -0600 Message-Id: <1484173918-25090-3-git-send-email-andy.gross@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484173918-25090-1-git-send-email-andy.gross@linaro.org> References: <1484173918-25090-1-git-send-email-andy.gross@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 1.9.1 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 3e28d08..9ca3a10 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 @@ -119,4 +123,5 @@ asmlinkage void arm_smccc_hvc(unsigned long a0, unsigned long a1, #define arm_smccc_smc_quirk(...) __arm_smccc_smc(__VA_ARGS__) +#endif /*__ASSEMBLY__*/ #endif /*__LINUX_ARM_SMCCC_H*/