vexpress issues in next-20121029

Submitted by Pawel Moll on Oct. 30, 2012, 4:16 p.m.

Details

Message ID 1351613819.6199.14.camel@hornet
State New
Headers show

Commit Message

Pawel Moll Oct. 30, 2012, 4:16 p.m.
Hi Stephen,

On Mon, 2012-10-29 at 20:24 +0000, Stephen Warren wrote:
> 1) At compile-time: v2m_timer_init() and v2m_dt_timer_init() reference
> functions vexpress_clk_init() and vexpress_clk_of_init() respectively,
> which don't appear anywhere in the source tree.

There was a glitch between clk-next and arm-soc - it should be fine
starting with next-20121030.

> 2) With those calls commented out, I find that
> vexpress_sysreg_init_leds() is device_initcall, and so executes even
> when not running on vexpress HW. This crashes on Tegra (which I have
> converted to single-zImage locally).

Uh, how stupid of me! I have to finally get used to the new
multi-platform-kernel reality... Sorry about it - a quick workaround
would be:

8<----------------------------
8<----------------------------

while I'm improving the situation by better means.

Sorry about this and thanks for letting me know!

Paweł

Comments

Russell King - ARM Linux Nov. 5, 2012, 9:35 a.m.
On Tue, Oct 30, 2012 at 04:16:59PM +0000, Pawel Moll wrote:
> Hi Stephen,
> 
> On Mon, 2012-10-29 at 20:24 +0000, Stephen Warren wrote:
> > 1) At compile-time: v2m_timer_init() and v2m_dt_timer_init() reference
> > functions vexpress_clk_init() and vexpress_clk_of_init() respectively,
> > which don't appear anywhere in the source tree.
> 
> There was a glitch between clk-next and arm-soc - it should be fine
> starting with next-20121030.

The problem is still there - my builds of my tree plus arm-soc are
continuing to fail with:

arch/arm/mach-vexpress/built-in.o: In function `v2m_timer_init':
reset.c:(.init.text+0xe0): undefined reference to `vexpress_clk_init'
arch/arm/mach-vexpress/built-in.o: In function `v2m_dt_timer_init':
reset.c:(.init.text+0x114): undefined reference to `vexpress_clk_of_init'

My guess is you have a dependency between the clk-next tree and arm-soc
which you haven't told the arm-soc people about.
Russell King - ARM Linux Nov. 5, 2012, 9:45 a.m.
On Mon, Nov 05, 2012 at 09:35:32AM +0000, Russell King - ARM Linux wrote:
> On Tue, Oct 30, 2012 at 04:16:59PM +0000, Pawel Moll wrote:
> > Hi Stephen,
> > 
> > On Mon, 2012-10-29 at 20:24 +0000, Stephen Warren wrote:
> > > 1) At compile-time: v2m_timer_init() and v2m_dt_timer_init() reference
> > > functions vexpress_clk_init() and vexpress_clk_of_init() respectively,
> > > which don't appear anywhere in the source tree.
> > 
> > There was a glitch between clk-next and arm-soc - it should be fine
> > starting with next-20121030.
> 
> The problem is still there - my builds of my tree plus arm-soc are
> continuing to fail with:
> 
> arch/arm/mach-vexpress/built-in.o: In function `v2m_timer_init':
> reset.c:(.init.text+0xe0): undefined reference to `vexpress_clk_init'
> arch/arm/mach-vexpress/built-in.o: In function `v2m_dt_timer_init':
> reset.c:(.init.text+0x114): undefined reference to `vexpress_clk_of_init'
> 
> My guess is you have a dependency between the clk-next tree and arm-soc
> which you haven't told the arm-soc people about.

