From patchwork Wed Nov 28 06:05:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 1814121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 00BCD3FC54 for ; Wed, 28 Nov 2012 06:08:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TdamW-0001Vq-N9; Wed, 28 Nov 2012 06:06:00 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TdamT-0001VY-0y for linux-arm-kernel@lists.infradead.org; Wed, 28 Nov 2012 06:05:58 +0000 Received: by mail-pb0-f49.google.com with SMTP id un15so8527258pbc.36 for ; Tue, 27 Nov 2012 22:05:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=bgMogxyZK9/+kPUjo+qM1pEn0f3mtxkuaCc+Wkibnk8=; b=FERbly1hWpnBPEeKooxFHdbDY1b/YvLsi4xKXEi9FAiAZzLNtHWAMrMq+862zfUz6K /K1TIJngSkmlBYHyh+YwFpex/VHCZeIsXcPPe4dBHgdzTEbJoIh2vIu3/QDw15Vu5VoF 8ECRFLAqy2zvZWyExOcdpwtEP+bQ1wHSNRR726sW4e0/UIviF72Vv2PjMJKbRIfaaCor xvST+HIGyDeOzcRHcwmsreVxWRdu0jHply+oE4/XfXwVYkeNQxikzNNKwkf/CwHgQWp6 eL+onwGBBt0oZcQA0smNXLgc+8eOUpSKHft03urItwA7SAeblctetVvH9uft0D8As55Q aR/g== Received: by 10.66.77.74 with SMTP id q10mr49261588paw.81.1354082754708; Tue, 27 Nov 2012 22:05:54 -0800 (PST) Received: from localhost (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id ms11sm11886639pbc.74.2012.11.27.22.05.52 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Nov 2012 22:05:53 -0800 (PST) Date: Tue, 27 Nov 2012 22:05:53 -0800 From: Olof Johansson To: Kukjin Kim Subject: Re: [PATCH] ARM: EXYNOS: Avoid early use of of_machine_is_compatible() Message-ID: <20121128060553.GA18166@quad.lixom.net> References: <1354045994-8977-1-git-send-email-dianders@chromium.org> <50B53E37.40303@samsung.com> <18d701cdcd28$74198d70$5c4ca850$%kim@samsung.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <18d701cdcd28$74198d70$5c4ca850$%kim@samsung.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQl5F3+odvf1YAvGMb7OMv1aa9HoUmM75kaetcKB36u2W5DvRWVdwAHsSaGlsAGg0LMgzwrj X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121128_010557_278261_D3E6EDE3 X-CRM114-Status: GOOD ( 35.62 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-samsung-soc@vger.kernel.org, 'Russell King' , 'Arnd Bergmann' , 'Doug Anderson' , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Wed, Nov 28, 2012 at 02:23:09PM +0900, Kukjin Kim wrote: > Olof Johansson wrote: > > > > On Tue, Nov 27, 2012 at 2:27 PM, Kukjin Kim wrote: > > > On 11/28/12 07:11, Olof Johansson wrote: > > >> > > >> On Tue, Nov 27, 2012 at 11:53 AM, Doug Anderson > > >> wrote: > > >>> > > >>> The recent commit "ARM: EXYNOS: add support for EXYNOS5440 SoC" broke > > >>> support for exynos5250 because of_machine_is_compatible() was used too > > >>> early in the boot process. It also probably meant that the exynos5440 > > >>> failed to use the proper iotable. Switch to use > > >>> of_flat_dt_is_compatible() in both of these cases. > > >>> > > >>> The failure I was seeing in exynos5250 because of this was: > > >>> Division by zero in kernel. > > >>> [<80015ed4>] (unwind_backtrace+0x0/0xec) from [<8045c7a4>] > > >>> (dump_stack+0x20/0x24) > > >>> [<8045c7a4>] (dump_stack+0x20/0x24) from [<80012990>] > > >>> (__div0+0x20/0x28) > > >>> [<80012990>] (__div0+0x20/0x28) from [<8021ab04>] > (Ldiv0_64+0x8/0x18) > > >>> [<8021ab04>] (Ldiv0_64+0x8/0x18) from [<80068560>] > > >>> (__clocksource_updatefreq_scale+0x54/0x134) > > >>> [<80068560>] (__clocksource_updatefreq_scale+0x54/0x134) from > > >>> [<8006865c>] (__clocksource_register_scale+0x1c/0x54) > > >>> [<8006865c>] (__clocksource_register_scale+0x1c/0x54) from > > >>> [<80612a18>] (exynos_timer_init+0x100/0x1e8) > > >>> [<80612a18>] (exynos_timer_init+0x100/0x1e8) from [<8060d184>] > > >>> (time_init+0x28/0x38) > > >>> [<8060d184>] (time_init+0x28/0x38) from [<8060a754>] > > >>> (start_kernel+0x1e0/0x3c8) > > >>> [<8060a754>] (start_kernel+0x1e0/0x3c8) from [<40008078>] > > (0x40008078) > > >>> > > >>> Signed-off-by: Doug Anderson > > >> > > >> > > >> Thanks Doug. > > >> > > >> Kukjin, I'll apply this directly on top of the previous branch in > > >> arm-soc, if that's OK with you. > > >> > > > Sure, go ahead with my ack if you want, > > > > > > Acked-by: Kukjin Kim > > > > > > Note, actually there was a fix which uses soc_is_exynos5440() in my > > local > > > :-) I'm not sure which one is better at this moment, but I'm OK on this. > > > > Ok, applied. Thanks all. > > > Olof, just note, happens build error with exynos4_defconfig because of > non-DT. Ick, thanks for catching that. > > Following can resolve it or we should create null function for > of_get_flat_dt_root() and of_flat_dt_is_compatible()... > > 8<--------------------------------------- > From: Kukjin Kim > Subject: ARM: EXYNOS: fix a build error with non-DT for exynos4 > > This fixes following in case of non-DT: > arch/arm/mach-exynos/common.c: In function 'exynos_init_io': > arch/arm/mach-exynos/common.c:339: error: implicit declaration of function > 'of_get_flat_dt_root' > arch/arm/mach-exynos/common.c:342: error: implicit declaration of function > 'of_flat_dt_is_compatible' > make[1]: *** [arch/arm/mach-exynos/common.o] Error 1 > > Signed-off-by: Kukjin Kim > --- > diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c > index b919f5f..2110091 100644 > --- a/arch/arm/mach-exynos/common.c > +++ b/arch/arm/mach-exynos/common.c > @@ -336,12 +336,14 @@ void __init exynos_init_late(void) > > void __init exynos_init_io(struct map_desc *mach_desc, int size) > { > +#ifdef CONFIG_OF > unsigned long root = of_get_flat_dt_root(); > > /* initialize the io descriptors we need for initialization */ > if (of_flat_dt_is_compatible(root, "samsung,exynos5440")) > iotable_init(exynos5440_iodesc, > ARRAY_SIZE(exynos5440_iodesc)); > else > +#endif > iotable_init(exynos_iodesc, ARRAY_SIZE(exynos_iodesc)); I really don't like splitting an if/else with an ifdef like this, it's fragile code and can be hard to follow. There's also a second build error with exynos_defconfig in the exynos5-dt.c board file due to a missing include. Teaches me to just apply patches without trying to build. :( I'll squash this into Doug's original patch, if that's OK? diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 796e0c9..77e7c5b 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -122,6 +122,7 @@ static struct map_desc exynos_iodesc[] __initdata = { }, }; +#ifdef CONFIG_ARCH_EXYNOS5 static struct map_desc exynos5440_iodesc[] __initdata = { { .virtual = (unsigned long)S5P_VA_CHIPID, @@ -130,6 +131,7 @@ static struct map_desc exynos5440_iodesc[] __initdata = { .type = MT_DEVICE, }, }; +#endif static struct map_desc exynos4_iodesc[] __initdata = { { @@ -347,13 +349,19 @@ void __init exynos_init_late(void) void __init exynos_init_io(struct map_desc *mach_desc, int size) { + struct map_desc *iodesc = exynos_iodesc; + int iodesc_sz = ARRAY_SIZE(exynos_iodesc); +#ifdef CONFIG_OF unsigned long root = of_get_flat_dt_root(); /* initialize the io descriptors we need for initialization */ - if (of_flat_dt_is_compatible(root, "samsung,exynos5440")) - iotable_init(exynos5440_iodesc, ARRAY_SIZE(exynos5440_iodesc)); - else - iotable_init(exynos_iodesc, ARRAY_SIZE(exynos_iodesc)); + if (of_flat_dt_is_compatible(root, "samsung,exynos5440")) { + iodesc = exynos5440_iodesc; + iodesc_sz = ARRAY_SIZE(exynos5440_iodesc); + } +#endif + + iotable_init(iodesc, iodesc_sz); if (mach_desc) iotable_init(mach_desc, size); diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 2a75624..f1326be 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -10,6 +10,7 @@ */ #include +#include #include #include