[patch 1/1] ARM: kirkwood: stop printk TCLK value at boot for DT boards

[patch 1/1] ARM: kirkwood: stop printk TCLK value at boot for DT boards

[Arnaud Patard (Rtp)]

Commit 2326f04321a9 (ARM: kirkwood: convert to DT irqchip and clocksource)
dropped the call to kirkwood_timer_init() when booting with DT.
This results in kirkwood_tclk not being set and the boot message is now:

Kirkwood: MV88F6281-A0, TCLK=0

This patch modifies the message for printing only the kirkwood id,
as it allows to detect if we're running A0/A1/... variants with a simple
dmesg.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
---

Index: linux-next/arch/arm/mach-kirkwood/board-dt.c
===================================================================
--- linux-next.orig/arch/arm/mach-kirkwood/board-dt.c	2013-11-05 18:36:23.131191305 +0100
+++ linux-next/arch/arm/mach-kirkwood/board-dt.c	2013-11-05 18:36:35.867190745 +0100
@@ -140,7 +140,7 @@ eth_fixup_skip:
 
 static void __init kirkwood_dt_init(void)
 {
-	pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
+	pr_info("Kirkwood: %s.\n", kirkwood_id());
 
 	/*
 	 * Disable propagation of mbus errors to the CPU local bus,

[patch 1/1] ARM: kirkwood: stop printk TCLK value at boot for DT boards

[Sebastian Hesselbarth]

On 11/05/2013 07:09 PM, Arnaud Patard (Rtp) wrote:
> Commit 2326f04321a9 (ARM: kirkwood: convert to DT irqchip and clocksource)
> dropped the call to kirkwood_timer_init() when booting with DT.
> This results in kirkwood_tclk not being set and the boot message is now:
>
> Kirkwood: MV88F6281-A0, TCLK=0
>
> This patch modifies the message for printing only the kirkwood id,
> as it allows to detect if we're running A0/A1/... variants with a simple
> dmesg.

Arnaud,

for DT based booting we also have the "Machine" printed right above the
"Kirkwood" string. Don't you think, that we can remove the pr_info
completely?

Sebastian

> ---
>
> Index: linux-next/arch/arm/mach-kirkwood/board-dt.c
> ===================================================================
> --- linux-next.orig/arch/arm/mach-kirkwood/board-dt.c	2013-11-05 18:36:23.131191305 +0100
> +++ linux-next/arch/arm/mach-kirkwood/board-dt.c	2013-11-05 18:36:35.867190745 +0100
> @@ -140,7 +140,7 @@ eth_fixup_skip:
>
>   static void __init kirkwood_dt_init(void)
>   {
> -	pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
> +	pr_info("Kirkwood: %s.\n", kirkwood_id());
>
>   	/*
>   	 * Disable propagation of mbus errors to the CPU local bus,
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

[patch 1/1] ARM: kirkwood: stop printk TCLK value at boot for DT boards

[Andrew Lunn]

> >Kirkwood: MV88F6281-A0, TCLK=0
> >
> >This patch modifies the message for printing only the kirkwood id,
> >as it allows to detect if we're running A0/A1/... variants with a simple
> >dmesg.
> 
> Arnaud,
> 
> for DT based booting we also have the "Machine" printed right above the
> "Kirkwood" string. Don't you think, that we can remove the pr_info
> completely?

Hi Sebastian

I think it is useful, as a debug tool. What is printed here is probed
from the hardware. We know it is correct. The Machine string is from
DT and somebody could be trying to boot with the wrong DT blob.

   Andrew

[patch 1/1] ARM: kirkwood: stop printk TCLK value at boot for DT boards

[Arnaud Patard (Rtp)]

Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> writes:

> On 11/05/2013 07:09 PM, Arnaud Patard (Rtp) wrote:
>> Commit 2326f04321a9 (ARM: kirkwood: convert to DT irqchip and clocksource)
>> dropped the call to kirkwood_timer_init() when booting with DT.
>> This results in kirkwood_tclk not being set and the boot message is now:
>>
>> Kirkwood: MV88F6281-A0, TCLK=0
>>
>> This patch modifies the message for printing only the kirkwood id,
>> as it allows to detect if we're running A0/A1/... variants with a simple
>> dmesg.
>
> Arnaud,
>
> for DT based booting we also have the "Machine" printed right above the
> "Kirkwood" string. Don't you think, that we can remove the pr_info
> completely?

The Machine give some valuable information as one can load wrong dtb
(already happened here). Moreover, it's a of thing (see
of_flat_dt_match_machine) so not something that can be decided on
kirkwookd side.
About possible redundancy of informations between the "Kirkwood:" and
the "Machine" lines, the former one gives the stepping. This allows to
know easily if kwboot has a chance to work on the serial port.

Arnaud

[patch 1/1] ARM: kirkwood: stop printk TCLK value at boot for DT boards

[Sebastian Hesselbarth]

On 11/08/2013 10:29 AM, Arnaud Patard (Rtp) wrote:
> Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> writes:
>> On 11/05/2013 07:09 PM, Arnaud Patard (Rtp) wrote:
>>> Commit 2326f04321a9 (ARM: kirkwood: convert to DT irqchip and clocksource)
>>> dropped the call to kirkwood_timer_init() when booting with DT.
>>> This results in kirkwood_tclk not being set and the boot message is now:
>>>
>>> Kirkwood: MV88F6281-A0, TCLK=0
>>>
>>> This patch modifies the message for printing only the kirkwood id,
>>> as it allows to detect if we're running A0/A1/... variants with a simple
>>> dmesg.
>>
>> for DT based booting we also have the "Machine" printed right above the
>> "Kirkwood" string. Don't you think, that we can remove the pr_info
>> completely?
>
> The Machine give some valuable information as one can load wrong dtb
> (already happened here). Moreover, it's a of thing (see
> of_flat_dt_match_machine) so not something that can be decided on
> kirkwookd side.
> About possible redundancy of informations between the "Kirkwood:" and
> the "Machine" lines, the former one gives the stepping. This allows to
> know easily if kwboot has a chance to work on the serial port.

Ok, I see there is a use for it. So,

Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

Sebastian

[patch 1/1] ARM: kirkwood: stop printk TCLK value at boot for DT boards

[Andrew Lunn]

On Tue, Nov 05, 2013 at 07:09:14PM +0100, Arnaud Patard wrote:
> Commit 2326f04321a9 (ARM: kirkwood: convert to DT irqchip and clocksource)
> dropped the call to kirkwood_timer_init() when booting with DT.
> This results in kirkwood_tclk not being set and the boot message is now:
> 
> Kirkwood: MV88F6281-A0, TCLK=0
> 
> This patch modifies the message for printing only the kirkwood id,
> as it allows to detect if we're running A0/A1/... variants with a simple
> dmesg.
> 
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>

Acked-by: Andrew Lunn <andrew@lunn.ch>

	  Andrew



> 
> Index: linux-next/arch/arm/mach-kirkwood/board-dt.c
> ===================================================================
> --- linux-next.orig/arch/arm/mach-kirkwood/board-dt.c	2013-11-05 18:36:23.131191305 +0100
> +++ linux-next/arch/arm/mach-kirkwood/board-dt.c	2013-11-05 18:36:35.867190745 +0100
> @@ -140,7 +140,7 @@ eth_fixup_skip:
>  
>  static void __init kirkwood_dt_init(void)
>  {
> -	pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
> +	pr_info("Kirkwood: %s.\n", kirkwood_id());
>  
>  	/*
>  	 * Disable propagation of mbus errors to the CPU local bus,
> 
> 

[patch 1/1] ARM: kirkwood: stop printk TCLK value at boot for DT boards

[Jason Cooper]

On Tue, Nov 05, 2013 at 07:09:14PM +0100, Arnaud Patard wrote:
> Commit 2326f04321a9 (ARM: kirkwood: convert to DT irqchip and clocksource)
> dropped the call to kirkwood_timer_init() when booting with DT.
> This results in kirkwood_tclk not being set and the boot message is now:
> 
> Kirkwood: MV88F6281-A0, TCLK=0
> 
> This patch modifies the message for printing only the kirkwood id,
> as it allows to detect if we're running A0/A1/... variants with a simple
> dmesg.
> 
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> ---
> 
> Index: linux-next/arch/arm/mach-kirkwood/board-dt.c

Applied to mvebu/soc with Sebastian and Andrew's Acks.

thx,

Jason.