Skip to contentSkip to conversation

mtd: bcm47xxpart: detect Squashfs partition

PATCH Superseded Rafał Miłecki 3 participants 9 messages Sep 13, 2013 – Sep 16, 2013 Memory technology devices (MTD)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd: bcm47xxpart: detect Squashfs partition

---
 drivers/mtd/bcm47xxpart.c |    8 ++++++++
 1 file changed, 8 insertions(+)
drivers/mtd/bcm47xxpart.c +8 -0
index 9279a91..96f821a 100644
@@ -32,6 +32,7 @@
 #define ML_MAGIC1			0x39685a42
 #define ML_MAGIC2			0x26594131
 #define TRX_MAGIC			0x30524448
+#define SQSH_MAGIC			0x71736873	/* shsq */
 
 struct trx_header {
 	uint32_t magic;
@@ -167,6 +168,13 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 			offset = rounddown(offset + trx->length, blocksize);
 			continue;
 		}
+
+		/* Squashfs */
+		if (buf[0x000 / 4] == SQSH_MAGIC) {
+			bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
+					     offset, 0);
+			continue;
+		}
 	}
 
 	/* Look for NVRAM at the end of the last block. */
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 1 line · Le vendredi 13 septembre 2013 18:38:17 Rafał Miłecki a écrit :

A little commit message would be welcome.

Quoted 17 lines
---
 drivers/mtd/bcm47xxpart.c |    8 ++++++++
 1 file changed, 8 insertions(+)
drivers/mtd/bcm47xxpart.c +1 -0
index 9279a91..96f821a 100644
@@ -32,6 +32,7 @@
 #define ML_MAGIC1			0x39685a42
 #define ML_MAGIC2			0x26594131
 #define TRX_MAGIC			0x30524448
+#define SQSH_MAGIC			0x71736873	/* shsq */
 
 struct trx_header {
 	uint32_t magic;

drivers/mtd/bcm47xxpart.c static int bcm47xxpart_parse(struct mtd_info *master, · line 173

Quoted 6 lines
drivers/mtd/bcm47xxpart.c +3 -0
@@ -167,6 +168,13 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 			offset = rounddown(offset + trx->length, blocksize);
 			continue;
 		}
+
+		/* Squashfs */
+		if (buf[0x000 / 4] == SQSH_MAGIC) {

So basically buf[0], which is a bit more readable.

Thanks!

Signature · 1 line
Florian
#2 lore raw
In reply to Rafał Miłecki
Quoted 11 lines · Rafał Miłecki
---
 drivers/mtd/bcm47xxpart.c |    8 ++++++++
 1 file changed, 8 insertions(+)
drivers/mtd/bcm47xxpart.c +0 -0
index 9279a91..96f821a 100644

drivers/mtd/bcm47xxpart.c line 35

Quoted 4 lines
drivers/mtd/bcm47xxpart.c +1 -0
@@ -32,6 +32,7 @@
 #define ML_MAGIC1			0x39685a42
 #define ML_MAGIC2			0x26594131
 #define TRX_MAGIC			0x30524448
+#define SQSH_MAGIC			0x71736873	/* shsq */

s/shsq/sqsh/

Or really, the "sqsh" comment doesn't add much to the SQSH_MAGIC macro. Maybe this instead?

s/shsq/SquashFS/

Quoted 7 lines
drivers/mtd/bcm47xxpart.c +0 -0
 struct trx_header {
 	uint32_t magic;
@@ -167,6 +168,13 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 			offset = rounddown(offset + trx->length, blocksize);
 			continue;
 		}

drivers/mtd/bcm47xxpart.c static int bcm47xxpart_parse(struct mtd_info *master, · line 180

Quoted 10 lines
drivers/mtd/bcm47xxpart.c +7 -0
+
+		/* Squashfs */
+		if (buf[0x000 / 4] == SQSH_MAGIC) {
+			bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
+					     offset, 0);
+			continue;
+		}
 	}
 
 	/* Look for NVRAM at the end of the last block. */

Brian

#3 lore raw

2013/9/13 Brian Norris <[email protected]>:

Quoted 19 lines · Rafał Miłecki
Quoted 11 lines
---
 drivers/mtd/bcm47xxpart.c |    8 ++++++++
 1 file changed, 8 insertions(+)
drivers/mtd/bcm47xxpart.c +0 -0
index 9279a91..96f821a 100644

drivers/mtd/bcm47xxpart.c line 35

Quoted 4 lines
drivers/mtd/bcm47xxpart.c +1 -0
@@ -32,6 +32,7 @@
 #define ML_MAGIC1                    0x39685a42
 #define ML_MAGIC2                    0x26594131
 #define TRX_MAGIC                    0x30524448
+#define SQSH_MAGIC                   0x71736873      /* shsq */

s/shsq/sqsh/

Quoted 4 lines

Or really, the "sqsh" comment doesn't add much to the SQSH_MAGIC macro. Maybe this instead?

s/shsq/SquashFS/

This is really a "shsq". If you read 0x71736873 in LE, you get:
1) 0x73 (s)
2) 0x68 (h)
3) 0x73 (s)
4) 0x71 (q)