Oh, and the above seems to affect all my kautobuilds for any ARM Ltd
development platform - it's not just vexpress which is affected by this
anymore.
Pawel Moll Nov. 5, 2012, 2:43 p.m.
On Mon, 2012-11-05 at 09:45 +0000, Russell King - ARM Linux wrote:
> On Mon, Nov 05, 2012 at 09:35:32AM +0000, Russell King - ARM Linux wrote:
> > On Tue, Oct 30, 2012 at 04:16:59PM +0000, Pawel Moll wrote:
> > > There was a glitch between clk-next and arm-soc - it should be fine
> > > starting with next-20121030.
> > 
> > The problem is still there - my builds of my tree plus arm-soc are
> > continuing to fail with:
> > 
> > arch/arm/mach-vexpress/built-in.o: In function `v2m_timer_init':
> > reset.c:(.init.text+0xe0): undefined reference to `vexpress_clk_init'
> > arch/arm/mach-vexpress/built-in.o: In function `v2m_dt_timer_init':
> > reset.c:(.init.text+0x114): undefined reference to `vexpress_clk_of_init'
> > 
> > My guess is you have a dependency between the clk-next tree and arm-soc
> > which you haven't told the arm-soc people about.
> 
> Oh, and the above seems to affect all my kautobuilds for any ARM Ltd
> development platform - it's not just vexpress which is affected by this
> anymore.

I've just successfully built defconfigs for vexpress, versatile and
realview with next-20121105 so I guess Arnd simply didn't have time last
week (the Connect event) to sort out the arm-soc tree...

Arnd, will you pull the vexpress-clk-soc (containing, as you suggested,
the soc stuff rebased on top of the clk branch) or do you want me to do
something else?

Thanks!

Paweł
Arnd Bergmann Nov. 5, 2012, 4:47 p.m.
On Monday 05 November 2012, Pawel Moll wrote:
> On Mon, 2012-11-05 at 09:45 +0000, Russell King - ARM Linux wrote:
> > On Mon, Nov 05, 2012 at 09:35:32AM +0000, Russell King - ARM Linux wrote:
> > > On Tue, Oct 30, 2012 at 04:16:59PM +0000, Pawel Moll wrote:
> > > > There was a glitch between clk-next and arm-soc - it should be fine
> > > > starting with next-20121030.
> > > 
> > > The problem is still there - my builds of my tree plus arm-soc are
> > > continuing to fail with:
> > > 
> > > arch/arm/mach-vexpress/built-in.o: In function `v2m_timer_init':
> > > reset.c:(.init.text+0xe0): undefined reference to `vexpress_clk_init'
> > > arch/arm/mach-vexpress/built-in.o: In function `v2m_dt_timer_init':
> > > reset.c:(.init.text+0x114): undefined reference to `vexpress_clk_of_init'
> > > 
> > > My guess is you have a dependency between the clk-next tree and arm-soc
> > > which you haven't told the arm-soc people about.
> > 
> > Oh, and the above seems to affect all my kautobuilds for any ARM Ltd
> > development platform - it's not just vexpress which is affected by this
> > anymore.
> 
> I've just successfully built defconfigs for vexpress, versatile and
> realview with next-20121105 so I guess Arnd simply didn't have time last
> week (the Connect event) to sort out the arm-soc tree...
> 
> Arnd, will you pull the vexpress-clk-soc (containing, as you suggested,
> the soc stuff rebased on top of the clk branch) or do you want me to do
> something else?

Sorry for not getting back to this earlier. It was indeed a very busy
week and I did not manage to pull in any branches.

I've just tried pulling in your branch again, but it appears unchanged:
The patches are still based on 807e45b328, which is a different commit
from bcd6f569e874 that is in Mike's tree. Please do as I asked you before
and rebase on top of the commit that you sent him, and make sure that
this is a commit that Mike never rebases.

	Arnd

Patch hide | download patch | download mbox

diff --git a/drivers/mfd/vexpress-sysreg.c
b/drivers/mfd/vexpress-sysreg.c
index 059d6b1..99e89a8 100644
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -474,7 +474,6 @@  static int __init vexpress_sysreg_init(void)
 }
 core_initcall(vexpress_sysreg_init);
 
-
 #if defined(CONFIG_LEDS_CLASS)
 
 struct vexpress_sysreg_led {
@@ -526,6 +525,9 @@  static int __init vexpress_sysreg_init_leds(void)
 	struct vexpress_sysreg_led *led;
 	int i;
 
+	if (!vexpress_sysreg_base)
+		return 0;
+
 	/* Clear all user LEDs */
 	writel(0, vexpress_sysreg_base + SYS_LED);