Patchwork MTD: bcm63xxpart: handle Broadcom partition order

login
register
mail settings
Submitter Jonas Gorski
Date April 19, 2012, 11:15 a.m.
Message ID <1334834157-16860-1-git-send-email-jonas.gorski@gmail.com>
Download mbox | patch
Permalink /patch/153723/
State Accepted
Commit 5329d67cc32c0306426dc4bc4b5e66a36cb87ce0
Headers show

Comments

Jonas Gorski - April 19, 2012, 11:15 a.m.
The original Broadcom partition order has the root fs in front of the
kernel, which resulted in miscalculated partition sizes.
Detect when such an image is on the flash and also reorder the partitions
accordingly.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---

This patch is made on top of l2-mtd.

 drivers/mtd/bcm63xxpart.c |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)
Florian Fainelli - April 19, 2012, 8:44 p.m.
On Thursday 19 April 2012 13:15:57 Jonas Gorski wrote:
> The original Broadcom partition order has the root fs in front of the
> kernel, which resulted in miscalculated partition sizes.
> Detect when such an image is on the flash and also reorder the partitions
> accordingly.
> 
> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

Acked-by: Florian Fainelli <florian@openwrt.org>

> ---
> 
> This patch is made on top of l2-mtd.
> 
>  drivers/mtd/bcm63xxpart.c |   41 ++++++++++++++++++++++++++++++-----------
>  1 files changed, 30 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c
> index 608321e..63d2a64 100644
> --- a/drivers/mtd/bcm63xxpart.c
> +++ b/drivers/mtd/bcm63xxpart.c
> @@ -4,7 +4,7 @@
>   * Copyright © 2006-2008  Florian Fainelli <florian@openwrt.org>
>   *			  Mike Albon <malbon@openwrt.org>
>   * Copyright © 2009-2010  Daniel Dickinson <openwrt@cshore.neomailbox.net>
> - * Copyright © 2011 Jonas Gorski <jonas.gorski@gmail.com>
> + * Copyright © 2011-2012  Jonas Gorski <jonas.gorski@gmail.com>
>   *
>   * This program is free software; you can redistribute it and/or modify
>   * it under the terms of the GNU General Public License as published by
> @@ -82,6 +82,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info
> *master, int namelen = 0;
>  	int i;
>  	u32 computed_crc;
> +	bool rootfs_first = false;
> 
>  	if (bcm63xx_detect_cfe(master))
>  		return -EINVAL;
> @@ -109,6 +110,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info
> *master, char *boardid = &(buf->board_id[0]);
>  		char *tagversion = &(buf->tag_version[0]);
> 
> +		sscanf(buf->flash_image_start, "%u", &rootfsaddr);
>  		sscanf(buf->kernel_address, "%u", &kerneladdr);
>  		sscanf(buf->kernel_length, "%u", &kernellen);
>  		sscanf(buf->total_length, "%u", &totallen);
> @@ -117,10 +119,19 @@ static int bcm63xx_parse_cfe_partitions(struct
> mtd_info *master, tagversion, boardid);
> 
>  		kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
> -		rootfsaddr = kerneladdr + kernellen;
> +		rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE;
>  		spareaddr = roundup(totallen, master->erasesize) + cfelen;
>  		sparelen = master->size - spareaddr - nvramlen;
> -		rootfslen = spareaddr - rootfsaddr;
> +
> +		if (rootfsaddr < kerneladdr) {
> +			/* default Broadcom layout */
> +			rootfslen = kerneladdr - rootfsaddr;
> +			rootfs_first = true;
> +		} else {
> +			/* OpenWrt layout */
> +			rootfsaddr = kerneladdr + kernellen;
> +			rootfslen = spareaddr - rootfsaddr;
> +		}
>  	} else {
>  		pr_warn("CFE boot tag CRC invalid (expected %08x, actual %08x)\n",
>  			buf->header_crc, computed_crc);
> @@ -156,18 +167,26 @@ static int bcm63xx_parse_cfe_partitions(struct
> mtd_info *master, curpart++;
> 
>  	if (kernellen > 0) {
> -		parts[curpart].name = "kernel";
> -		parts[curpart].offset = kerneladdr;
> -		parts[curpart].size = kernellen;
> +		int kernelpart = curpart;
> +
> +		if (rootfslen > 0 && rootfs_first)
> +			kernelpart++;
> +		parts[kernelpart].name = "kernel";
> +		parts[kernelpart].offset = kerneladdr;
> +		parts[kernelpart].size = kernellen;
>  		curpart++;
>  	}
> 
>  	if (rootfslen > 0) {
> -		parts[curpart].name = "rootfs";
> -		parts[curpart].offset = rootfsaddr;
> -		parts[curpart].size = rootfslen;
> -		if (sparelen > 0)
> -			parts[curpart].size += sparelen;
> +		int rootfspart = curpart;
> +
> +		if (kernellen > 0 && rootfs_first)
> +			rootfspart--;
> +		parts[rootfspart].name = "rootfs";
> +		parts[rootfspart].offset = rootfsaddr;
> +		parts[rootfspart].size = rootfslen;
> +		if (sparelen > 0  && !rootfs_first)
> +			parts[rootfspart].size += sparelen;
>  		curpart++;
>  	}
Artem Bityutskiy - April 27, 2012, 12:56 p.m.
On Thu, 2012-04-19 at 13:15 +0200, Jonas Gorski wrote:
> The original Broadcom partition order has the root fs in front of the
> kernel, which resulted in miscalculated partition sizes.
> Detect when such an image is on the flash and also reorder the partitions
> accordingly.
> 
> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

Unrilated, but would someone from bcm community take a look at this
compilation problem:

In file included from /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/gpio.h:4:0,
                 from /home/dedekind/git/l2-mtd/arch/mips/include/asm/gpio.h:4,
                 from include/linux/gpio.h:36,
                 from drivers/mtd/maps/gpio-addr-flash.c:16:
/home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h: In function 'bcm63xx_gpio_count':
/home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:10:2: error: implicit declaration of function 'bcm63xx_get_cpu_id' [-Werror=implicit-function-declaration]
/home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:11:7: error: 'BCM6358_CPU_ID' undeclared (first use in this function)
/home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:11:7: note: each undeclared identifier is reported only once for each function it appears in
/home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:13:7: error: 'BCM6338_CPU_ID' undeclared (first use in this function)
/home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:15:7: error: 'BCM6345_CPU_ID' undeclared (first use in this function)
/home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:17:7: error: 'BCM6368_CPU_ID' undeclared (first use in this function)
/home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:19:7: error: 'BCM6348_CPU_ID' undeclared (first use in this function)
Jonas Gorski - April 27, 2012, 1:07 p.m.
On 27 April 2012 14:56, Artem Bityutskiy <dedekind1@gmail.com> wrote:
> On Thu, 2012-04-19 at 13:15 +0200, Jonas Gorski wrote:
>> The original Broadcom partition order has the root fs in front of the
>> kernel, which resulted in miscalculated partition sizes.
>> Detect when such an image is on the flash and also reorder the partitions
>> accordingly.
>>
>> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
>
> Unrilated, but would someone from bcm community take a look at this
> compilation problem:
>
> In file included from /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/gpio.h:4:0,
>                 from /home/dedekind/git/l2-mtd/arch/mips/include/asm/gpio.h:4,
>                 from include/linux/gpio.h:36,
>                 from drivers/mtd/maps/gpio-addr-flash.c:16:
> /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h: In function 'bcm63xx_gpio_count':
> /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:10:2: error: implicit declaration of function 'bcm63xx_get_cpu_id' [-Werror=implicit-function-declaration]
> /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:11:7: error: 'BCM6358_CPU_ID' undeclared (first use in this function)
> /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:11:7: note: each undeclared identifier is reported only once for each function it appears in
> /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:13:7: error: 'BCM6338_CPU_ID' undeclared (first use in this function)
> /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:15:7: error: 'BCM6345_CPU_ID' undeclared (first use in this function)
> /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:17:7: error: 'BCM6368_CPU_ID' undeclared (first use in this function)
> /home/dedekind/git/l2-mtd/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h:19:7: error: 'BCM6348_CPU_ID' undeclared (first use in this function)

There's already a patch for that waiting to be applied:

http://patchwork.linux-mips.org/patch/3351/

Regards
Jonas
Artem Bityutskiy - April 27, 2012, 1:37 p.m.
On Thu, 2012-04-19 at 13:15 +0200, Jonas Gorski wrote:
> The original Broadcom partition order has the root fs in front of the
> kernel, which resulted in miscalculated partition sizes.
> Detect when such an image is on the flash and also reorder the partitions
> accordingly.
> 
> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

Pushed to l2-mtd.git, thanks!

Patch

diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c
index 608321e..63d2a64 100644
--- a/drivers/mtd/bcm63xxpart.c
+++ b/drivers/mtd/bcm63xxpart.c
@@ -4,7 +4,7 @@ 
  * Copyright © 2006-2008  Florian Fainelli <florian@openwrt.org>
  *			  Mike Albon <malbon@openwrt.org>
  * Copyright © 2009-2010  Daniel Dickinson <openwrt@cshore.neomailbox.net>
- * Copyright © 2011 Jonas Gorski <jonas.gorski@gmail.com>
+ * Copyright © 2011-2012  Jonas Gorski <jonas.gorski@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -82,6 +82,7 @@  static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
 	int namelen = 0;
 	int i;
 	u32 computed_crc;
+	bool rootfs_first = false;
 
 	if (bcm63xx_detect_cfe(master))
 		return -EINVAL;
@@ -109,6 +110,7 @@  static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
 		char *boardid = &(buf->board_id[0]);
 		char *tagversion = &(buf->tag_version[0]);
 
+		sscanf(buf->flash_image_start, "%u", &rootfsaddr);
 		sscanf(buf->kernel_address, "%u", &kerneladdr);
 		sscanf(buf->kernel_length, "%u", &kernellen);
 		sscanf(buf->total_length, "%u", &totallen);
@@ -117,10 +119,19 @@  static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
 			tagversion, boardid);
 
 		kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
-		rootfsaddr = kerneladdr + kernellen;
+		rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE;
 		spareaddr = roundup(totallen, master->erasesize) + cfelen;
 		sparelen = master->size - spareaddr - nvramlen;
-		rootfslen = spareaddr - rootfsaddr;
+
+		if (rootfsaddr < kerneladdr) {
+			/* default Broadcom layout */
+			rootfslen = kerneladdr - rootfsaddr;
+			rootfs_first = true;
+		} else {
+			/* OpenWrt layout */
+			rootfsaddr = kerneladdr + kernellen;
+			rootfslen = spareaddr - rootfsaddr;
+		}
 	} else {
 		pr_warn("CFE boot tag CRC invalid (expected %08x, actual %08x)\n",
 			buf->header_crc, computed_crc);
@@ -156,18 +167,26 @@  static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
 	curpart++;
 
 	if (kernellen > 0) {
-		parts[curpart].name = "kernel";
-		parts[curpart].offset = kerneladdr;
-		parts[curpart].size = kernellen;
+		int kernelpart = curpart;
+
+		if (rootfslen > 0 && rootfs_first)
+			kernelpart++;
+		parts[kernelpart].name = "kernel";
+		parts[kernelpart].offset = kerneladdr;
+		parts[kernelpart].size = kernellen;
 		curpart++;
 	}
 
 	if (rootfslen > 0) {
-		parts[curpart].name = "rootfs";
-		parts[curpart].offset = rootfsaddr;
-		parts[curpart].size = rootfslen;
-		if (sparelen > 0)
-			parts[curpart].size += sparelen;
+		int rootfspart = curpart;
+
+		if (kernellen > 0 && rootfs_first)
+			rootfspart--;
+		parts[rootfspart].name = "rootfs";
+		parts[rootfspart].offset = rootfsaddr;
+		parts[rootfspart].size = rootfslen;
+		if (sparelen > 0  && !rootfs_first)
+			parts[rootfspart].size += sparelen;
 		curpart++;
 	}