From patchwork Tue Apr 4 19:32:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 96763 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp345823qgd; Tue, 4 Apr 2017 12:35:02 -0700 (PDT) X-Received: by 10.99.97.6 with SMTP id v6mr25824966pgb.186.1491334502068; Tue, 04 Apr 2017 12:35:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p89si18339852pfa.239.2017.04.04.12.35.01; Tue, 04 Apr 2017 12:35:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@verizon.com; dkim=pass header.i=@verizon.com; dkim=pass header.i=@verizon.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932310AbdDDTfA (ORCPT + 6 others); Tue, 4 Apr 2017 15:35:00 -0400 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:48124 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932288AbdDDTe7 (ORCPT ); Tue, 4 Apr 2017 15:34:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334498; x=1522870498; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=v1iBp7cw0AtASTz8ENLh8ULmaThmxCZOzsozeWwHve8=; b=LTXZwl3GaZl5WFwPeXU5r4M+ibFnFSlc4dfxQpdzSJ0XdUZwNN4Wc/P5 pyWpnPEsNqriXQhyigB+Qes8MCvaAOf9Z35QfJlwe/ut2eSHdv6T7378n 1d2e3zJmoyD/AshFPxy8jyBttb6sXccSiOO7UiCe3kz6FlAZNCfF4vP/q U=; X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi01.verizon.com) ([166.68.71.143]) by fldsmtpe03.verizon.com with ESMTP; 04 Apr 2017 19:34:11 +0000 X-IronPort-AV: E=Sophos;i="5.36,275,1486425600"; d="scan'208";a="182588083" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi01.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 19:33:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334437; x=1522870437; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=v1iBp7cw0AtASTz8ENLh8ULmaThmxCZOzsozeWwHve8=; b=BlP8iFglT8Y+VoFh5S40gXmyYKPtQOZcj2fqpzgTfIsZ6+ZA41Vzb/bX lUD4OWVij+YYSgA4HZFzko3ULA6cwuKm6QBImZhfQzAC3NGMb7zB1pW0M I6EigsILFrUtU8z93wkLIdv3/QzSEJduxKci3sIMGHMGqZ3MUGfzgMrhq c=; Received: from ranger.odc.vzwcorp.com (HELO mercury.verizonwireless.com) ([10.255.240.27]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 04 Apr 2017 15:33:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1491334436; x=1522870436; h=to:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from; bh=v1iBp7cw0AtASTz8ENLh8ULmaThmxCZOzsozeWwHve8=; b=s9xZZxIqO5uBr7fJQmiV+qaibVcTK0ML+qKjf3+8yPa2VU7e/F7KbsnM xba3zGgZbGBu5XnJYh/9BYr+eC18Wq/gjY8cyEV877VaTq8ySEbiMP2UC qE0BEiFQps3ttLkJCAJfYcFPlOI4+wAWzpqhJmS+P2h0eIfLSKt38od7G Q=; From: alexander.levin@verizon.com X-Host: ranger.odc.vzwcorp.com Received: from nyora1hub003.uswin.ad.vzwcorp.com ([10.170.34.218]) by mercury.verizonwireless.com with ESMTP/TLS/AES256-SHA; 04 Apr 2017 19:33:54 +0000 Received: from OMZP1LUMXCA11.uswin.ad.vzwcorp.com (144.8.22.186) by NYORA1HUB003.uswin.ad.vzwcorp.com (10.170.34.218) with Microsoft SMTP Server (TLS) id 8.3.406.0; Tue, 4 Apr 2017 15:33:54 -0400 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA11.uswin.ad.vzwcorp.com (144.8.22.186) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 4 Apr 2017 14:33:53 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1210.000; Tue, 4 Apr 2017 14:33:53 -0500 To: "gregkh@linuxfoundation.org" CC: "stable@vger.kernel.org" Subject: [PATCH for 4.9 79/98] firmware: qcom: scm: Fix interrupted SCM calls Thread-Topic: [PATCH for 4.9 79/98] firmware: qcom: scm: Fix interrupted SCM calls Thread-Index: AQHSrXo0642R6RYilE+/ZPB6/IWduw== Date: Tue, 4 Apr 2017 19:32:32 +0000 Message-ID: <20170404193158.19041-80-alexander.levin@verizon.com> References: <20170404193158.19041-1-alexander.levin@verizon.com> In-Reply-To: <20170404193158.19041-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andy Gross [ Upstream commit 82bcd087029f6056506ea929f11af02622230901 ] 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 Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- 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(-) -- 2.9.3 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*/