From patchwork Mon Apr 25 23:08:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 8933441 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 7F0AE9F441 for ; Mon, 25 Apr 2016 23:11:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9807E2013D for ; Mon, 25 Apr 2016 23:11:53 +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 B23DD2013A for ; Mon, 25 Apr 2016 23:11:52 +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 1aupe9-0005AA-Jj; Mon, 25 Apr 2016 23:10:29 +0000 Received: from mail-oi0-x22f.google.com ([2607:f8b0:4003:c06::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aupd4-0002r8-Fg for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2016 23:09:24 +0000 Received: by mail-oi0-x22f.google.com with SMTP id k142so193291872oib.1 for ; Mon, 25 Apr 2016 16:09:02 -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=ZSZAHFtIbvhq3wKatbuJPaUnHDOhhWZY+MPojE6z+Ew=; b=fl4/s+yacONaPp9T2Z7pHqMQ/gbj3d8/ubdAEAlMcySy/QoZRpOLiCbTAn8zSzzXH1 Fc9scidM87uIgHm4g1aHMTp7fsmwObG6Bfy8jYhtKRtvicgMzaacPKZtI5baDDkJ+gMD JSFRKe4TgSVZoiBxrKeu6FjTr/d/tEsViZdAc= 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=ZSZAHFtIbvhq3wKatbuJPaUnHDOhhWZY+MPojE6z+Ew=; b=LM3nEdFXzjkQ2SwFzOJYYmSKw2rL36v1K3jUIBmrHCR0pGz1VdyFNA5A6/Caz8JAuC GDrv6uElc1cguS7CU0zSuVabkr1kU7gy+Zm6w7Ul3a/HU++P5bEZAmbADOL4OOHoJJ6k htmWZuiLewMp1EgNNYnMJHn9/kazsBiSlz3lydFtGJcrCqA7lUo1KwTzFN0X+XZnMpmx EahsGmiEmfdZUeOsInTXj8vB6NB5uQiTKGGNnCVCDckqb0coGm1fdaFjZmZ2RfhR5yFa qpgsJN5X3ZwqIsREtlbq01bDzIXOth0isrpBd9MKDpFS1H81NDIbDyfuumbQBRR2Q5S5 XeUA== X-Gm-Message-State: AOPr4FVeST/XekqSeQWCfYHXvV52U6uxWGR9+CCn0DIBO5ecsTD4BeCZW/cjet1fpn6Lfdg/ X-Received: by 10.202.203.14 with SMTP id b14mr15577459oig.56.1461625741538; Mon, 25 Apr 2016 16:09:01 -0700 (PDT) Received: from localhost ([2602:306:c558:19b0:396f:541d:66bc:56f0]) by smtp.gmail.com with ESMTPSA id xm14sm7203394oeb.17.2016.04.25.16.09.00 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 25 Apr 2016 16:09:01 -0700 (PDT) From: Andy Gross To: linux-arm-msm@vger.kernel.org Subject: [Patch v2 6/8] firmware: qcom: scm: Use atomic SCM for cold boot Date: Mon, 25 Apr 2016 18:08:43 -0500 Message-Id: <1461625725-32425-7-git-send-email-andy.gross@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461625725-32425-1-git-send-email-andy.gross@linaro.org> References: <1461625725-32425-1-git-send-email-andy.gross@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160425_160922_729527_4A3DF915 X-CRM114-Status: GOOD ( 13.38 ) 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 , 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 | 47 ++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/drivers/firmware/qcom_scm-32.c b/drivers/firmware/qcom_scm-32.c index 0d2a3f8..419df4d 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; } @@ -361,22 +366,6 @@ u32 qcom_scm_get_version(void) } 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) -{ - 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); -} - /** * qcom_scm_set_cold_boot_addr() - Set the cold boot address for cpus * @entry: Entry point function for the cpus @@ -406,7 +395,8 @@ 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_call_atomic(QCOM_SCM_SVC_BOOT, QCOM_SCM_BOOT_ADDR, 2, + flags, virt_to_phys(entry)); } /** @@ -422,6 +412,10 @@ int __qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus) int ret; int flags = 0; int cpu; + struct { + __le32 flags; + __le32 addr; + } cmd; /* * Reassign only if we are switching from hotplug entry point @@ -437,7 +431,10 @@ 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); + cmd.addr = cpu_to_le32(virt_to_phys(entry)); + cmd.flags = cpu_to_le32(flags); + ret = qcom_scm_call(QCOM_SCM_SVC_BOOT, QCOM_SCM_BOOT_ADDR, + &cmd, sizeof(cmd), NULL, 0); if (!ret) { for_each_cpu(cpu, cpus) qcom_scm_wb[cpu].entry = entry; @@ -456,8 +453,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)