From patchwork Wed Feb 1 17:28:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 9550331 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 4A36A60425 for ; Wed, 1 Feb 2017 17:32:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39FB72040D for ; Wed, 1 Feb 2017 17:32:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2ED8628435; Wed, 1 Feb 2017 17:32:56 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9315F2040D for ; Wed, 1 Feb 2017 17:32:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753833AbdBARco (ORCPT ); Wed, 1 Feb 2017 12:32:44 -0500 Received: from mail-oi0-f53.google.com ([209.85.218.53]:35452 "EHLO mail-oi0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753751AbdBARb6 (ORCPT ); Wed, 1 Feb 2017 12:31:58 -0500 Received: by mail-oi0-f53.google.com with SMTP id j15so238036550oih.2 for ; Wed, 01 Feb 2017 09:31:57 -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=/pi5a+9zdTj10LhR1CM7GGBKYrcH6wFDMxH361DnodA=; b=F8pj/eLrjkjJ7w5rxT4dDtNaQebvwuchlBEX4S2QFr0Y08RGCkgwAlr+jz3JlL8aFQ i7JN6Vb5IW+BlWQWWDteVay78q8+wb8sSuFcJYwXzVWabnCSc93aGzUyAQRRFNRibILX 7VBDZdL9yReF4OAyN2m1KzkbT6TiaABYYbj+E= 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=/pi5a+9zdTj10LhR1CM7GGBKYrcH6wFDMxH361DnodA=; b=g2U1v7QIRePTQ9hDBQD1F50T7oRZxsUbEgnJMBh02+E4yptLtFRpI6rlZymXCL810r z6WUj1X+m+ofrsH1c2y0vv4Phr6Yc6PSR8sPMg4JSDaC4QaaulpV+sDFxx0L/ksPgTS0 z9X+RrRWUN45oNI18+7q50HsJ9Lzvw/w3+Z3/8KspdHQQXQOoheYrzFKCL+V4t4/SUdD VW7ZJYqF6OR3XHYahP8w+TVf9qaBmfS0GCZK829IF5MMszRvCRORTtFd6oQW1gpgXasJ RJqPYhvDoRc/ZVj5DWfzOmDCaSv80L1zn8qBIxRj/J3UOamQVYuA/ZF1iRqdl+wBcenP UODg== X-Gm-Message-State: AIkVDXK8kPax6rjl/n4m1o9lTQSqItQZefgaXq41ogsCyG9eoqefzjh3EqljMNUGfg9haoCh X-Received: by 10.202.87.211 with SMTP id l202mr1751631oib.112.1485970317377; Wed, 01 Feb 2017 09:31:57 -0800 (PST) Received: from localhost ([2602:306:3406:6500:9818:4608:a55b:37e]) by smtp.gmail.com with ESMTPSA id r131sm10924000oib.25.2017.02.01.09.31.56 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 01 Feb 2017 09:31:56 -0800 (PST) From: Andy Gross To: linux-arm-kernel@lists.infradead.org Cc: lorenzo.pieralisi@arm.com, linux-arm-msm@vger.kernel.org, will.deacon@arm.com, linux-kernel@vger.kernel.org, Bjorn Andersson , Kevin Hilman , Olof Johansson , linux@armlinux.org.uk, Andy Gross Subject: [Patch v6 2/2] firmware: qcom: scm: Fix interrupted SCM calls Date: Wed, 1 Feb 2017 11:28:28 -0600 Message-Id: <1485970108-14177-3-git-send-email-andy.gross@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1485970108-14177-1-git-send-email-andy.gross@linaro.org> References: <1485970108-14177-1-git-send-email-andy.gross@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.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 ba60a8c..6252234 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 c66f8ae..b679341 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 @@ -125,4 +129,5 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, #define arm_smccc_hvc_quirk(...) __arm_smccc_hvc(__VA_ARGS__) +#endif /*__ASSEMBLY__*/ #endif /*__LINUX_ARM_SMCCC_H*/