From patchwork Tue Apr 3 06:18:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Myl=C3=A8ne_Josserand?= X-Patchwork-Id: 10320611 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 EA93160116 for ; Tue, 3 Apr 2018 06:21:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB1E628920 for ; Tue, 3 Apr 2018 06:21:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8C13289BF; Tue, 3 Apr 2018 06:21:15 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 211C928920 for ; Tue, 3 Apr 2018 06:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4+mafo7CUZr9jfDckEqagYaw0awe0S5pA307FtkRsDw=; b=pAspkF7rhKoXZB ajJYM69wu5UKv2fgBCWMIdOCcawA9UFuNc9vrLehcWz3Y7ZoiQaOuVa4vK3COS4y+LwKzJJZrds9Y RGFnbu4wZU+5w58iI5PARTQUNUEfow4gSRFMYAsaNk+HH9PToeNOhRm9PFMvBGXjA15z4EN8Xhuxe qvcvrAhsiN2YMHZo2kMh2EtzgfEYXPUqMCzr/BWlXgYN/V5IsBkWpG65MUO/IaW9RpjfJ9U8wiOJx cI3Qc/RK+RECvEFI2vJpmqzfxxjUZ1r6cmz4/Co79ZKEwKqellmUDFBdn8egL8f7dBefaXMipXkny fzVnO3J4yR7gw43+asgQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3FJd-0005Tc-M1; Tue, 03 Apr 2018 06:21:09 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3FJY-0005Ji-UT for linux-arm-kernel@lists.infradead.org; Tue, 03 Apr 2018 06:21:07 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 48CAF20787; Tue, 3 Apr 2018 08:20:55 +0200 (CEST) Received: from dell-desktop.home (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.bootlin.com (Postfix) with ESMTPSA id ED18E20384; Tue, 3 Apr 2018 08:20:54 +0200 (CEST) From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= To: linux@armlinux.org.uk, maxime.ripard@bootlin.com, wens@csie.org, marc.zyngier@arm.com, mark.rutland@arm.com, robh+dt@kernel.org Subject: [PATCH v5 03/13] ARM: sunxi: smp: Move cpu_resume assembly entry into file Date: Tue, 3 Apr 2018 08:18:26 +0200 Message-Id: <20180403061836.3926-4-mylene.josserand@bootlin.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180403061836.3926-1-mylene.josserand@bootlin.com> References: <20180403061836.3926-1-mylene.josserand@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180402_232105_146986_1C846227 X-CRM114-Status: GOOD ( 12.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, quentin.schulz@bootlin.com, linux-kernel@vger.kernel.org, clabbe.montjoie@gmail.com, thomas.petazzoni@bootlin.com, mylene.josserand@bootlin.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move the CPU resume assembly function into the assembly file to remove all assembly code from C code. Signed-off-by: Mylène Josserand --- arch/arm/mach-sunxi/headsmp.S | 5 +++++ arch/arm/mach-sunxi/mc_smp.c | 11 +---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-sunxi/headsmp.S b/arch/arm/mach-sunxi/headsmp.S index 119005b5dff9..79890fbe5613 100644 --- a/arch/arm/mach-sunxi/headsmp.S +++ b/arch/arm/mach-sunxi/headsmp.S @@ -73,3 +73,8 @@ ENTRY(sunxi_mc_smp_secondary_startup) bl sunxi_mc_smp_cluster_cache_enable b secondary_startup ENDPROC(sunxi_mc_smp_secondary_startup) + +ENTRY(sunxi_mc_smp_resume) + bl sunxi_mc_smp_cluster_cache_enable + b cpu_resume +ENDPROC(sunxi_mc_smp_resume) diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c index 9cc6c8fc6db7..727968d6a3e5 100644 --- a/arch/arm/mach-sunxi/mc_smp.c +++ b/arch/arm/mach-sunxi/mc_smp.c @@ -73,6 +73,7 @@ static void __iomem *prcm_base; static void __iomem *sram_b_smp_base; extern void sunxi_mc_smp_secondary_startup(void); +extern void sunxi_mc_smp_resume(void); static bool sunxi_core_is_cortex_a15(unsigned int core, unsigned int cluster) { @@ -572,16 +573,6 @@ static bool __init sunxi_mc_smp_cpu_table_init(void) */ typedef typeof(cpu_reset) phys_reset_t; -static void __init __naked sunxi_mc_smp_resume(void) -{ - asm volatile( - "bl sunxi_mc_smp_cluster_cache_enable\n" - "b cpu_resume" - /* Let compiler know about sunxi_mc_smp_cluster_cache_enable */ - :: "i" (sunxi_mc_smp_cluster_cache_enable) - ); -} - static int __init nocache_trampoline(unsigned long __unused) { phys_reset_t phys_reset;