diff mbox

[V2] mtd: bcm47xxpart: support SquashFS with an original magic

Message ID 1418719825-21314-1-git-send-email-zajec5@gmail.com
State Accepted
Commit 0b56d2d45e7c27581ca90f36b4317373f23e7622
Headers show

Commit Message

Rafał Miłecki Dec. 16, 2014, 8:50 a.m. UTC 
SquashFS is supposed to use magic defined as SQUASHFS_MAGIC. What we
were supporting so far (SQSH_MAGIC) is something ZTE specific.
This patch adds support for Xiaomi R1D.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
V2: s/SQSH/SHSQ/ to emphase this weird endianness
---
 drivers/mtd/bcm47xxpart.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Brian Norris Jan. 7, 2015, 8:36 p.m. UTC | #1 
On Tue, Dec 16, 2014 at 09:50:25AM +0100, Rafał Miłecki wrote:
> SquashFS is supposed to use magic defined as SQUASHFS_MAGIC. What we
> were supporting so far (SQSH_MAGIC) is something ZTE specific.
> This patch adds support for Xiaomi R1D.
> 
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
> V2: s/SQSH/SHSQ/ to emphase this weird endianness

Applied to l2-mtd.git. Thanks.

Brian
diff mbox

Patch

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 4ad3928..c0720c1 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -15,6 +15,8 @@ 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
+#include <uapi/linux/magic.h>
+
 /*
  * NAND flash on Netgear R6250 was verified to contain 15 partitions.
  * This will result in allocating too big array for some old devices, but the
@@ -39,7 +41,7 @@ 
 #define ML_MAGIC1			0x39685a42
 #define ML_MAGIC2			0x26594131
 #define TRX_MAGIC			0x30524448
-#define SQSH_MAGIC			0x71736873	/* shsq */
+#define SHSQ_MAGIC			0x71736873	/* shsq (weird ZTE H218N endianness) */
 #define UBI_EC_MAGIC			0x23494255	/* UBI# */
 
 struct trx_header {
@@ -233,7 +235,8 @@  static int bcm47xxpart_parse(struct mtd_info *master,
 		}
 
 		/* Squashfs on devices not using TRX */
-		if (buf[0x000 / 4] == SQSH_MAGIC) {
+		if (le32_to_cpu(buf[0x000 / 4]) == SQUASHFS_MAGIC ||
+		    buf[0x000 / 4] == SHSQ_MAGIC) {
 			bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
 					     offset, 0);
 			continue;