* [FAILURE] omap4430-sdp allnoconfig @ 2013-08-01 17:52 Russell King - ARM Linux 2013-08-01 18:11 ` Santosh Shilimkar 0 siblings, 1 reply; 15+ messages in thread From: Russell King - ARM Linux @ 2013-08-01 17:52 UTC (permalink / raw) To: linux-arm-kernel My allnoconfig fails with this error: arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init': dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register' Might be worth looking into whatever's missing? ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 17:52 [FAILURE] omap4430-sdp allnoconfig Russell King - ARM Linux @ 2013-08-01 18:11 ` Santosh Shilimkar 2013-08-01 18:27 ` Russell King - ARM Linux 0 siblings, 1 reply; 15+ messages in thread From: Santosh Shilimkar @ 2013-08-01 18:11 UTC (permalink / raw) To: linux-arm-kernel On Thursday 01 August 2013 01:52 PM, Russell King - ARM Linux wrote: > My allnoconfig fails with this error: > > arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init': > dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register' > > Might be worth looking into whatever's missing? Looks like coming from below snippet but am just wondering how ? #ifdef CONFIG_ARCH_OMAP4 #ifdef CONFIG_LOCAL_TIMERS static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); void __init omap4_local_timer_init(void) { omap4_sync32k_timer_init(); /* Local timers are not supprted on OMAP4430 ES1.0 */ if (omap_rev() != OMAP4430_REV_ES1_0) { int err; if (of_have_populated_dt()) { clocksource_of_init(); return; } err = twd_local_timer_register(&twd_local_timer); if (err) pr_err("twd_local_timer_register failed %d\n", err); } } #else /* CONFIG_LOCAL_TIMERS */ void __init omap4_local_timer_init(void) { omap4_sync32k_timer_init(); } #endif /* CONFIG_LOCAL_TIMERS */ #endif /* CONFIG_ARCH_OMAP4 */ ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 18:11 ` Santosh Shilimkar @ 2013-08-01 18:27 ` Russell King - ARM Linux 2013-08-01 18:31 ` Santosh Shilimkar 0 siblings, 1 reply; 15+ messages in thread From: Russell King - ARM Linux @ 2013-08-01 18:27 UTC (permalink / raw) To: linux-arm-kernel On Thu, Aug 01, 2013 at 02:11:18PM -0400, Santosh Shilimkar wrote: > On Thursday 01 August 2013 01:52 PM, Russell King - ARM Linux wrote: > > My allnoconfig fails with this error: > > > > arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init': > > dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register' > > > > Might be worth looking into whatever's missing? > > Looks like coming from below snippet but am just wondering how ? Well, looking at the config allnoconfig generated, it doesn't have SMP and therefore it doesn't have local timers. The build tree has this in it: #ifdef CONFIG_ARCH_OMAP4 static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); void __init omap4_local_timer_init(void) { omap4_sync32k_timer_init(); /* Local timers are not supprted on OMAP4430 ES1.0 */ if (omap_rev() != OMAP4430_REV_ES1_0) { int err; if (of_have_populated_dt()) { clocksource_of_init(); return; } err = twd_local_timer_register(&twd_local_timer); if (err) pr_err("twd_local_timer_register failed %d\n", err); } } #endif /* CONFIG_ARCH_OMAP4 */ which is changed from your version thanks to this commit: commit ef3160cd2f0a400751f2cf6fd2811225fee1d5a7 Author: Stephen Boyd <sboyd@codeaurora.org> Date: Mon Mar 4 19:24:35 2013 -0800 ARM: OMAP2+: Divorce from local timer API Now that the TWD doesn't rely on the local timer API, OMAP can stop selecting it in Kconfig and relying on the config option to decide if it should call smp_twd functions. Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> So it seems LOCAL_TIMER is still actually required... ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 18:27 ` Russell King - ARM Linux @ 2013-08-01 18:31 ` Santosh Shilimkar 2013-08-01 18:34 ` Stephen Boyd 0 siblings, 1 reply; 15+ messages in thread From: Santosh Shilimkar @ 2013-08-01 18:31 UTC (permalink / raw) To: linux-arm-kernel On Thursday 01 August 2013 02:27 PM, Russell King - ARM Linux wrote: > On Thu, Aug 01, 2013 at 02:11:18PM -0400, Santosh Shilimkar wrote: >> On Thursday 01 August 2013 01:52 PM, Russell King - ARM Linux wrote: >>> My allnoconfig fails with this error: >>> >>> arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init': >>> dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register' >>> >>> Might be worth looking into whatever's missing? >> >> Looks like coming from below snippet but am just wondering how ? > > Well, looking at the config allnoconfig generated, it doesn't have SMP > and therefore it doesn't have local timers. > > The build tree has this in it: > > #ifdef CONFIG_ARCH_OMAP4 > static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); > void __init omap4_local_timer_init(void) > { > omap4_sync32k_timer_init(); > /* Local timers are not supprted on OMAP4430 ES1.0 */ > if (omap_rev() != OMAP4430_REV_ES1_0) { > int err; > > if (of_have_populated_dt()) { > clocksource_of_init(); > return; > } > > err = twd_local_timer_register(&twd_local_timer); > if (err) > pr_err("twd_local_timer_register failed %d\n", err); > } > } > #endif /* CONFIG_ARCH_OMAP4 */ > Now it make sense. > which is changed from your version thanks to this commit: > > commit ef3160cd2f0a400751f2cf6fd2811225fee1d5a7 > Author: Stephen Boyd <sboyd@codeaurora.org> > Date: Mon Mar 4 19:24:35 2013 -0800 > > ARM: OMAP2+: Divorce from local timer API > > Now that the TWD doesn't rely on the local timer API, OMAP can > stop selecting it in Kconfig and relying on the config option to > decide if it should call smp_twd functions. > > Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > Acked-by: Tony Lindgren <tony@atomide.com> > Acked-by: Marc Zyngier <marc.zyngier@arm.com> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > > So it seems LOCAL_TIMER is still actually required... > yep. Lets see what Stephen has to say. Regards, Santosh ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 18:31 ` Santosh Shilimkar @ 2013-08-01 18:34 ` Stephen Boyd 2013-08-01 18:37 ` Stephen Boyd 0 siblings, 1 reply; 15+ messages in thread From: Stephen Boyd @ 2013-08-01 18:34 UTC (permalink / raw) To: linux-arm-kernel On 08/01/13 11:31, Santosh Shilimkar wrote: > On Thursday 01 August 2013 02:27 PM, Russell King - ARM Linux wrote: >> On Thu, Aug 01, 2013 at 02:11:18PM -0400, Santosh Shilimkar wrote: >>> On Thursday 01 August 2013 01:52 PM, Russell King - ARM Linux wrote: >>>> My allnoconfig fails with this error: >>>> >>>> arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init': >>>> dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register' >>>> >>>> Might be worth looking into whatever's missing? >>> Looks like coming from below snippet but am just wondering how ? >> Well, looking at the config allnoconfig generated, it doesn't have SMP >> and therefore it doesn't have local timers. >> >> The build tree has this in it: >> >> #ifdef CONFIG_ARCH_OMAP4 >> static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); >> void __init omap4_local_timer_init(void) >> { >> omap4_sync32k_timer_init(); >> /* Local timers are not supprted on OMAP4430 ES1.0 */ >> if (omap_rev() != OMAP4430_REV_ES1_0) { >> int err; >> >> if (of_have_populated_dt()) { >> clocksource_of_init(); >> return; >> } >> >> err = twd_local_timer_register(&twd_local_timer); >> if (err) >> pr_err("twd_local_timer_register failed %d\n", err); >> } >> } >> #endif /* CONFIG_ARCH_OMAP4 */ >> > Now it make sense. > >> which is changed from your version thanks to this commit: >> >> commit ef3160cd2f0a400751f2cf6fd2811225fee1d5a7 >> Author: Stephen Boyd <sboyd@codeaurora.org> >> Date: Mon Mar 4 19:24:35 2013 -0800 >> >> ARM: OMAP2+: Divorce from local timer API >> >> Now that the TWD doesn't rely on the local timer API, OMAP can >> stop selecting it in Kconfig and relying on the config option to >> decide if it should call smp_twd functions. >> >> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >> Acked-by: Tony Lindgren <tony@atomide.com> >> Acked-by: Marc Zyngier <marc.zyngier@arm.com> >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> >> So it seems LOCAL_TIMER is still actually required... >> > yep. Lets see what Stephen has to say. Hmm.. Looks like you can either wrap this up in a CONFIG_HAVE_ARM_TWD check or just compile in TWD all the time on omap4. The latter is simpler but not a direct conversion. ---8<---- diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 4e0049a..c9e9b2c 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -90,7 +90,7 @@ config ARCH_OMAP4 select CACHE_L2X0 select CPU_V7 select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP + select HAVE_ARM_TWD select HAVE_SMP select OMAP_INTERCONNECT select PL310_ERRATA_588369 -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 18:34 ` Stephen Boyd @ 2013-08-01 18:37 ` Stephen Boyd 2013-08-01 18:48 ` Santosh Shilimkar 0 siblings, 1 reply; 15+ messages in thread From: Stephen Boyd @ 2013-08-01 18:37 UTC (permalink / raw) To: linux-arm-kernel On 08/01/13 11:34, Stephen Boyd wrote: > On 08/01/13 11:31, Santosh Shilimkar wrote: >> On Thursday 01 August 2013 02:27 PM, Russell King - ARM Linux wrote: >>> On Thu, Aug 01, 2013 at 02:11:18PM -0400, Santosh Shilimkar wrote: >>>> On Thursday 01 August 2013 01:52 PM, Russell King - ARM Linux wrote: >>>>> My allnoconfig fails with this error: >>>>> >>>>> arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init': >>>>> dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register' >>>>> >>>>> Might be worth looking into whatever's missing? >>>> Looks like coming from below snippet but am just wondering how ? >>> Well, looking at the config allnoconfig generated, it doesn't have SMP >>> and therefore it doesn't have local timers. >>> >>> The build tree has this in it: >>> >>> #ifdef CONFIG_ARCH_OMAP4 >>> static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); >>> void __init omap4_local_timer_init(void) >>> { >>> omap4_sync32k_timer_init(); >>> /* Local timers are not supprted on OMAP4430 ES1.0 */ >>> if (omap_rev() != OMAP4430_REV_ES1_0) { >>> int err; >>> >>> if (of_have_populated_dt()) { >>> clocksource_of_init(); >>> return; >>> } >>> >>> err = twd_local_timer_register(&twd_local_timer); >>> if (err) >>> pr_err("twd_local_timer_register failed %d\n", err); >>> } >>> } >>> #endif /* CONFIG_ARCH_OMAP4 */ >>> >> Now it make sense. >> >>> which is changed from your version thanks to this commit: >>> >>> commit ef3160cd2f0a400751f2cf6fd2811225fee1d5a7 >>> Author: Stephen Boyd <sboyd@codeaurora.org> >>> Date: Mon Mar 4 19:24:35 2013 -0800 >>> >>> ARM: OMAP2+: Divorce from local timer API >>> >>> Now that the TWD doesn't rely on the local timer API, OMAP can >>> stop selecting it in Kconfig and relying on the config option to >>> decide if it should call smp_twd functions. >>> >>> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >>> Acked-by: Tony Lindgren <tony@atomide.com> >>> Acked-by: Marc Zyngier <marc.zyngier@arm.com> >>> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >>> >>> So it seems LOCAL_TIMER is still actually required... >>> >> yep. Lets see what Stephen has to say. > Hmm.. Looks like you can either wrap this up in a CONFIG_HAVE_ARM_TWD > check or just compile in TWD all the time on omap4. The latter is > simpler but not a direct conversion. Here's the other version (probably whitespace damaged): ---8<---- diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 3b7caba..00dc53e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -600,6 +600,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", #endif #ifdef CONFIG_ARCH_OMAP4 +#ifdef CONFIG_HAVE_ARM_TWD static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); void __init omap4_local_timer_init(void) { @@ -618,6 +619,12 @@ void __init omap4_local_timer_init(void) pr_err("twd_local_timer_register failed %d\n", err); } } +#else +void __init omap4_local_timer_init(void) +{ + omap4_sync32k_timer_init(); +} +#endif /* CONFIG_HAVE_ARM_TWD */ #endif /* CONFIG_ARCH_OMAP4 */ #ifdef CONFIG_SOC_OMAP5 > > ---8<---- > > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig > index 4e0049a..c9e9b2c 100644 > --- a/arch/arm/mach-omap2/Kconfig > +++ b/arch/arm/mach-omap2/Kconfig > @@ -90,7 +90,7 @@ config ARCH_OMAP4 > select CACHE_L2X0 > select CPU_V7 > select HAVE_ARM_SCU if SMP > - select HAVE_ARM_TWD if SMP > + select HAVE_ARM_TWD > select HAVE_SMP > select OMAP_INTERCONNECT > select PL310_ERRATA_588369 > -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 18:37 ` Stephen Boyd @ 2013-08-01 18:48 ` Santosh Shilimkar 2013-08-01 18:59 ` Stephen Boyd 0 siblings, 1 reply; 15+ messages in thread From: Santosh Shilimkar @ 2013-08-01 18:48 UTC (permalink / raw) To: linux-arm-kernel On Thursday 01 August 2013 02:37 PM, Stephen Boyd wrote: > On 08/01/13 11:34, Stephen Boyd wrote: >> On 08/01/13 11:31, Santosh Shilimkar wrote: >>> On Thursday 01 August 2013 02:27 PM, Russell King - ARM Linux wrote: >>>> On Thu, Aug 01, 2013 at 02:11:18PM -0400, Santosh Shilimkar wrote: >>>>> On Thursday 01 August 2013 01:52 PM, Russell King - ARM Linux wrote: >>>>>> My allnoconfig fails with this error: >>>>>> >>>>>> arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init': >>>>>> dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register' >>>>>> >>>>>> Might be worth looking into whatever's missing? >>>>> Looks like coming from below snippet but am just wondering how ? >>>> Well, looking at the config allnoconfig generated, it doesn't have SMP >>>> and therefore it doesn't have local timers. >>>> >>>> The build tree has this in it: >>>> >>>> #ifdef CONFIG_ARCH_OMAP4 >>>> static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); >>>> void __init omap4_local_timer_init(void) >>>> { >>>> omap4_sync32k_timer_init(); >>>> /* Local timers are not supprted on OMAP4430 ES1.0 */ >>>> if (omap_rev() != OMAP4430_REV_ES1_0) { >>>> int err; >>>> >>>> if (of_have_populated_dt()) { >>>> clocksource_of_init(); >>>> return; >>>> } >>>> >>>> err = twd_local_timer_register(&twd_local_timer); >>>> if (err) >>>> pr_err("twd_local_timer_register failed %d\n", err); >>>> } >>>> } >>>> #endif /* CONFIG_ARCH_OMAP4 */ >>>> >>> Now it make sense. >>> >>>> which is changed from your version thanks to this commit: >>>> >>>> commit ef3160cd2f0a400751f2cf6fd2811225fee1d5a7 >>>> Author: Stephen Boyd <sboyd@codeaurora.org> >>>> Date: Mon Mar 4 19:24:35 2013 -0800 >>>> >>>> ARM: OMAP2+: Divorce from local timer API >>>> >>>> Now that the TWD doesn't rely on the local timer API, OMAP can >>>> stop selecting it in Kconfig and relying on the config option to >>>> decide if it should call smp_twd functions. >>>> >>>> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >>>> Acked-by: Tony Lindgren <tony@atomide.com> >>>> Acked-by: Marc Zyngier <marc.zyngier@arm.com> >>>> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >>>> >>>> So it seems LOCAL_TIMER is still actually required... >>>> >>> yep. Lets see what Stephen has to say. >> Hmm.. Looks like you can either wrap this up in a CONFIG_HAVE_ARM_TWD >> check or just compile in TWD all the time on omap4. The latter is >> simpler but not a direct conversion. > > Here's the other version (probably whitespace damaged): > > ---8<---- > > diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c > index 3b7caba..00dc53e 100644 > --- a/arch/arm/mach-omap2/timer.c > +++ b/arch/arm/mach-omap2/timer.c > @@ -600,6 +600,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", > #endif > > #ifdef CONFIG_ARCH_OMAP4 > +#ifdef CONFIG_HAVE_ARM_TWD > static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); > void __init omap4_local_timer_init(void) > { > @@ -618,6 +619,12 @@ void __init omap4_local_timer_init(void) > pr_err("twd_local_timer_register failed %d\n", err); > } > } > +#else > +void __init omap4_local_timer_init(void) > +{ > + omap4_sync32k_timer_init(); > +} > +#endif /* CONFIG_HAVE_ARM_TWD */ > #endif /* CONFIG_ARCH_OMAP4 */ > > #ifdef CONFIG_SOC_OMAP5 > This one looks fine for me. Can you send above in a proper patch ? Let me know if you want me to send it. Regards, Santosh ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 18:48 ` Santosh Shilimkar @ 2013-08-01 18:59 ` Stephen Boyd 2013-08-01 19:01 ` Santosh Shilimkar ` (2 more replies) 0 siblings, 3 replies; 15+ messages in thread From: Stephen Boyd @ 2013-08-01 18:59 UTC (permalink / raw) To: linux-arm-kernel On 08/01, Santosh Shilimkar wrote: > This one looks fine for me. Can you send above in > a proper patch ? Let me know if you want me to > send it. > Here's a proper patch. Olof, can you please apply this on top of the merge (and maybe you can fix the merge again to handle the HAVE_CAN problem I mentioned earlier). ---8<--- Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer API, 2013-03-04) broke the omap build when SMP=n because the TWD functions are only compiled on SMP=y builds. Stub out the TWD calls when the TWD isn't built in to to keep everything building. arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init': dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register' Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/mach-omap2/timer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 3b7caba..00dc53e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -600,6 +600,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", #endif #ifdef CONFIG_ARCH_OMAP4 +#ifdef CONFIG_HAVE_ARM_TWD static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); void __init omap4_local_timer_init(void) { @@ -618,6 +619,12 @@ void __init omap4_local_timer_init(void) pr_err("twd_local_timer_register failed %d\n", err); } } +#else +void __init omap4_local_timer_init(void) +{ + omap4_sync32k_timer_init(); +} +#endif /* CONFIG_HAVE_ARM_TWD */ #endif /* CONFIG_ARCH_OMAP4 */ #ifdef CONFIG_SOC_OMAP5 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 18:59 ` Stephen Boyd @ 2013-08-01 19:01 ` Santosh Shilimkar 2013-08-01 19:02 ` Russell King - ARM Linux 2013-08-01 20:06 ` Olof Johansson 2 siblings, 0 replies; 15+ messages in thread From: Santosh Shilimkar @ 2013-08-01 19:01 UTC (permalink / raw) To: linux-arm-kernel On Thursday 01 August 2013 02:59 PM, Stephen Boyd wrote: > On 08/01, Santosh Shilimkar wrote: >> This one looks fine for me. Can you send above in >> a proper patch ? Let me know if you want me to >> send it. >> > > Here's a proper patch. Olof, can you please apply this on top of > the merge (and maybe you can fix the merge again to handle the > HAVE_CAN problem I mentioned earlier). > > ---8<--- > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > API, 2013-03-04) broke the omap build when SMP=n because the TWD > functions are only compiled on SMP=y builds. Stub out the TWD > calls when the TWD isn't built in to to keep everything building. > > arch/arm/mach-omap2/built-in.o: In function > `omap4_local_timer_init': > dss-common.c:(.init.text+0x1d90): undefined reference to > `twd_local_timer_register' > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- Thanks Stephen Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 18:59 ` Stephen Boyd 2013-08-01 19:01 ` Santosh Shilimkar @ 2013-08-01 19:02 ` Russell King - ARM Linux 2013-08-01 20:06 ` Olof Johansson 2 siblings, 0 replies; 15+ messages in thread From: Russell King - ARM Linux @ 2013-08-01 19:02 UTC (permalink / raw) To: linux-arm-kernel On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: > On 08/01, Santosh Shilimkar wrote: > > This one looks fine for me. Can you send above in > > a proper patch ? Let me know if you want me to > > send it. > > > > Here's a proper patch. Olof, can you please apply this on top of > the merge (and maybe you can fix the merge again to handle the > HAVE_CAN problem I mentioned earlier). > > ---8<--- > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > API, 2013-03-04) broke the omap build when SMP=n because the TWD > functions are only compiled on SMP=y builds. Stub out the TWD > calls when the TWD isn't built in to to keep everything building. > > arch/arm/mach-omap2/built-in.o: In function > `omap4_local_timer_init': > dss-common.c:(.init.text+0x1d90): undefined reference to > `twd_local_timer_register' > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> Please change this to be: Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Thanks. ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 18:59 ` Stephen Boyd 2013-08-01 19:01 ` Santosh Shilimkar 2013-08-01 19:02 ` Russell King - ARM Linux @ 2013-08-01 20:06 ` Olof Johansson 2013-08-02 20:44 ` Stephen Boyd 2 siblings, 1 reply; 15+ messages in thread From: Olof Johansson @ 2013-08-01 20:06 UTC (permalink / raw) To: linux-arm-kernel On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: > On 08/01, Santosh Shilimkar wrote: > > This one looks fine for me. Can you send above in > > a proper patch ? Let me know if you want me to > > send it. > > > > Here's a proper patch. Olof, can you please apply this on top of > the merge (and maybe you can fix the merge again to handle the > HAVE_CAN problem I mentioned earlier). > > ---8<--- > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > API, 2013-03-04) broke the omap build when SMP=n because the TWD > functions are only compiled on SMP=y builds. Stub out the TWD > calls when the TWD isn't built in to to keep everything building. > > arch/arm/mach-omap2/built-in.o: In function > `omap4_local_timer_init': > dss-common.c:(.init.text+0x1d90): undefined reference to > `twd_local_timer_register' > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Thanks, applied (with the reported-by changed as requested) -Olof ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-01 20:06 ` Olof Johansson @ 2013-08-02 20:44 ` Stephen Boyd 2013-08-02 20:50 ` Olof Johansson 0 siblings, 1 reply; 15+ messages in thread From: Stephen Boyd @ 2013-08-02 20:44 UTC (permalink / raw) To: linux-arm-kernel On 08/01, Olof Johansson wrote: > On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: > > On 08/01, Santosh Shilimkar wrote: > > > This one looks fine for me. Can you send above in > > > a proper patch ? Let me know if you want me to > > > send it. > > > > > > > Here's a proper patch. Olof, can you please apply this on top of > > the merge (and maybe you can fix the merge again to handle the > > HAVE_CAN problem I mentioned earlier). > > > > ---8<--- > > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > > > > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > > API, 2013-03-04) broke the omap build when SMP=n because the TWD > > functions are only compiled on SMP=y builds. Stub out the TWD > > calls when the TWD isn't built in to to keep everything building. > > > > arch/arm/mach-omap2/built-in.o: In function > > `omap4_local_timer_init': > > dss-common.c:(.init.text+0x1d90): undefined reference to > > `twd_local_timer_register' > > > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > > Thanks, applied (with the reported-by changed as requested) > It looks like somehow you became the author. Is there anyway you can fix that and possibly fix the merge before it to not add HAVE_CAN_FLEXCAN if CAN in mach-imx/Kconfig? -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-02 20:44 ` Stephen Boyd @ 2013-08-02 20:50 ` Olof Johansson 2013-08-02 20:56 ` Stephen Boyd 0 siblings, 1 reply; 15+ messages in thread From: Olof Johansson @ 2013-08-02 20:50 UTC (permalink / raw) To: linux-arm-kernel On Fri, Aug 2, 2013 at 1:44 PM, Stephen Boyd <sboyd@codeaurora.org> wrote: > On 08/01, Olof Johansson wrote: >> On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: >> > On 08/01, Santosh Shilimkar wrote: >> > > This one looks fine for me. Can you send above in >> > > a proper patch ? Let me know if you want me to >> > > send it. >> > > >> > >> > Here's a proper patch. Olof, can you please apply this on top of >> > the merge (and maybe you can fix the merge again to handle the >> > HAVE_CAN problem I mentioned earlier). >> > >> > ---8<--- >> > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n >> > >> > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer >> > API, 2013-03-04) broke the omap build when SMP=n because the TWD >> > functions are only compiled on SMP=y builds. Stub out the TWD >> > calls when the TWD isn't built in to to keep everything building. >> > >> > arch/arm/mach-omap2/built-in.o: In function >> > `omap4_local_timer_init': >> > dss-common.c:(.init.text+0x1d90): undefined reference to >> > `twd_local_timer_register' >> > >> > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> >> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> >> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> >> Thanks, applied (with the reported-by changed as requested) >> > > It looks like somehow you became the author. Is there anyway you > can fix that and possibly fix the merge before it to not add > HAVE_CAN_FLEXCAN if CAN in mach-imx/Kconfig? That's because the patch wasn't sent such that it could be applied with git am, and forgot to set authorship back. Fixed now. -Olof ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-02 20:50 ` Olof Johansson @ 2013-08-02 20:56 ` Stephen Boyd 2013-08-02 20:59 ` Olof Johansson 0 siblings, 1 reply; 15+ messages in thread From: Stephen Boyd @ 2013-08-02 20:56 UTC (permalink / raw) To: linux-arm-kernel On 08/02, Olof Johansson wrote: > On Fri, Aug 2, 2013 at 1:44 PM, Stephen Boyd <sboyd@codeaurora.org> wrote: > > On 08/01, Olof Johansson wrote: > >> On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: > >> > On 08/01, Santosh Shilimkar wrote: > >> > > This one looks fine for me. Can you send above in > >> > > a proper patch ? Let me know if you want me to > >> > > send it. > >> > > > >> > > >> > Here's a proper patch. Olof, can you please apply this on top of > >> > the merge (and maybe you can fix the merge again to handle the > >> > HAVE_CAN problem I mentioned earlier). > >> > > >> > ---8<--- > >> > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > >> > > >> > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > >> > API, 2013-03-04) broke the omap build when SMP=n because the TWD > >> > functions are only compiled on SMP=y builds. Stub out the TWD > >> > calls when the TWD isn't built in to to keep everything building. > >> > > >> > arch/arm/mach-omap2/built-in.o: In function > >> > `omap4_local_timer_init': > >> > dss-common.c:(.init.text+0x1d90): undefined reference to > >> > `twd_local_timer_register' > >> > > >> > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > >> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > >> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > >> > >> Thanks, applied (with the reported-by changed as requested) > >> > > > > It looks like somehow you became the author. Is there anyway you > > can fix that and possibly fix the merge before it to not add > > HAVE_CAN_FLEXCAN if CAN in mach-imx/Kconfig? > > That's because the patch wasn't sent such that it could be applied > with git am, and forgot to set authorship back. Fixed now. > Ah sorry, I thought you would use git am --scissors so it would keep the authorship from the sender. I'll just add From: in future scissored patches to make this simpler. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 15+ messages in thread
* [FAILURE] omap4430-sdp allnoconfig 2013-08-02 20:56 ` Stephen Boyd @ 2013-08-02 20:59 ` Olof Johansson 0 siblings, 0 replies; 15+ messages in thread From: Olof Johansson @ 2013-08-02 20:59 UTC (permalink / raw) To: linux-arm-kernel On Fri, Aug 2, 2013 at 1:56 PM, Stephen Boyd <sboyd@codeaurora.org> wrote: > Ah sorry, I thought you would use git am --scissors so it would > keep the authorship from the sender. I'll just add From: in > future scissored patches to make this simpler. Or move the discussion parts under the --- in the patch, that works too. -Olof ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2013-08-02 20:59 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-08-01 17:52 [FAILURE] omap4430-sdp allnoconfig Russell King - ARM Linux 2013-08-01 18:11 ` Santosh Shilimkar 2013-08-01 18:27 ` Russell King - ARM Linux 2013-08-01 18:31 ` Santosh Shilimkar 2013-08-01 18:34 ` Stephen Boyd 2013-08-01 18:37 ` Stephen Boyd 2013-08-01 18:48 ` Santosh Shilimkar 2013-08-01 18:59 ` Stephen Boyd 2013-08-01 19:01 ` Santosh Shilimkar 2013-08-01 19:02 ` Russell King - ARM Linux 2013-08-01 20:06 ` Olof Johansson 2013-08-02 20:44 ` Stephen Boyd 2013-08-02 20:50 ` Olof Johansson 2013-08-02 20:56 ` Stephen Boyd 2013-08-02 20:59 ` Olof Johansson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).