From patchwork Wed Jun 19 13:16:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2749141 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B55469F3A0 for ; Wed, 19 Jun 2013 13:16:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F31B620116 for ; Wed, 19 Jun 2013 13:16:16 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A986520113 for ; Wed, 19 Jun 2013 13:16:15 +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 1UpIFA-0005md-OQ; Wed, 19 Jun 2013 13:16:13 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpIF7-0002eO-QQ; Wed, 19 Jun 2013 13:16:09 +0000 Received: from perceval.ideasonboard.com ([95.142.166.194]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpIF4-0002e5-My for linux-arm-kernel@lists.infradead.org; Wed, 19 Jun 2013 13:16:07 +0000 Received: from avalon.localnet (unknown [91.178.248.38]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B54EA35A4D; Wed, 19 Jun 2013 15:15:37 +0200 (CEST) From: Laurent Pinchart To: Magnus Damm Subject: Re: [PATCH v2] ARM: shmobile: uImage load address rework Date: Wed, 19 Jun 2013 15:16:01 +0200 Message-ID: <76205076.EsFJngGrIh@avalon> User-Agent: KMail/4.10.2 (Linux/3.8.13-gentoo; KDE/4.10.2; x86_64; ; ) In-Reply-To: <3243557.sP7VV5jPVm@avalon> References: <20130610092857.19175.25629.sendpatchset@w520> <3243557.sP7VV5jPVm@avalon> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130619_091606_868310_F8C63310 X-CRM114-Status: GOOD ( 24.21 ) X-Spam-Score: -3.2 (---) Cc: Olof Johansson , "Simon Horman \[Horms\]" , "linux-arm-kernel@lists.infradead.org" , Arnd Bergmann , SH-Linux 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: , 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 Hi Magnus, On Wednesday 12 June 2013 04:31:26 Laurent Pinchart wrote: > On Wednesday 12 June 2013 11:21:34 Magnus Damm wrote: > > On Wed, Jun 12, 2013 at 6:50 AM, Laurent Pinchart wrote: > > > On Monday 10 June 2013 18:28:57 Magnus Damm wrote: > > >> From: Magnus Damm > > >> > > >> This is V2 of the mach-shmobile uImage load address rework patch. > > >> > > >> Rework the mach-shmobile uImage load address calculation by storing > > >> the per-board load addresses in Makefile.boot. This removes the > > >> CONFIG_MEMORY_START dependency from Makefile.boot, and it also makes > > >> it possible to create safe kernel images that boot on multiple boards. > > >> > > >> This is one of several series of code that reworks code not to rely on > > >> CONFIG_MEMORY_START/SIZE which in turn is needed for > > >> ARCH_MULTIPLATFORM. > > >> > > >> Signed-off-by: Magnus Damm > > >> Reviewed-by: Laurent Pinchart > > >> Reviewed-by: Kuninori Morimoto > > > > > > I've noticed today that KZM9G doesn't boot v3.10-rc2 with > > > CONFIG_AUTO_ZRELADDR=y. While not caused by this patch, that's something > > > that will need to be fixed to support multi-arch kernels. I'm not too > > > familiar with early boot code, would you be able to have a look at this > > > ? > > > > I will have a look. I suspect that issue is not related to this patch, is > > it? > > No, it isn't, the issue is present in v3.10-rc2. I don't know if it has ever > worked. The following patch fixes the issue, caused by physical RAM being present at 0x41000000 on KZM9G. I'm not sure if it would be acceptable as a generic solution though. diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index fe4d9c3..ea2f112 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -176,7 +176,7 @@ not_angel: #ifdef CONFIG_AUTO_ZRELADDR @ determine final kernel image address mov r4, pc - and r4, r4, #0xf8000000 + and r4, r4, #0xff000000 add r4, r4, #TEXT_OFFSET #else ldr r4, =zreladdr