From patchwork Mon May 6 18:30:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 2524901 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 AFF3EDF230 for ; Mon, 6 May 2013 18:31:20 +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 1UZQBs-0004IX-As; Mon, 06 May 2013 18:31:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UZQBp-0001li-Ob; Mon, 06 May 2013 18:31:09 +0000 Received: from bear.ext.ti.com ([192.94.94.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UZQBm-0001l8-IJ for linux-arm-kernel@lists.infradead.org; Mon, 06 May 2013 18:31:07 +0000 Received: from dbdlxv05.itg.ti.com ([172.24.171.60]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r46IUge3024612; Mon, 6 May 2013 13:30:43 -0500 Received: from DBDE72.ent.ti.com (dbde72.ent.ti.com [172.24.171.97]) by dbdlxv05.itg.ti.com (8.14.3/8.13.8) with ESMTP id r46IUcH4006747; Mon, 6 May 2013 13:30:39 -0500 Received: from DBDE04.ent.ti.com ([fe80::21ac:d9f:f810:c8e7]) by DBDE72.ent.ti.com ([fe80::bd56:32bf:87fd:2763%27]) with mapi id 14.02.0342.003; Tue, 7 May 2013 02:30:37 +0800 From: "Hiremath, Vaibhav" To: Tony Lindgren Subject: RE: mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 Thread-Topic: mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 Thread-Index: Ac5KKDi66bBp82szRKKLkCu0fW3iLwAAuOcAABaw+tA= Date: Mon, 6 May 2013 18:30:36 +0000 Message-ID: <79CD15C6BA57404B839C016229A409A83EC7C93A@DBDE04.ent.ti.com> References: <79CD15C6BA57404B839C016229A409A83EC7C45D@DBDE04.ent.ti.com> <20130506152706.GD28721@atomide.com> In-Reply-To: <20130506152706.GD28721@atomide.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.24.170.142] MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130506_143106_684719_3CFA08DE X-CRM114-Status: GOOD ( 23.81 ) X-Spam-Score: -8.1 (--------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-8.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [192.94.94.41 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: "linux-omap@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org > -----Original Message----- > From: linux-omap-owner@vger.kernel.org [mailto:linux-omap- > owner@vger.kernel.org] On Behalf Of Tony Lindgren > Sent: Monday, May 06, 2013 8:57 PM > To: Hiremath, Vaibhav > Cc: linux-omap@vger.kernel.org; linux-kernel@vger.kernel.org; linux- > arm-kernel@lists.infradead.org > Subject: Re: mach-omap2/timer.c: Bug introduced while merging patch - > ff931c82 > > * Hiremath, Vaibhav [130506 00:12]: > > Hi, > > > > Not sure whether this got discussed and fixed already, but Google > didn't give me anything :) > > > > The below commit got merged wrongly to Mainline (Changes from timer.c > got missed), and > > due to this none of omap boards will boot. > > > > > > From ff931c821bab6713a52b768b0cd7ee7e90713b36 Mon Sep 17 00:00:00 > 2001 > > From: Rajendra Nayak > > Date: Thu, 21 Mar 2013 11:04:52 +0000 > > Subject: ARM: OMAP: clocks: Delay clk inits atleast until slab is > initialized > > > > > > It seems Linux-omap tree has the fix patch for this, and it should > get pushed ASAP. > > Below are links for Linus's mainline commit [1], the actual patch > submitted to the list [2] and > > Commit present in Linux-omap [3]. > > Can you please provide a proper patch for the regression since sounds > like you already figured out what happened? > Ohh yeah, I already have a patch for it - From: Vaibhav Hiremath Date: Mon, 6 May 2013 13:23:27 +0530 Subject: [PATCH] ARM: OMAP2+: Regression: Add missing code while merging commit ff931c82 to Mainline While merging commit ff931c82 [1] to Mainline,, it seems not all the changes from the original patch [2] have been merged; changes from mach-omap2/timer.c have been dropped, which invokes xxx_clk_init() function required to register platform clock table. And without this none of OMAP family of devices will boot from Mainline. [1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/arm/mach-omap2/io.c?id=ff931c821bab6713a52b768b0cd7ee7e90713b36 [2] https://patchwork.kernel.org/patch/2300071/ Signed-off-by: Vaibhav Hiremath --- arch/arm/mach-omap2/timer.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Thanks, Vaibhav diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index f12aa6c..31ae764 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -549,6 +549,8 @@ static inline void __init realtime_counter_init(void) clksrc_nr, clksrc_src, clksrc_prop) \ void __init omap##name##_gptimer_timer_init(void) \ { \ + if (omap_clk_init) \ + omap_clk_init(); \ omap_dmtimer_init(); \ omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \ @@ -559,6 +561,8 @@ void __init omap##name##_gptimer_timer_init(void) \ clksrc_nr, clksrc_src, clksrc_prop) \ void __init omap##name##_sync32k_timer_init(void) \ { \ + if (omap_clk_init) \ + omap_clk_init(); \ omap_dmtimer_init(); \ omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \ /* Enable the use of clocksource="gp_timer" kernel parameter */ \