[PATCH 1/3] ARM: Add "verbose" parameter for start_linux procedure

[PATCH 1/3] ARM: Add "verbose" parameter for start_linux procedure

[Alexander Shiyan]

This patch will make a normal booting more silent.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/include/asm/armlinux.h |  2 +-
 arch/arm/lib/armlinux.c         | 16 +++++++++-------
 arch/arm/lib/bootm.c            |  3 ++-
 arch/arm/lib/bootu.c            |  2 +-
 arch/arm/lib/bootz.c            |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/arch/arm/include/asm/armlinux.h b/arch/arm/include/asm/armlinux.h
index 07479fb..15cae14 100644
--- a/arch/arm/include/asm/armlinux.h
+++ b/arch/arm/include/asm/armlinux.h
@@ -38,6 +38,6 @@ static inline void armlinux_set_atag_appender(struct tag *(*func)(struct tag *))
 struct image_data;
 
 void start_linux(void *adr, int swap, unsigned long initrd_address,
-		unsigned long initrd_size, void *oftree);
+		unsigned long initrd_size, void *oftree, int verbose);
 
 #endif /* __ARCH_ARMLINUX_H */
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index 40a63ea..84372af 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -227,8 +227,8 @@ static void setup_end_tag (void)
 	params->hdr.size = 0;
 }
 
-static void setup_tags(unsigned long initrd_address,
-		unsigned long initrd_size, int swap)
+static void setup_tags(unsigned long initrd_address, unsigned long initrd_size,
+		       int swap, int verbose)
 {
 	const char *commandline = linux_bootargs_get();
 
@@ -247,8 +247,9 @@ static void setup_tags(unsigned long initrd_address,
 #endif
 	setup_end_tag();
 
-	printf("commandline: %s\n"
-	       "arch_number: %d\n", commandline, armlinux_get_architecture());
+	if (verbose)
+		printf("commandline: %s\narch_number: %d\n",
+		       commandline, armlinux_get_architecture());
 
 }
 
@@ -258,17 +259,18 @@ void armlinux_set_bootparams(void *params)
 }
 
 void start_linux(void *adr, int swap, unsigned long initrd_address,
-		unsigned long initrd_size, void *oftree)
+		unsigned long initrd_size, void *oftree, int verbose)
 {
 	void (*kernel)(int zero, int arch, void *params) = adr;
 	void *params = NULL;
 	int architecture;
 
 	if (oftree) {
-		printf("booting Linux kernel with devicetree\n");
+		if (verbose)
+			printf("booting Linux kernel with devicetree\n");
 		params = oftree;
 	} else {
-		setup_tags(initrd_address, initrd_size, swap);
+		setup_tags(initrd_address, initrd_size, swap, verbose);
 		params = armlinux_bootparams;
 	}
 	architecture = armlinux_get_architecture();
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 0786e22..c5ac0d8 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -106,7 +106,8 @@ static int __do_bootm_linux(struct image_data *data, int swap)
 		printf("...\n");
 	}
 
-	start_linux((void *)kernel, swap, initrd_start, initrd_size, data->oftree);
+	start_linux((void *)kernel, swap, initrd_start, initrd_size,
+		    data->oftree, bootm_verbose(data));
 
 	reset_cpu(0);
 
diff --git a/arch/arm/lib/bootu.c b/arch/arm/lib/bootu.c
index fdb0362..c394f5e 100644
--- a/arch/arm/lib/bootu.c
+++ b/arch/arm/lib/bootu.c
@@ -26,7 +26,7 @@ static int do_bootu(int argc, char *argv[])
 	oftree = of_get_fixed_tree(NULL);
 #endif
 
-	start_linux(kernel, 0, 0, 0, oftree);
+	start_linux(kernel, 0, 0, 0, oftree, 1);
 
 	return 1;
 }
diff --git a/arch/arm/lib/bootz.c b/arch/arm/lib/bootz.c
index e32a77b..b402fce 100644
--- a/arch/arm/lib/bootz.c
+++ b/arch/arm/lib/bootz.c
@@ -112,7 +112,7 @@ static int do_bootz(int argc, char *argv[])
 	oftree = of_get_fixed_tree(NULL);
 #endif
 
-	start_linux(zimage, swap, 0, 0, oftree);
+	start_linux(zimage, swap, 0, 0, oftree, 1);
 
 	return 0;
 
-- 
1.8.1.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] ARM: Use armlinux_bootparams address for DTB

[Alexander Shiyan]

