[PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[Wu Zhangjin]

From: Wu Zhangjin <wuzhangjin@gmail.com>

Changes from v1 (feedbacks from Ralf):

  o make DEBUG_ZBOOT also depend on DEBUG_KERNEL

  o DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so simplify the
  obj-$(CONFIG_DEBUG_ZBOOT_UART16550) into just obj-$(CONFIG_DEBUG_ZBOOT) and
  no ifdef.

This patch adds a new DEBUG_ZBOOT option to allow the developers to
debug the compressed kernel support for a new board.

Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
---
 arch/mips/Kconfig.debug            |   18 ++++++++++++++++++
 arch/mips/boot/compressed/Makefile |    2 +-
 2 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index d2b88a0..5e556f7 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -102,4 +102,22 @@ config RUNTIME_DEBUG
 	  arch/mips/include/asm/debug.h for debugging macros.
 	  If unsure, say N.
 
+config DEBUG_ZBOOT
+	bool "Enable compressed kernel support debugging"
+	depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT_UART16550
+	help
+	  If you want to add compressed kernel support to a new board, and the
+	  board supports uart16550 compatible serial port, please select
+	  SYS_SUPPORTS_ZBOOT_UART16550 for your board and enable this option to
+	  debug it.
+
+	  If your board doesn't support uart16550 compatible serial port, you
+	  can try to select SYS_SUPPORTS_ZBOOT and use the other methods to
+	  debug it. for example, add a new serial port support just as
+	  arch/mips/boot/compressed/uart-16550.c does.
+
+	  After the compressed kernel support works, please disable this option
+	  to reduce the kernel image size and speed up the booting procedure a
+	  little.
+
 endmenu
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 91a57a6..432b939 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -32,7 +32,7 @@ KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
 
 obj-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o
 
-obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
+obj-$(CONFIG_SYS_SUPPORTS_ZBOOT) += $(obj)/uart-16550.o
 
 OBJCOPYFLAGS_vmlinux.bin := $(OBJCOPYFLAGS) -O binary -R .comment -S
 $(obj)/vmlinux.bin: $(KBUILD_IMAGE)
-- 
1.6.6

[PATCH -queue] MIPS: Simplify the weak annotation with __weak

[Wu Zhangjin]

From: Wu Zhangjin <wuzhangjin@gmail.com>

There was a __weak define as __attribute__((weak)) there, this patch
just use it to simplify the weak annotation.

I found them via the following command:

$ find arch/mips/ -name "*.c" | xargs -i grep -H weak {} | grep -v __weak

Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
---
 arch/mips/boot/compressed/dbg.c |    2 +-
 arch/mips/oprofile/common.c     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/mips/boot/compressed/dbg.c b/arch/mips/boot/compressed/dbg.c
index ff4dc7a..d5c5d9a 100644
--- a/arch/mips/boot/compressed/dbg.c
+++ b/arch/mips/boot/compressed/dbg.c
@@ -9,7 +9,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 
-void __attribute__ ((weak)) putc(char c)
+void __weak putc(char c)
 {
 }
 
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index 7832ad2..ee46c82 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -14,9 +14,9 @@
 
 #include "op_impl.h"
 
-extern struct op_mips_model op_model_mipsxx_ops __attribute__((weak));
-extern struct op_mips_model op_model_rm9000_ops __attribute__((weak));
-extern struct op_mips_model op_model_loongson2_ops __attribute__((weak));
+extern struct op_mips_model op_model_mipsxx_ops __weak;
+extern struct op_mips_model op_model_rm9000_ops __weak;
+extern struct op_mips_model op_model_loongson2_ops __weak;
 
 static struct op_mips_model *model;
 
-- 
1.6.6

Re: [PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[Manuel Lauss]

Hi,

On Tue, Jan 26, 2010 at 4:02 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
> Changes from v1 (feedbacks from Ralf):
>
>  o make DEBUG_ZBOOT also depend on DEBUG_KERNEL
>
>  o DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so simplify the

Not every chip has a standard 16550, unfortunately.  I liked your
first iteration better:
DEBUG_ZBOOT visible at all times (or depend on DEBUG_KERNEL)  another
(invisible)
config symbol selecting the code to build (i.e. SYS_SUPPORTS_ZBOOT_UART16550
for your loongson boxes, MACH_ALCHEMY for alchemy, and nothing for unsupported
chips).


>  obj-$(CONFIG_DEBUG_ZBOOT_UART16550) into just obj-$(CONFIG_DEBUG_ZBOOT) and
>  no ifdef.

The last hunk does something else:

> -obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
> +obj-$(CONFIG_SYS_SUPPORTS_ZBOOT) += $(obj)/uart-16550.o

Manuel

Re: [PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[Manuel Lauss]

Hi,

On Tue, Jan 26, 2010 at 4:02 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
> Changes from v1 (feedbacks from Ralf):
>
>  o make DEBUG_ZBOOT also depend on DEBUG_KERNEL
>
>  o DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so simplify the

Not every chip has a standard 16550, unfortunately.  I liked your
first iteration better:
DEBUG_ZBOOT visible at all times (or depend on DEBUG_KERNEL)  another
(invisible)
config symbol selecting the code to build (i.e. SYS_SUPPORTS_ZBOOT_UART16550
for your loongson boxes, MACH_ALCHEMY for alchemy, and nothing for unsupported
chips).


>  obj-$(CONFIG_DEBUG_ZBOOT_UART16550) into just obj-$(CONFIG_DEBUG_ZBOOT) and
>  no ifdef.

The last hunk does something else:

> -obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
> +obj-$(CONFIG_SYS_SUPPORTS_ZBOOT) += $(obj)/uart-16550.o

Manuel

Re: [PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[Wu Zhangjin]

On Tue, 2010-01-26 at 16:28 +0100, Manuel Lauss wrote:
> Hi,
> 
> On Tue, Jan 26, 2010 at 4:02 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
> > Changes from v1 (feedbacks from Ralf):
> >
> >  o make DEBUG_ZBOOT also depend on DEBUG_KERNEL
> >
> >  o DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so simplify the
> 
> Not every chip has a standard 16550, unfortunately.  I liked your
> first iteration better:
> DEBUG_ZBOOT visible at all times (or depend on DEBUG_KERNEL)  another
> (invisible)
> config symbol selecting the code to build (i.e. SYS_SUPPORTS_ZBOOT_UART16550
> for your loongson boxes, MACH_ALCHEMY for alchemy, and nothing for unsupported
> chips).
> 

Yes, It will be not convenient for a new serial port debugging support
with the current modification, for example, if you add UARTXXXX, we need
to select it for the new board and also add it under the "depends" of
DEBUG_ZBOOT. how about this?

diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 5e556f7..6fccbf0 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -104,7 +104,7 @@ config RUNTIME_DEBUG
 
 config DEBUG_ZBOOT
        bool "Enable compressed kernel support debugging"
-       depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT_UART16550
+       depends on DEBUG_KERNEL

and we keep the old:

ifdef CONFIG_DEBUG_ZBOOT
obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
endif

If a new serial port is needed, we just need to add the following lines
to arch/mips/Kconfig

config SYS_SUPPORTS_ZBOOT_UARTXXX
	bool
	select SYS_SUPPORTS_ZBOOT

config MACH_XXXX
	[...]
	select SYS_SUPPORTS_ZBOOT_UARTXXX
	[...]

and in arch/mips/boot/compressed/Makfefile

ifdef CONFIG_DEBUG_ZBOOT
obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
+obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UARTXXX) += $(obj)/uart-xxx.o
endif

and also a new arch/mips/boot/compressed/uar-xxx.c is needed.

If this is okay, I will send a new revision asap.

Regards,
	Wu Zhangjin

Re: [PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[Wu Zhangjin]

On Tue, 2010-01-26 at 16:28 +0100, Manuel Lauss wrote:
> Hi,
> 
> On Tue, Jan 26, 2010 at 4:02 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
> > Changes from v1 (feedbacks from Ralf):
> >
> >  o make DEBUG_ZBOOT also depend on DEBUG_KERNEL
> >
> >  o DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so simplify the
> 
> Not every chip has a standard 16550, unfortunately.  I liked your
> first iteration better:
> DEBUG_ZBOOT visible at all times (or depend on DEBUG_KERNEL)  another
> (invisible)
> config symbol selecting the code to build (i.e. SYS_SUPPORTS_ZBOOT_UART16550
> for your loongson boxes, MACH_ALCHEMY for alchemy, and nothing for unsupported
> chips).
> 

Yes, It will be not convenient for a new serial port debugging support
with the current modification, for example, if you add UARTXXXX, we need
to select it for the new board and also add it under the "depends" of
DEBUG_ZBOOT. how about this?

diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 5e556f7..6fccbf0 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -104,7 +104,7 @@ config RUNTIME_DEBUG
 
 config DEBUG_ZBOOT
        bool "Enable compressed kernel support debugging"
-       depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT_UART16550
+       depends on DEBUG_KERNEL

and we keep the old:

ifdef CONFIG_DEBUG_ZBOOT
obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
endif

If a new serial port is needed, we just need to add the following lines
to arch/mips/Kconfig

config SYS_SUPPORTS_ZBOOT_UARTXXX
	bool
	select SYS_SUPPORTS_ZBOOT

config MACH_XXXX
	[...]
	select SYS_SUPPORTS_ZBOOT_UARTXXX
	[...]

and in arch/mips/boot/compressed/Makfefile

ifdef CONFIG_DEBUG_ZBOOT
obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
+obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UARTXXX) += $(obj)/uart-xxx.o
endif

and also a new arch/mips/boot/compressed/uar-xxx.c is needed.

If this is okay, I will send a new revision asap.

Regards,
	Wu Zhangjin

Re: [PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[Wu Zhangjin]

On Tue, 2010-01-26 at 23:58 +0800, Wu Zhangjin wrote:
> On Tue, 2010-01-26 at 16:28 +0100, Manuel Lauss wrote:
> > Hi,
> > 
> > On Tue, Jan 26, 2010 at 4:02 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
> > > Changes from v1 (feedbacks from Ralf):
> > >
> > >  o make DEBUG_ZBOOT also depend on DEBUG_KERNEL
> > >
> > >  o DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so simplify the
> > 
> > Not every chip has a standard 16550, unfortunately.  I liked your
> > first iteration better:
> > DEBUG_ZBOOT visible at all times (or depend on DEBUG_KERNEL)  another
> > (invisible)
> > config symbol selecting the code to build (i.e. SYS_SUPPORTS_ZBOOT_UART16550
> > for your loongson boxes, MACH_ALCHEMY for alchemy, and nothing for unsupported
> > chips).
> > 
> 
> Yes, It will be not convenient for a new serial port debugging support
> with the current modification, for example, if you add UARTXXXX, we need
> to select it for the new board and also add it under the "depends" of
> DEBUG_ZBOOT. how about this?
> 
> diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
> index 5e556f7..6fccbf0 100644
> --- a/arch/mips/Kconfig.debug
> +++ b/arch/mips/Kconfig.debug
> @@ -104,7 +104,7 @@ config RUNTIME_DEBUG
>  
>  config DEBUG_ZBOOT
>         bool "Enable compressed kernel support debugging"
> -       depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT_UART16550
> +       depends on DEBUG_KERNEL
> 

oh, no, this dependency is also needed: SYS_SUPPORTS_ZBOOT, so, it
should be:

depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT

> and we keep the old:
> 
> ifdef CONFIG_DEBUG_ZBOOT
> obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
> endif
> 
> If a new serial port is needed, we just need to add the following lines
> to arch/mips/Kconfig
> 
> config SYS_SUPPORTS_ZBOOT_UARTXXX
> 	bool
> 	select SYS_SUPPORTS_ZBOOT
> 
> config MACH_XXXX
> 	[...]
> 	select SYS_SUPPORTS_ZBOOT_UARTXXX
> 	[...]
> 
> and in arch/mips/boot/compressed/Makfefile
> 
> ifdef CONFIG_DEBUG_ZBOOT
> obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
> +obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UARTXXX) += $(obj)/uart-xxx.o
> endif
> 
> and also a new arch/mips/boot/compressed/uar-xxx.c is needed.
> 
> If this is okay, I will send a new revision asap.
> 
> Regards,
> 	Wu Zhangjin

Re: [PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[Wu Zhangjin]

On Tue, 2010-01-26 at 23:58 +0800, Wu Zhangjin wrote:
> On Tue, 2010-01-26 at 16:28 +0100, Manuel Lauss wrote:
> > Hi,
> > 
> > On Tue, Jan 26, 2010 at 4:02 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
> > > Changes from v1 (feedbacks from Ralf):
> > >
> > >  o make DEBUG_ZBOOT also depend on DEBUG_KERNEL
> > >
> > >  o DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so simplify the
> > 
> > Not every chip has a standard 16550, unfortunately.  I liked your
> > first iteration better:
> > DEBUG_ZBOOT visible at all times (or depend on DEBUG_KERNEL)  another
> > (invisible)
> > config symbol selecting the code to build (i.e. SYS_SUPPORTS_ZBOOT_UART16550
> > for your loongson boxes, MACH_ALCHEMY for alchemy, and nothing for unsupported
> > chips).
> > 
> 
> Yes, It will be not convenient for a new serial port debugging support
> with the current modification, for example, if you add UARTXXXX, we need
> to select it for the new board and also add it under the "depends" of
> DEBUG_ZBOOT. how about this?
> 
> diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
> index 5e556f7..6fccbf0 100644
> --- a/arch/mips/Kconfig.debug
> +++ b/arch/mips/Kconfig.debug
> @@ -104,7 +104,7 @@ config RUNTIME_DEBUG
>  
>  config DEBUG_ZBOOT
>         bool "Enable compressed kernel support debugging"
> -       depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT_UART16550
> +       depends on DEBUG_KERNEL
> 

oh, no, this dependency is also needed: SYS_SUPPORTS_ZBOOT, so, it
should be:

depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT

> and we keep the old:
> 
> ifdef CONFIG_DEBUG_ZBOOT
> obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
> endif
> 
> If a new serial port is needed, we just need to add the following lines
> to arch/mips/Kconfig
> 
> config SYS_SUPPORTS_ZBOOT_UARTXXX
> 	bool
> 	select SYS_SUPPORTS_ZBOOT
> 
> config MACH_XXXX
> 	[...]
> 	select SYS_SUPPORTS_ZBOOT_UARTXXX
> 	[...]
> 
> and in arch/mips/boot/compressed/Makfefile
> 
> ifdef CONFIG_DEBUG_ZBOOT
> obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o
> +obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UARTXXX) += $(obj)/uart-xxx.o
> endif
> 
> and also a new arch/mips/boot/compressed/uar-xxx.c is needed.
> 
> If this is okay, I will send a new revision asap.
> 
> Regards,
> 	Wu Zhangjin

Re: [PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[Manuel Lauss]

On Tue, Jan 26, 2010 at 4:58 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
> On Tue, 2010-01-26 at 16:28 +0100, Manuel Lauss wrote:
>> Hi,
>>
>> On Tue, Jan 26, 2010 at 4:02 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
>> > Changes from v1 (feedbacks from Ralf):
>> >
>> >  o make DEBUG_ZBOOT also depend on DEBUG_KERNEL
>> >
>> >  o DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so simplify the
>>
>> Not every chip has a standard 16550, unfortunately.  I liked your
>> first iteration better:
>> DEBUG_ZBOOT visible at all times (or depend on DEBUG_KERNEL)  another
>> (invisible)
>> config symbol selecting the code to build (i.e. SYS_SUPPORTS_ZBOOT_UART16550
>> for your loongson boxes, MACH_ALCHEMY for alchemy, and nothing for unsupported
>> chips).
>>
>
> Yes, It will be not convenient for a new serial port debugging support
> with the current modification, for example, if you add UARTXXXX, we need
> to select it for the new board and also add it under the "depends" of
> DEBUG_ZBOOT. how about this?

[...]

Fine with me.  I'll resend an updated Alchemy zboot debug patch once
this has been applied.

Thank you!
     Manuel Lauss

Re: [PATCH -queue v2] MIPS: Cleanup the debugging of compressed kernel support

[Manuel Lauss]

On Tue, Jan 26, 2010 at 4:58 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
> On Tue, 2010-01-26 at 16:28 +0100, Manuel Lauss wrote:
>> Hi,
>>
>> On Tue, Jan 26, 2010 at 4:02 PM, Wu Zhangjin <wuzhangjin@gmail.com> wrote:
>> > Changes from v1 (feedbacks from Ralf):
>> >
>> >  o make DEBUG_ZBOOT also depend on DEBUG_KERNEL
>> >
>> >  o DEBUG_ZBOOT already depends on SYS_SUPPORTS_ZBOOT_UART16550 so simplify the
>>
>> Not every chip has a standard 16550, unfortunately.  I liked your
>> first iteration better:
>> DEBUG_ZBOOT visible at all times (or depend on DEBUG_KERNEL)  another
>> (invisible)
>> config symbol selecting the code to build (i.e. SYS_SUPPORTS_ZBOOT_UART16550
>> for your loongson boxes, MACH_ALCHEMY for alchemy, and nothing for unsupported
>> chips).
>>
>
> Yes, It will be not convenient for a new serial port debugging support
> with the current modification, for example, if you add UARTXXXX, we need
> to select it for the new board and also add it under the "depends" of
> DEBUG_ZBOOT. how about this?

[...]

Fine with me.  I'll resend an updated Alchemy zboot debug patch once
this has been applied.

Thank you!
     Manuel Lauss

Re: [PATCH -queue] MIPS: Simplify the weak annotation with __weak

[Ralf Baechle]

On Tue, Jan 26, 2010 at 11:02:34PM +0800, Wu Zhangjin wrote:

> There was a __weak define as __attribute__((weak)) there, this patch
> just use it to simplify the weak annotation.

Nice cleanup; I've made it bulletproof by including <linux/compiler.h>
which defines __weak.

Queued for 2.6.34.

  Ralf