* mach-omap2/timer.c: Bug introduced while merging patch - ff931c82
@ 2013-05-06 7:06 ` Hiremath, Vaibhav
0 siblings, 0 replies; 10+ messages in thread
From: Hiremath, Vaibhav @ 2013-05-06 7:06 UTC (permalink / raw)
To: linux-omap@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
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 <rnayak@ti.com>
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].
[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/
[3] http://git.kernel.org/cgit/linux/kernel/git/tmlind/linux-omap.git/commit/arch/arm/mach-omap2/timer.c?id=ff931c821bab6713a52b768b0cd7ee7e90713b36
Thanks,
Vaibhav
^ permalink raw reply [flat|nested] 10+ messages in thread* mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 @ 2013-05-06 7:06 ` Hiremath, Vaibhav 0 siblings, 0 replies; 10+ messages in thread From: Hiremath, Vaibhav @ 2013-05-06 7:06 UTC (permalink / raw) To: linux-arm-kernel 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 <rnayak@ti.com> 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]. [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/ [3] http://git.kernel.org/cgit/linux/kernel/git/tmlind/linux-omap.git/commit/arch/arm/mach-omap2/timer.c?id=ff931c821bab6713a52b768b0cd7ee7e90713b36 Thanks, Vaibhav ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 2013-05-06 7:06 ` Hiremath, Vaibhav @ 2013-05-06 15:27 ` Tony Lindgren -1 siblings, 0 replies; 10+ messages in thread From: Tony Lindgren @ 2013-05-06 15:27 UTC (permalink / raw) To: Hiremath, Vaibhav Cc: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org * Hiremath, Vaibhav <hvaibhav@ti.com> [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 <rnayak@ti.com> > 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? Regards, Tony > [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/ > [3] http://git.kernel.org/cgit/linux/kernel/git/tmlind/linux-omap.git/commit/arch/arm/mach-omap2/timer.c?id=ff931c821bab6713a52b768b0cd7ee7e90713b36 ^ permalink raw reply [flat|nested] 10+ messages in thread
* mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 @ 2013-05-06 15:27 ` Tony Lindgren 0 siblings, 0 replies; 10+ messages in thread From: Tony Lindgren @ 2013-05-06 15:27 UTC (permalink / raw) To: linux-arm-kernel * Hiremath, Vaibhav <hvaibhav@ti.com> [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 <rnayak@ti.com> > 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? Regards, Tony > [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/ > [3] http://git.kernel.org/cgit/linux/kernel/git/tmlind/linux-omap.git/commit/arch/arm/mach-omap2/timer.c?id=ff931c821bab6713a52b768b0cd7ee7e90713b36 ^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 2013-05-06 15:27 ` Tony Lindgren @ 2013-05-06 18:30 ` Hiremath, Vaibhav -1 siblings, 0 replies; 10+ messages in thread From: Hiremath, Vaibhav @ 2013-05-06 18:30 UTC (permalink / raw) To: Tony Lindgren Cc: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@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 <hvaibhav@ti.com> [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 <rnayak@ti.com> > > 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 <hvaibhav@ti.com> 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 <hvaibhav@ti.com> --- arch/arm/mach-omap2/timer.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) 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 */ \ Thanks, Vaibhav ^ permalink raw reply related [flat|nested] 10+ messages in thread
* mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 @ 2013-05-06 18:30 ` Hiremath, Vaibhav 0 siblings, 0 replies; 10+ messages in thread From: Hiremath, Vaibhav @ 2013-05-06 18:30 UTC (permalink / raw) To: linux-arm-kernel > -----Original Message----- > From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- > owner at vger.kernel.org] On Behalf Of Tony Lindgren > Sent: Monday, May 06, 2013 8:57 PM > To: Hiremath, Vaibhav > Cc: linux-omap at vger.kernel.org; linux-kernel at vger.kernel.org; linux- > arm-kernel at lists.infradead.org > Subject: Re: mach-omap2/timer.c: Bug introduced while merging patch - > ff931c82 > > * Hiremath, Vaibhav <hvaibhav@ti.com> [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 <rnayak@ti.com> > > 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 <hvaibhav@ti.com> 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 <hvaibhav@ti.com> --- arch/arm/mach-omap2/timer.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) 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 */ \ Thanks, Vaibhav ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 2013-05-06 18:30 ` Hiremath, Vaibhav @ 2013-05-06 23:37 ` Tony Lindgren -1 siblings, 0 replies; 10+ messages in thread From: Tony Lindgren @ 2013-05-06 23:37 UTC (permalink / raw) To: Hiremath, Vaibhav Cc: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org * Hiremath, Vaibhav <hvaibhav@ti.com> [130506 11:35]: > > Ohh yeah, I already have a patch for it - Thanks, I'll add that into omap-for-v3.10/fixes. I modified the comments a bit trying to figure out where it changed, updated patch below. Regards, Tony From: Vaibhav Hiremath <hvaibhav@ti.com> Date: Mon, 6 May 2013 15:19:01 -0700 Subject: [PATCH] ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a Looks like the timer.c fixes in commit ff931c82 (ARM: OMAP: clocks: Delay clk inits atleast until slab is initialized) got lost in a merge with da4a686a (ARM: smp_twd: convert to use CLKSRC_OF init). Without the omap_clk_init() calls none of OMAP family of devices boot. Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> [tony@atomide.com: updated comments to describe merge error] Signed-off-by: Tony Lindgren <tony@atomide.com> --- 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 */ \ ^ permalink raw reply [flat|nested] 10+ messages in thread
* mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 @ 2013-05-06 23:37 ` Tony Lindgren 0 siblings, 0 replies; 10+ messages in thread From: Tony Lindgren @ 2013-05-06 23:37 UTC (permalink / raw) To: linux-arm-kernel * Hiremath, Vaibhav <hvaibhav@ti.com> [130506 11:35]: > > Ohh yeah, I already have a patch for it - Thanks, I'll add that into omap-for-v3.10/fixes. I modified the comments a bit trying to figure out where it changed, updated patch below. Regards, Tony From: Vaibhav Hiremath <hvaibhav@ti.com> Date: Mon, 6 May 2013 15:19:01 -0700 Subject: [PATCH] ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a Looks like the timer.c fixes in commit ff931c82 (ARM: OMAP: clocks: Delay clk inits atleast until slab is initialized) got lost in a merge with da4a686a (ARM: smp_twd: convert to use CLKSRC_OF init). Without the omap_clk_init() calls none of OMAP family of devices boot. Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> [tony at atomide.com: updated comments to describe merge error] Signed-off-by: Tony Lindgren <tony@atomide.com> --- 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 */ \ ^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 2013-05-06 23:37 ` Tony Lindgren @ 2013-05-07 3:53 ` Hiremath, Vaibhav -1 siblings, 0 replies; 10+ messages in thread From: Hiremath, Vaibhav @ 2013-05-07 3:53 UTC (permalink / raw) To: Tony Lindgren Cc: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org > -----Original Message----- > From: Tony Lindgren [mailto:tony@atomide.com] > Sent: Tuesday, May 07, 2013 5:08 AM > 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 <hvaibhav@ti.com> [130506 11:35]: > > > > Ohh yeah, I already have a patch for it - > > Thanks, I'll add that into omap-for-v3.10/fixes. I modified > the comments a bit trying to figure out where it changed, updated > patch below. > Thanks Tony. Thanks, Vaibhav ^ permalink raw reply [flat|nested] 10+ messages in thread
* mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 @ 2013-05-07 3:53 ` Hiremath, Vaibhav 0 siblings, 0 replies; 10+ messages in thread From: Hiremath, Vaibhav @ 2013-05-07 3:53 UTC (permalink / raw) To: linux-arm-kernel > -----Original Message----- > From: Tony Lindgren [mailto:tony at atomide.com] > Sent: Tuesday, May 07, 2013 5:08 AM > To: Hiremath, Vaibhav > Cc: linux-omap at vger.kernel.org; linux-kernel at vger.kernel.org; linux- > arm-kernel at lists.infradead.org > Subject: Re: mach-omap2/timer.c: Bug introduced while merging patch - > ff931c82 > > * Hiremath, Vaibhav <hvaibhav@ti.com> [130506 11:35]: > > > > Ohh yeah, I already have a patch for it - > > Thanks, I'll add that into omap-for-v3.10/fixes. I modified > the comments a bit trying to figure out where it changed, updated > patch below. > Thanks Tony. Thanks, Vaibhav ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-05-07 3:53 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-06 7:06 mach-omap2/timer.c: Bug introduced while merging patch - ff931c82 Hiremath, Vaibhav 2013-05-06 7:06 ` Hiremath, Vaibhav 2013-05-06 15:27 ` Tony Lindgren 2013-05-06 15:27 ` Tony Lindgren 2013-05-06 18:30 ` Hiremath, Vaibhav 2013-05-06 18:30 ` Hiremath, Vaibhav 2013-05-06 23:37 ` Tony Lindgren 2013-05-06 23:37 ` Tony Lindgren 2013-05-07 3:53 ` Hiremath, Vaibhav 2013-05-07 3:53 ` Hiremath, Vaibhav
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.