From patchwork Fri Apr 22 22:17:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 8916081 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 91BC39F1D3 for ; Fri, 22 Apr 2016 22:20:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FF1B2026F for ; Fri, 22 Apr 2016 22:20:14 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 88DC32020F for ; Fri, 22 Apr 2016 22:20:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1atjPA-000092-Dd; Fri, 22 Apr 2016 22:18:28 +0000 Received: from mail-ob0-x22d.google.com ([2607:f8b0:4003:c01::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1atjOY-00086A-PJ for linux-arm-kernel@lists.infradead.org; Fri, 22 Apr 2016 22:17:52 +0000 Received: by mail-ob0-x22d.google.com with SMTP id j9so55777977obd.3 for ; Fri, 22 Apr 2016 15:17:30 -0700 (PDT) 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=gDnAxCIltAbpGk2zSMDZ9F4bqB7W8EBAup6JsVNSy+g=; b=WTBNfWppjyRza1erKtBfHvjFzZy1zy3c2F7cWZLBMqjw4nqs58rSolpgPCpvHkh+B1 KDYIaxmM7LS5B7aDYGqk6jHeHiHnKNIJHsQIMRbx41Bd48ms/qW7TMpiAjQwzBCxYx0T sJtj6Fmv+jZAkoMLFDiLUklvNk3EfYHDjpWNc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gDnAxCIltAbpGk2zSMDZ9F4bqB7W8EBAup6JsVNSy+g=; b=PdW1NfOVnzkZfCFwO0arluJ8+Loo5bnTC4sMyFNFhC3h+jJxmknWh17U9iXTaw5fn/ Ge3Zb4+NYYY5SR6NxxZLHb3yXbQjJjq/c91yRWqDhygA1bo6zUIwp0Fev6MLcO/TImJb +NckhrYaSMCqF03V9mflg2z6DHZcJMbhgXYdAaDTmOj0aao9TUbX/JMSE8in6wCk0AWn Ee+/tjEQt8EBbwOSqAeCAQfTE1gY04oGcxB/XzHYlVnOVpC1MhUU9KMeEyszCyMQMYNe BtfzwEKPRDToWTweYN56VhmO7GDVjI0NgYVUngNRLju2XRrl9L3SRQ2Mv6eaF1Ala4Fx rN9w== X-Gm-Message-State: AOPr4FXOBCHIjp7fpJwXqGXt+ehyFst0F4KXRsfg+pQY+cJ++/gIllfyvRhvHtrSD+oxocEz X-Received: by 10.60.67.101 with SMTP id m5mr10290251oet.19.1461363449910; Fri, 22 Apr 2016 15:17:29 -0700 (PDT) Received: from localhost ([2602:306:c558:19b0:a419:15a3:ad7f:f979]) by smtp.gmail.com with ESMTPSA id t3sm2648966oem.3.2016.04.22.15.17.29 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 22 Apr 2016 15:17:29 -0700 (PDT) From: Andy Gross To: linux-arm-msm@vger.kernel.org Subject: [PATCH 5/8] firmware: qcom: scm: Use atomic SCM for cold boot Date: Fri, 22 Apr 2016 17:17:09 -0500 Message-Id: <1461363432-5730-6-git-send-email-andy.gross@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461363432-5730-1-git-send-email-andy.gross@linaro.org> References: <1461363432-5730-1-git-send-email-andy.gross@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160422_151750_960890_B5211CC5 X-CRM114-Status: GOOD ( 12.15 ) X-Spam-Score: -2.7 (--) 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: devicetree@vger.kernel.org, Stephen Boyd , linux-kernel@vger.kernel.org, Andy Gross , Bjorn Andersson , jilai wang , 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-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch changes the cold_set_boot_addr function to use atomic SCM calls. This removes the need for memory allocation and instead places all arguments in registers. Signed-off-by: Andy Gross --- drivers/firmware/qcom_scm-32.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/drivers/firmware/qcom_scm-32.c b/drivers/firmware/qcom_scm-32.c index 0d2a3f8..f596091 100644 --- a/drivers/firmware/qcom_scm-32.c +++ b/drivers/firmware/qcom_scm-32.c @@ -294,34 +294,39 @@ out: (n & 0xf)) /** - * qcom_scm_call_atomic1() - Send an atomic SCM command with one argument + * qcom_scm_call_atomic() - Send an atomic SCM command with one argument * @svc_id: service identifier * @cmd_id: command identifier + * @arglen: number of arguments * @arg1: first argument + * @arg2: second argument (optional - fill with 0 if unused) * * This shall only be used with commands that are guaranteed to be * uninterruptable, atomic and SMP safe. */ -static s32 qcom_scm_call_atomic1(u32 svc, u32 cmd, u32 arg1) +static s32 qcom_scm_call_atomic(u32 svc, u32 cmd, u32 arglen, u32 arg1, + u32 arg2) { int context_id; - register u32 r0 asm("r0") = SCM_ATOMIC(svc, cmd, 1); + register u32 r0 asm("r0") = SCM_ATOMIC(svc, cmd, arglen); register u32 r1 asm("r1") = (u32)&context_id; register u32 r2 asm("r2") = arg1; + register u32 r3 asm("r3") = arg2; asm volatile( __asmeq("%0", "r0") __asmeq("%1", "r0") __asmeq("%2", "r1") __asmeq("%3", "r2") + __asmeq("%4", "r3") #ifdef REQUIRES_SEC ".arch_extension sec\n" #endif "smc #0 @ switch to secure world\n" : "=r" (r0) - : "r" (r0), "r" (r1), "r" (r2) - : "r3"); + : "r" (r0), "r" (r1), "r" (r2), "r" (r3) + ); return r0; } @@ -364,17 +369,24 @@ EXPORT_SYMBOL(qcom_scm_get_version); /* * Set the cold/warm boot address for one of the CPU cores. */ -static int qcom_scm_set_boot_addr(u32 addr, int flags) +static int qcom_scm_set_boot_addr(u32 addr, int flags, bool do_atomic) { struct { __le32 flags; __le32 addr; } cmd; - cmd.addr = cpu_to_le32(addr); - cmd.flags = cpu_to_le32(flags); - return qcom_scm_call(QCOM_SCM_SVC_BOOT, QCOM_SCM_BOOT_ADDR, - &cmd, sizeof(cmd), NULL, 0); + if (do_atomic) { + return qcom_scm_call_atomic(QCOM_SCM_SVC_BOOT, + QCOM_SCM_BOOT_ADDR, 2, flags, addr); + } else { + + cmd.addr = cpu_to_le32(addr); + cmd.flags = cpu_to_le32(flags); + + return qcom_scm_call(QCOM_SCM_SVC_BOOT, QCOM_SCM_BOOT_ADDR, + &cmd, sizeof(cmd), NULL, 0); + } } /** @@ -406,7 +418,7 @@ int __qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) set_cpu_present(cpu, false); } - return qcom_scm_set_boot_addr(virt_to_phys(entry), flags); + return qcom_scm_set_boot_addr(virt_to_phys(entry), flags, true); } /** @@ -437,7 +449,7 @@ int __qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus) if (!flags) return 0; - ret = qcom_scm_set_boot_addr(virt_to_phys(entry), flags); + ret = qcom_scm_set_boot_addr(virt_to_phys(entry), flags, false); if (!ret) { for_each_cpu(cpu, cpus) qcom_scm_wb[cpu].entry = entry; @@ -456,8 +468,8 @@ int __qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus) */ void __qcom_scm_cpu_power_down(u32 flags) { - qcom_scm_call_atomic1(QCOM_SCM_SVC_BOOT, QCOM_SCM_CMD_TERMINATE_PC, - flags & QCOM_SCM_FLUSH_FLAG_MASK); + qcom_scm_call_atomic(QCOM_SCM_SVC_BOOT, QCOM_SCM_CMD_TERMINATE_PC, 1, + flags & QCOM_SCM_FLUSH_FLAG_MASK, 0); } int __qcom_scm_is_call_available(u32 svc_id, u32 cmd_id)