From patchwork Mon Jun 10 09:19:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2697171 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 259BEDF264 for ; Mon, 10 Jun 2013 11:52:23 +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 1UlyAs-00024g-9G; Mon, 10 Jun 2013 09:14:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uly9Q-0004tV-RO; Mon, 10 Jun 2013 09:12:32 +0000 Received: from mail-pd0-f174.google.com ([209.85.192.174]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uly9M-0004sM-Mg for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2013 09:12:29 +0000 Received: by mail-pd0-f174.google.com with SMTP id 10so6204019pdc.19 for ; Mon, 10 Jun 2013 02:12:07 -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=Ct4sEFnDTr16UD7/uWGGPj2BntCHKcGN15GkWYYXIVo=; b=BOfH1u/o4lyeU5GIUX0CqrKXOBOrPQcDksABazJSK295oxia2d1hxAR56nqu9on9b3 Cl5WwRiA4Frk71BP5svvGjS6pEW5ayKNCG5C/b7l5FWPTSQZlqPY1NU/A84rAvBWj4hW CQmovIbY63B6wgwS5HVQyBPWpxmU8IMfSGP+11ehdrfC5sf4tj0fuaY6bK3XEHY0jtAb cDIEohxlU0sUckpO8wJxqz5dGdSizzbDVD1Jfdy5iTU2KXQSYbVgG5Y8RS93hVZvXLm5 9DcxMwmoOpp1cQpz9fBzy79IAzw8i6ztKw9HNHYBa7zF9kpnR3jNfSLwUgfo5F1fwpk/ bIAg== X-Received: by 10.66.144.170 with SMTP id sn10mr13128700pab.42.1370855527264; Mon, 10 Jun 2013 02:12:07 -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 rn7sm9779989pbc.12.2013.06.10.02.12.04 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 02:12:06 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Mon, 10 Jun 2013 18:19:36 +0900 Message-Id: <20130610091936.18944.66463.sendpatchset@w520> In-Reply-To: <20130610091925.18944.68117.sendpatchset@w520> References: <20130610091925.18944.68117.sendpatchset@w520> Subject: [PATCH 01/06] ARM: shmobile: Add SMP boot function and argument X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130610_051228_866883_89C66E84 X-CRM114-Status: UNSURE ( 9.14 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.174 listed in list.dnswl.org] 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 Add code for mach-shmobile to allow specifying boot function and argument. Will initially be used for SMP together with SCU but may in the future also be used for deep sleep resume. This patch removes one inline virtual to physical address conversion. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/headsmp.S | 13 ++++++++++--- arch/arm/mach-shmobile/include/mach/common.h | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-) --- 0001/arch/arm/mach-shmobile/headsmp.S +++ work/arch/arm/mach-shmobile/headsmp.S 2013-06-05 13:21:14.000000000 +0900 @@ -27,7 +27,14 @@ ENDPROC(shmobile_invalidate_start) * We need _long_ jump to the physical address. */ .align 12 -ENTRY(shmobile_secondary_vector) +ENTRY(shmobile_boot_vector) + ldr r0, 2f ldr pc, 1f -1: .long shmobile_invalidate_start - PAGE_OFFSET + PLAT_PHYS_OFFSET -ENDPROC(shmobile_secondary_vector) +ENDPROC(shmobile_boot_vector) + + .globl shmobile_boot_fn +shmobile_boot_fn: +1: .space 4 + .globl shmobile_boot_arg +shmobile_boot_arg: +2: .space 4 --- 0016/arch/arm/mach-shmobile/include/mach/common.h +++ work/arch/arm/mach-shmobile/include/mach/common.h 2013-06-05 13:19:52.000000000 +0900 @@ -7,7 +7,9 @@ extern void shmobile_setup_delay(unsigne unsigned int mult, unsigned int div); struct twd_local_timer; extern void shmobile_setup_console(void); -extern void shmobile_secondary_vector(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); struct clk; extern int shmobile_clk_init(void);