This is way I put the comment. To underline that this is a "shsq" in LE, that means SQSH (SQuaSHfs).

#4 lore raw
Quoted 25 lines · Rafał Miłecki

2013/9/13 Brian Norris <[email protected]>:

Quoted 19 lines · Rafał Miłecki
Quoted 11 lines
---
  drivers/mtd/bcm47xxpart.c |    8 ++++++++
  1 file changed, 8 insertions(+)
drivers/mtd/bcm47xxpart.c +0 -0
index 9279a91..96f821a 100644

drivers/mtd/bcm47xxpart.c line 35

Quoted 4 lines
drivers/mtd/bcm47xxpart.c +1 -0
@@ -32,6 +32,7 @@
  #define ML_MAGIC1                    0x39685a42
  #define ML_MAGIC2                    0x26594131
  #define TRX_MAGIC                    0x30524448
+#define SQSH_MAGIC                   0x71736873      /* shsq */

s/shsq/sqsh/

Quoted 4 lines

Or really, the "sqsh" comment doesn't add much to the SQSH_MAGIC macro. Maybe this instead?

s/shsq/SquashFS/

Quoted 8 lines

This is really a "shsq". If you read 0x71736873 in LE, you get:
1) 0x73 (s)
2) 0x68 (h)
3) 0x73 (s)
4) 0x71 (q)

This is way I put the comment. To underline that this is a "shsq" in LE, that means SQSH (SQuaSHfs).

I see, my bad. That's still a weird magic (not your fault), as it's not really LE in the traditional (byte atomic) sense, but little endian with 16-bit atoms.

Brian

#5 lore raw

PATCH v2 1/1 mtd: bcm47xxpart: detect block aligned Squashfs partition

In reply to Rafał Miłecki

Most of the bcm47xx devices use TRX format for storing kernel and some partition like Squashfs or JFFS2. This is pretty flexible solution, CFE (the bootloader) just writes (and later boots) TRX at some hardcoded place and paritions can vary in the size.

However some devices don't use TRX format. Very recently we have discovered ZTE H218N that has kernel and rootfs partitions at some "random" places.

This patch allows Linux find a rootfs partition after installing custom image with a CFE bootloader.

---
 drivers/mtd/bcm47xxpart.c |    8 ++++++++
 1 file changed, 8 insertions(+)
drivers/mtd/bcm47xxpart.c +8 -0
index 9279a91..61213f9 100644
@@ -32,6 +32,7 @@
 #define ML_MAGIC1			0x39685a42
 #define ML_MAGIC2			0x26594131
 #define TRX_MAGIC			0x30524448
+#define SQSH_MAGIC			0x71736873	/* shsq */
 
 struct trx_header {
 	uint32_t magic;
@@ -167,6 +168,13 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 			offset = rounddown(offset + trx->length, blocksize);
 			continue;
 		}
+
+		/* Squashfs on devices not using TRX */
+		if (buf[0x000 / 4] == SQSH_MAGIC) {
+			bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
+					     offset, 0);
+			continue;
+		}
 	}
 
 	/* Look for NVRAM at the end of the last block. */
Signature · 1 line
1.7.10.4
#6 lore raw

Re: [PATCH V2] mtd: bcm47xxpart: detect block aligned Squashfs partition

Quoted 5 lines · Le vendredi 13 septembre 2013 22:25:30 Rafał Miłecki a écrit :

Most of the bcm47xx devices use TRX format for storing kernel and some partition like Squashfs or JFFS2. This is pretty flexible solution, CFE (the bootloader) just writes (and later boots) TRX at some hardcoded place and paritions can vary in the size.

Quoted 7 lines

However some devices don't use TRX format. Very recently we have discovered ZTE H218N that has kernel and rootfs partitions at some "random" places.

This patch allows Linux find a rootfs partition after installing custom image with a CFE bootloader.

This looks much better, thanks! Couple of nitpicks below.

Quoted 10 lines
---
 drivers/mtd/bcm47xxpart.c |    8 ++++++++
 1 file changed, 8 insertions(+)
