From patchwork Fri Feb 23 13:37:41 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: 10237817 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 89B3B60209 for ; Fri, 23 Feb 2018 13:59:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F75A295F1 for ; Fri, 23 Feb 2018 13:59:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 640CB295F3; Fri, 23 Feb 2018 13:59:35 +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 AA2CF295F1 for ; Fri, 23 Feb 2018 13:59:34 +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=HViTrEeGZV9TTG1c59uvsIShM9kouYi9OVQkcdvtaRI=; b=X49k3eDW2taL4Y WKqRsKLXccSn6HXeJW7xMHaZvcOl/gnpryAC/Fa5sX9MtyI6SiQe8wrOg93BFNFGUddd8vZ53t2nv CGCx9GsnDNREn9ctNvBtuoBboCkJPT+aAdAEAK+bOgeaI2IIitbACRxy4e1jn7jL2beN74D8NdwoW 2rwvWWDZ+FkUqn1ahdNYVwXy3Ho6gXmgYTsoNV8m5ERm7GXtHNPo7OcwECAxAnUbM/l8Jpw7W3Et1 NNvP4FQT7qGGaJZpT7MG6unMtsR8RAaOOxjeCe7nGK08TCC/Ta/qLO9eut+i2RISYTkBplS6VVc/x UielcJ1nWgFyXDheT56Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1epDsi-0007SD-Aq; Fri, 23 Feb 2018 13:59:24 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1epDo0-0003LI-K2 for linux-arm-kernel@bombadil.infradead.org; Fri, 23 Feb 2018 13:54:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=6BrxZiGKoVETxFfhxCCPk6jRCh3WvH6cFM6U30kM+50=; b=KC2aPSH0gQPCIKHXyAVuyeEV/N KCkTdOf/mvRhrrF7TVRWAOAGjEgPBWg3SYHdVsWIBgDZI/wZRhQBFWOHCTWCRSoQkEqbPaoN6tvsC KuKLn4Pz/2UQ+4ZhIQw33G+GgGgO4Twwuxtq95VDS3tc9Dc6+LStwJh6yQWToRxqAffoFWOblz03z XcVDuiXxiXYa3wzTK+0WVLPIP6Tk876R1b2XFHz/nQv4GWOqI44Jml1GmGxMN4H9gmGDnk6SIoeBl Wuf/EQz8VhWQHV6GZnMOyo/2sS3X2sUSr8BRCO10uV+KU1dqZmA8qqpRelZY17ZHABtuTYTBA/09S 7APHmEmA==; Received: from mail.free-electrons.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1epDYv-0003Xz-0S for linux-arm-kernel@lists.infradead.org; Fri, 23 Feb 2018 13:39:00 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id CC1B920379; Fri, 23 Feb 2018 14:38:37 +0100 (CET) Received: from dell-desktop.lan (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 5FCF320379; Fri, 23 Feb 2018 14:38:37 +0100 (CET) From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= To: maxime.ripard@bootlin.com, linux@armlinux.org.uk, wens@csie.org, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH v4 09/10] ARM: sunxi: smp: Move cpu_resume assembly entry into file Date: Fri, 23 Feb 2018 14:37:41 +0100 Message-Id: <20180223133742.26044-10-mylene.josserand@bootlin.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180223133742.26044-1-mylene.josserand@bootlin.com> References: <20180223133742.26044-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-20180223_133857_087726_D82AB82D X-CRM114-Status: GOOD ( 12.24 ) 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 4f5957a6e188..d5c97e945e69 100644 --- a/arch/arm/mach-sunxi/headsmp.S +++ b/arch/arm/mach-sunxi/headsmp.S @@ -70,4 +70,9 @@ ENTRY(sunxi_boot) bl sunxi_mc_smp_cluster_cache_enable b secondary_startup ENDPROC(sunxi_boot) + +ENTRY(sunxi_mc_smp_resume) + bl sunxi_mc_smp_cluster_cache_enable + b cpu_resume +ENDPROC(sunxi_mc_smp_resume) #endif diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c index 4e807cc11a0f..f1ad425a469c 100644 --- a/arch/arm/mach-sunxi/mc_smp.c +++ b/arch/arm/mach-sunxi/mc_smp.c @@ -84,6 +84,7 @@ static bool is_sun9i; extern void sunxi_boot(void); extern void sunxi_cluster_cache_enable(void); +extern void sunxi_mc_smp_resume(void); static bool sunxi_core_is_cortex_a15(unsigned int core, unsigned int cluster) { @@ -641,16 +642,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;