mtd: bcm47xxpart: alternative MAGIC for board_data partition

Some devices (like WNDR3700v3) have board_data without MPFR magic, some extra header or extra NVRAM around 0x100. In such case we have to look for another magic which is BD 0B 0D BD (BD probably stands for Board Data). It's located "far far away", so instead of extending buffer add another mtd_read. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>

mtd: bcm47xxpart: alternative MAGIC for board_data partition
Some devices (like WNDR3700v3) have board_data without MPFR magic, some extra header or extra NVRAM around 0x100. In such case we have to look for another magic which is BD 0B 0D BD (BD probably stands for Board Data). It's located "far far away", so instead of extending buffer add another mtd_read. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Rafał Miłecki · Brian Norris
1 parent 4f8aaf7228
Showing 1 changed file with 16 additions and 0 deletions Side-by-side Diff
drivers/mtd/bcm47xxpart.c
@@ -27,6 +27,7 @@
  
 /* Magics */
 #define BOARD_DATA_MAGIC		0x5246504D	/* MPFR */
+#define BOARD_DATA_MAGIC2		0xBD0D0BBD
 #define CFE_MAGIC			0x43464531	/* 1EFC */
 #define FACTORY_MAGIC			0x59544346	/* FCTY */
 #define POT_MAGIC1			0x54544f50	/* POTT */
@@ -190,6 +191,21 @@
 		if (buf[0x000 / 4] == SQSH_MAGIC) {
 			bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
 					     offset, 0);
+			continue;
+		}
+
+		/* Read middle of the block */
+		if (mtd_read(master, offset + 0x8000, 0x4,
+			     &bytes_read, (uint8_t *)buf) < 0) {
+			pr_err("mtd_read error while parsing (offset: 0x%X)!\n",
+			       offset);
+			continue;
+		}
+
+		/* Some devices (ex. WNDR3700v3) don't have a standard 'MPFR' */
+		if (buf[0x000 / 4] == BOARD_DATA_MAGIC2) {
+			bcm47xxpart_add_part(&parts[curr_part++], "board_data",
+					     offset, MTD_WRITEABLE);
 			continue;
 		}
 	}
...	...	@@ -27,6 +27,7 @@
27	27
28	28	/* Magics */
29	29	#define BOARD_DATA_MAGIC 0x5246504D /* MPFR */
	30	+#define BOARD_DATA_MAGIC2 0xBD0D0BBD
30	31	#define CFE_MAGIC 0x43464531 /* 1EFC */
31	32	#define FACTORY_MAGIC 0x59544346 /* FCTY */
32	33	#define POT_MAGIC1 0x54544f50 /* POTT */
...	...	@@ -190,6 +191,21 @@
190	191	if (buf[0x000 / 4] == SQSH_MAGIC) {
191	192	bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
192	193	offset, 0);
	194	+ continue;
	195	+ }
	196	+
	197	+ /* Read middle of the block */
	198	+ if (mtd_read(master, offset + 0x8000, 0x4,
	199	+ &bytes_read, (uint8_t *)buf) < 0) {
	200	+ pr_err("mtd_read error while parsing (offset: 0x%X)!\n",
	201	+ offset);
	202	+ continue;
	203	+ }
	204	+
	205	+ /* Some devices (ex. WNDR3700v3) don't have a standard 'MPFR' */
	206	+ if (buf[0x000 / 4] == BOARD_DATA_MAGIC2) {
	207	+ bcm47xxpart_add_part(&parts[curr_part++], "board_data",
	208	+ offset, MTD_WRITEABLE);
193	209	continue;
194	210	}
195	211	}