In some cases, the address of the devicetree, which is obtained
dynamically, may be located in the kernel text area, which leads
to overwrite devicetree by kernel. The patch uses the address for
devicetree, provided by board, if it possible.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/lib/armlinux.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index 84372af..4aa3414 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -262,17 +262,23 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
 		unsigned long initrd_size, void *oftree, int verbose)
 {
 	void (*kernel)(int zero, int arch, void *params) = adr;
-	void *params = NULL;
 	int architecture;
 
 	if (oftree) {
+		if (armlinux_bootparams) {
+			struct fdt_header *header = oftree;
+
+			memcpy(armlinux_bootparams, oftree,
+			       fdt32_to_cpu(header->totalsize));
+		} else
+			armlinux_bootparams = oftree;
+
 		if (verbose)
-			printf("booting Linux kernel with devicetree\n");
-		params = oftree;
-	} else {
+			printf("booting Linux kernel with devicetree at 0x%p\n",
+			       armlinux_bootparams);
+	} else
 		setup_tags(initrd_address, initrd_size, swap, verbose);
-		params = armlinux_bootparams;
-	}
+
 	architecture = armlinux_get_architecture();
 
 	shutdown_barebox();
@@ -290,10 +296,10 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
 		"mov r2, %1\n"
 		"bx %2\n"
 		:
-		: "r" (architecture), "r" (params), "r" (kernel)
+		: "r" (architecture), "r" (armlinux_bootparams), "r" (kernel)
 		: "r0", "r1", "r2"
 	);
 #else
-	kernel(0, architecture, params);
+	kernel(0, architecture, armlinux_bootparams);
 #endif
 }
-- 
1.8.1.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] mfd: syscon: Replace dev_info with dev_dbg for print used region

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 drivers/mfd/syscon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index b628ab7..52cb433 100644
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -65,7 +65,7 @@ static int syscon_probe(struct device_d *dev)
 	syscon->base = (void __iomem *)res->start;
 	dev->priv = syscon;
 
-	dev_info(dev, "map 0x%x-0x%x registered\n", res->start, res->end);
+	dev_dbg(dev, "map 0x%x-0x%x registered\n", res->start, res->end);
 
 	return 0;
 }
-- 
1.8.1.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/3] ARM: Add "verbose" parameter for start_linux procedure

[Michael Olbrich]

On Wed, Jul 10, 2013 at 11:00:39AM +0400, Alexander Shiyan wrote:
> This patch will make a normal booting more silent.

Why? Booting the kernel is the most important task for barebox. Why
shouldn't we see a few lines about what is actually happening here by
default.

If you really want no output then introduce a 'quiet' option.

Michael

> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  arch/arm/include/asm/armlinux.h |  2 +-
>  arch/arm/lib/armlinux.c         | 16 +++++++++-------
>  arch/arm/lib/bootm.c            |  3 ++-
>  arch/arm/lib/bootu.c            |  2 +-
>  arch/arm/lib/bootz.c            |  2 +-
>  5 files changed, 14 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm/include/asm/armlinux.h b/arch/arm/include/asm/armlinux.h
> index 07479fb..15cae14 100644
> --- a/arch/arm/include/asm/armlinux.h
> +++ b/arch/arm/include/asm/armlinux.h
> @@ -38,6 +38,6 @@ static inline void armlinux_set_atag_appender(struct tag *(*func)(struct tag *))
>  struct image_data;
>  
>  void start_linux(void *adr, int swap, unsigned long initrd_address,
> -		unsigned long initrd_size, void *oftree);
> +		unsigned long initrd_size, void *oftree, int verbose);
>  
>  #endif /* __ARCH_ARMLINUX_H */
> diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
> index 40a63ea..84372af 100644
> --- a/arch/arm/lib/armlinux.c
> +++ b/arch/arm/lib/armlinux.c
> @@ -227,8 +227,8 @@ static void setup_end_tag (void)
>  	params->hdr.size = 0;
>  }
>  
> -static void setup_tags(unsigned long initrd_address,
> -		unsigned long initrd_size, int swap)
> +static void setup_tags(unsigned long initrd_address, unsigned long initrd_size,
> +		       int swap, int verbose)
>  {
>  	const char *commandline = linux_bootargs_get();
>  
> @@ -247,8 +247,9 @@ static void setup_tags(unsigned long initrd_address,
>  #endif
>  	setup_end_tag();
>  
> -	printf("commandline: %s\n"
> -	       "arch_number: %d\n", commandline, armlinux_get_architecture());
> +	if (verbose)
> +		printf("commandline: %s\narch_number: %d\n",
> +		       commandline, armlinux_get_architecture());
>  
>  }
>  
> @@ -258,17 +259,18 @@ void armlinux_set_bootparams(void *params)
>  }
>  
>  void start_linux(void *adr, int swap, unsigned long initrd_address,
> -		unsigned long initrd_size, void *oftree)
> +		unsigned long initrd_size, void *oftree, int verbose)
>  {
>  	void (*kernel)(int zero, int arch, void *params) = adr;
>  	void *params = NULL;
>  	int architecture;
>  
>  	if (oftree) {
> -		printf("booting Linux kernel with devicetree\n");
> +		if (verbose)
> +			printf("booting Linux kernel with devicetree\n");
>  		params = oftree;
>  	} else {
> -		setup_tags(initrd_address, initrd_size, swap);
> +		setup_tags(initrd_address, initrd_size, swap, verbose);
>  		params = armlinux_bootparams;
>  	}
>  	architecture = armlinux_get_architecture();
> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
> index 0786e22..c5ac0d8 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -106,7 +106,8 @@ static int __do_bootm_linux(struct image_data *data, int swap)
>  		printf("...\n");
>  	}
>  
> -	start_linux((void *)kernel, swap, initrd_start, initrd_size, data->oftree);
> +	start_linux((void *)kernel, swap, initrd_start, initrd_size,
> +		    data->oftree, bootm_verbose(data));
>  
>  	reset_cpu(0);
>  
> diff --git a/arch/arm/lib/bootu.c b/arch/arm/lib/bootu.c
> index fdb0362..c394f5e 100644
> --- a/arch/arm/lib/bootu.c
> +++ b/arch/arm/lib/bootu.c
> @@ -26,7 +26,7 @@ static int do_bootu(int argc, char *argv[])
>  	oftree = of_get_fixed_tree(NULL);
>  #endif
>  
> -	start_linux(kernel, 0, 0, 0, oftree);
> +	start_linux(kernel, 0, 0, 0, oftree, 1);
>  
>  	return 1;
>  }
> diff --git a/arch/arm/lib/bootz.c b/arch/arm/lib/bootz.c
> index e32a77b..b402fce 100644
> --- a/arch/arm/lib/bootz.c
> +++ b/arch/arm/lib/bootz.c
> @@ -112,7 +112,7 @@ static int do_bootz(int argc, char *argv[])
>  	oftree = of_get_fixed_tree(NULL);
>  #endif
>  
> -	start_linux(zimage, swap, 0, 0, oftree);
> +	start_linux(zimage, swap, 0, 0, oftree, 1);
>  
>  	return 0;
>  
> -- 
> 1.8.1.5
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/3] ARM: Add "verbose" parameter for start_linux procedure

[Sascha Hauer]

On Wed, Jul 10, 2013 at 02:52:36PM +0200, Michael Olbrich wrote:
> On Wed, Jul 10, 2013 at 11:00:39AM +0400, Alexander Shiyan wrote:
> > This patch will make a normal booting more silent.
> 
> Why? Booting the kernel is the most important task for barebox. Why
> shouldn't we see a few lines about what is actually happening here by
> default.
> 
> If you really want no output then introduce a 'quiet' option.

I think we really need different verbosity levels. standard would be

- print commandline
- print which kernel image is started
- print which devicetree (if any) is used

There's more I'd like to output optionally, but it's also interesting to
output less in some cases.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/3] ARM: Add "verbose" parameter for start_linux procedure

[Alexander Shiyan]

> On Wed, Jul 10, 2013 at 02:52:36PM +0200, Michael Olbrich wrote:
> > On Wed, Jul 10, 2013 at 11:00:39AM +0400, Alexander Shiyan wrote:
> > > This patch will make a normal booting more silent.
> > 
> > Why? Booting the kernel is the most important task for barebox. Why
> > shouldn't we see a few lines about what is actually happening here by
> > default.
> > 
> > If you really want no output then introduce a 'quiet' option.
> 
> I think we really need different verbosity levels. standard would be
> 
> - print commandline
> - print which kernel image is started
> - print which devicetree (if any) is used
> 
> There's more I'd like to output optionally, but it's also interesting to
> output less in some cases.

How many people have so many opinions.
What we do with patch then?

---
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/3] ARM: Add "verbose" parameter for start_linux procedure

[Sascha Hauer]

