From patchwork Mon Jun 10 09:20:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2696921 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 61045DF264 for ; Mon, 10 Jun 2013 11:00:58 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UlyCa-0002a0-Q3; Mon, 10 Jun 2013 09:15:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UlyAG-0004zC-Tr; Mon, 10 Jun 2013 09:13:24 +0000 Received: from mail-pb0-x234.google.com ([2607:f8b0:400e:c01::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UlyAB-0004x4-BY for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2013 09:13:20 +0000 Received: by mail-pb0-f52.google.com with SMTP id xa12so7001564pbc.25 for ; Mon, 10 Jun 2013 02:12:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=ePiNF5x0WZu2eJZKwOEgl33Nm2zrucnzf2eD6yfqrrM=; b=CO0T1qKCiYVHNad0tA6deT6cDIC1+A7gn+1n1InvUaN9lRfXcnr9+dAyAlNWYRm74l Hqji13LBUCEf2SMD2ve9Wt5hAKGZxZ64jDOhyrlvFmagiYQf1HgFwC3zPzfd1ChqBwSe dG5g5XjfBP17nvxiv23jx7A+7mWSWNG7XWGfdLlFqt9vZ52QJXOqtxfKi4bTM2xqNJK+ NMCl0+0A9Ro4deLL/Usw+p+QVtkvTe3dwwM2vlyWMO3aSHRuAji+L7jcpeV98OSCCNrN zRVzXw33aa4optpyHoWzbORs0q84lI/DLCv40UUJpQ/pb5NVVQ44shztb+3P3hCgbR8q Omcg== X-Received: by 10.68.162.1 with SMTP id xw1mr8874546pbb.199.1370855577724; Mon, 10 Jun 2013 02:12:57 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id p2sm14774579pag.22.2013.06.10.02.12.54 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 02:12:56 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Mon, 10 Jun 2013 18:20:25 +0900 Message-Id: <20130610092025.18944.77279.sendpatchset@w520> In-Reply-To: <20130610091925.18944.68117.sendpatchset@w520> References: <20130610091925.18944.68117.sendpatchset@w520> Subject: [PATCH 06/06] ARM: shmobile: Remove old SCU boot code X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130610_051319_536365_174D1C2A X-CRM114-Status: UNSURE ( 9.36 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (magnus.damm[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, laurent.pinchart@ideasonboard.com, olof@lixom.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Magnus Damm Remove shmobile_secondary_vector_scu now when all SCU enabled SMP platforms instead make use of shmobile_boot_scu. This removes two inline virtual to physical address conversions. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/headsmp-scu.S | 22 +--------------------- arch/arm/mach-shmobile/include/mach/common.h | 1 - 2 files changed, 1 insertion(+), 22 deletions(-) --- 0028/arch/arm/mach-shmobile/headsmp-scu.S +++ work/arch/arm/mach-shmobile/headsmp-scu.S 2013-06-05 14:36:41.000000000 +0900 @@ -25,32 +25,12 @@ __CPUINIT /* - * Reset vector for secondary CPUs. + * Boot code for secondary CPUs. * * First we turn on L1 cache coherency for our CPU. Then we jump to * shmobile_invalidate_start that invalidates the cache and hands over control * to the common ARM startup code. - * This function will be mapped to address 0 by the SBAR register. - * A normal branch is out of range here so we need a long jump. We jump to - * the physical address as the MMU is still turned off. */ - .align 12 -ENTRY(shmobile_secondary_vector_scu) - mrc p15, 0, r0, c0, c0, 5 @ read MIPDR - and r0, r0, #3 @ mask out cpu ID - lsl r0, r0, #3 @ we will shift by cpu_id * 8 bits - ldr r1, 2f - ldr r1, [r1] @ SCU base address - ldr r2, [r1, #8] @ SCU Power Status Register - mov r3, #3 - bic r2, r2, r3, lsl r0 @ Clear bits of our CPU (Run Mode) - str r2, [r1, #8] @ write back - - ldr pc, 1f -1: .long shmobile_invalidate_start - PAGE_OFFSET + PLAT_PHYS_OFFSET -2: .long shmobile_scu_base - PAGE_OFFSET + PLAT_PHYS_OFFSET -ENDPROC(shmobile_secondary_vector_scu) - ENTRY(shmobile_boot_scu) @ r0 = SCU base address mrc p15, 0, r1, c0, c0, 5 @ read MIPDR --- 0028/arch/arm/mach-shmobile/include/mach/common.h +++ work/arch/arm/mach-shmobile/include/mach/common.h 2013-06-05 14:35:54.000000000 +0900 @@ -10,7 +10,6 @@ extern void shmobile_setup_console(void) extern void shmobile_boot_vector(void); extern unsigned long shmobile_boot_fn; extern unsigned long shmobile_boot_arg; -extern void shmobile_secondary_vector_scu(void); extern void shmobile_boot_scu(void); struct clk; extern int shmobile_clk_init(void);