drivers/mtd/bcm47xxpart.c +0 -0
index 9279a91..61213f9 100644

drivers/mtd/bcm47xxpart.c line 35

Quoted 4 lines
drivers/mtd/bcm47xxpart.c +1 -0
@@ -32,6 +32,7 @@
 #define ML_MAGIC1			0x39685a42
 #define ML_MAGIC2			0x26594131
 #define TRX_MAGIC			0x30524448
+#define SQSH_MAGIC			0x71736873	/* shsq */

You could include uapi/linux/magic.h and use the SQUASHFS_MAGIC constant directly, sorry for not noticing earlier.

drivers/mtd/bcm47xxpart.c static int bcm47xxpart_parse(struct mtd_info *master, · line 173

Quoted 10 lines
drivers/mtd/bcm47xxpart.c +3 -0
 struct trx_header {
 	uint32_t magic;
@@ -167,6 +168,13 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 			offset = rounddown(offset + trx->length, blocksize);
 			continue;
 		}
+
+		/* Squashfs on devices not using TRX */
+		if (buf[0x000 / 4] == SQSH_MAGIC) {

In theory le32_to_cpu() should be used to mimic what init/do_mounts_rd.c does but we do not support big-endian BCM47xx devices yet so this probably does not matter much.

Signature · 1 line
Florian
#7 lore raw

Re: [PATCH V2] mtd: bcm47xxpart: detect block aligned Squashfs partition

2013/9/13 Florian Fainelli <[email protected]>:

Quoted 5 lines · Le vendredi 13 septembre 2013 22:25:30 Rafał Miłecki a écrit :
Quoted 4 lines
drivers/mtd/bcm47xxpart.c +0 -0
index 9279a91..61213f9 100644
Quoted 8 lines

drivers/mtd/bcm47xxpart.c line 35

Quoted 5 lines
drivers/mtd/bcm47xxpart.c +1 -0
@@ -32,6 +32,7 @@
 #define ML_MAGIC1                    0x39685a42
 #define ML_MAGIC2                    0x26594131
 #define TRX_MAGIC                    0x30524448
+#define SQSH_MAGIC                   0x71736873      /* shsq */

You could include uapi/linux/magic.h and use the SQUASHFS_MAGIC constant directly, sorry for not noticing earlier.

OK, I need help with that crazy endianness here... When I look at flash dump in hexdump (or Okteta for gui) I see:
37:0000 | 73 68 73 71 BB 03 00 00 00 00 00 00 88 1B 00 40 | shsq»..........@

bcm47xx is LE, so reading first 4 bytes results in: 0x71'73'68'73 ([3]
+ [2] + [1] + [0]). That is what I used for my SQSH_MAGIC.

However SQUASHFS_MAGIC is 0x73717368. So I need to read [2] + [3] +
[0] + [1]... Any help how to achieve that?

Signature · 1 line
Rafał
#8 lore raw

Re: [PATCH V2] mtd: bcm47xxpart: detect block aligned Squashfs partition

Hello Rafal,

2013/9/14 Rafał Miłecki <[email protected]>:

Quoted 19 lines

2013/9/13 Florian Fainelli <[email protected]>:

Quoted 5 lines · Le vendredi 13 septembre 2013 22:25:30 Rafał Miłecki a écrit :
Quoted 4 lines
drivers/mtd/bcm47xxpart.c +0 -0
index 9279a91..61213f9 100644
Quoted 8 lines

drivers/mtd/bcm47xxpart.c line 35

Quoted 5 lines
drivers/mtd/bcm47xxpart.c +1 -0
@@ -32,6 +32,7 @@
 #define ML_MAGIC1                    0x39685a42
 #define ML_MAGIC2                    0x26594131
 #define TRX_MAGIC                    0x30524448
+#define SQSH_MAGIC                   0x71736873      /* shsq */

You could include uapi/linux/magic.h and use the SQUASHFS_MAGIC constant directly, sorry for not noticing earlier.

OK, I need help with that crazy endianness here... When I look at flash dump in hexdump (or Okteta for gui) I see:
37:0000 | 73 68 73 71 BB 03 00 00 00 00 00 00 88 1B 00 40 | shsq»..........@

Quoted 5 lines

bcm47xx is LE, so reading first 4 bytes results in: 0x71'73'68'73 ([3]
+ [2] + [1] + [0]). That is what I used for my SQSH_MAGIC.

However SQUASHFS_MAGIC is 0x73717368. So I need to read [2] + [3] +
[0] + [1]... Any help how to achieve that?

My bad, there does not seem to be a good combination of endian swapping which produces the magic you need.

Signature · 1 line
Florian