On Wed, Jul 10, 2013 at 07:13:15PM +0400, Alexander Shiyan wrote:
> > On Wed, Jul 10, 2013 at 02:52:36PM +0200, Michael Olbrich wrote:
> > > On Wed, Jul 10, 2013 at 11:00:39AM +0400, Alexander Shiyan wrote:
> > > > This patch will make a normal booting more silent.
> > > 
> > > Why? Booting the kernel is the most important task for barebox. Why
> > > shouldn't we see a few lines about what is actually happening here by
> > > default.
> > > 
> > > If you really want no output then introduce a 'quiet' option.
> > 
> > I think we really need different verbosity levels. standard would be
> > 
> > - print commandline
> > - print which kernel image is started
> > - print which devicetree (if any) is used
> > 
> > There's more I'd like to output optionally, but it's also interesting to
> > output less in some cases.
> 
> How many people have so many opinions.
> What we do with patch then?

For now I applied the following. This doesn't change anything in the
verbosity but should solve your actual problem.

The verbosity stuff needs a bit more thinking. Michael wants to be more
verbose by standard, because he is the one who has to guess what's going
wrong at our customers. I want to be more quiet optionally because less
console output means less boot time.

We could convert the meaning of the verbosity parameter could be one
of KERN_* with the standard to KERN_INFO. Then we could implement
everytging from quiet to chatty.

Sascha

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

From 0e93a686675e89aa95bbfb68e1b7a2cc59c09aeb Mon Sep 17 00:00:00 2001
From: Alexander Shiyan <shc_work@mail.ru>
Date: Wed, 10 Jul 2013 11:00:40 +0400
Subject: [PATCH] ARM: Use armlinux_bootparams address for DTB

In some cases, the address of the devicetree, which is obtained
dynamically, may be located in the kernel text area, which leads
to overwrite devicetree by kernel. The patch uses the address for
devicetree, provided by board, if it possible.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/lib/armlinux.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index 40a63ea..9176482 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -265,12 +265,21 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
 	int architecture;
 
 	if (oftree) {
-		printf("booting Linux kernel with devicetree\n");
-		params = oftree;
+		if (armlinux_bootparams) {
+			struct fdt_header *header = oftree;
+
+			memcpy(armlinux_bootparams, oftree,
+					fdt32_to_cpu(header->totalsize));
+		} else {
+			armlinux_bootparams = oftree;
+		}
+
+		printf("booting Linux kernel with devicetree at 0x%p\n",
+				armlinux_bootparams);
 	} else {
-		setup_tags(initrd_address, initrd_size, swap);
-		params = armlinux_bootparams;
+		setup_tags(initrd_address, initrd_size, swap, verbose);
 	}
+
 	architecture = armlinux_get_architecture();
 
 	shutdown_barebox();
@@ -288,10 +297,10 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
 		"mov r2, %1\n"
 		"bx %2\n"
 		:
-		: "r" (architecture), "r" (params), "r" (kernel)
+		: "r" (architecture), "r" (armlinux_bootparams), "r" (kernel)
 		: "r0", "r1", "r2"
 	);
 #else
-	kernel(0, architecture, params);
+	kernel(0, architecture, armlinux_bootparams);
 #endif
 }
-- 
1.8.3.2

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/3] ARM: Add "verbose" parameter for start_linux procedure

[Alexander Shiyan]

> On Wed, Jul 10, 2013 at 07:13:15PM +0400, Alexander Shiyan wrote:
> > > On Wed, Jul 10, 2013 at 02:52:36PM +0200, Michael Olbrich wrote:
> > > > On Wed, Jul 10, 2013 at 11:00:39AM +0400, Alexander Shiyan wrote:
> > > > > This patch will make a normal booting more silent.
> > > > 
> > > > Why? Booting the kernel is the most important task for barebox. Why
> > > > shouldn't we see a few lines about what is actually happening here by
> > > > default.
> > > > 
> > > > If you really want no output then introduce a 'quiet' option.
> > > 
> > > I think we really need different verbosity levels. standard would be
> > > 
> > > - print commandline
> > > - print which kernel image is started
> > > - print which devicetree (if any) is used
> > > 
> > > There's more I'd like to output optionally, but it's also interesting to
> > > output less in some cases.
> > 
> > How many people have so many opinions.
> > What we do with patch then?
> 
> For now I applied the following. This doesn't change anything in the
> verbosity but should solve your actual problem.
> 
> The verbosity stuff needs a bit more thinking. Michael wants to be more
> verbose by standard, because he is the one who has to guess what's going
> wrong at our customers. I want to be more quiet optionally because less
> console output means less boot time.
> 
> We could convert the meaning of the verbosity parameter could be one
> of KERN_* with the standard to KERN_INFO. Then we could implement
> everytging from quiet to chatty.

OK, thanks.
To be more detailed about problem, in my case devicetree is formed at
address 0xc0400000, and decompressed kernel placed at address 0xc0028000,
which erases devicetree.
(kernel .text : 0xc0028000 - 0xc0430cc4   (4132 kB))

---
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox