hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel: backport bcm47xxpart changes queued for 3.19 

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 43223
lede-17.01
Rafał Miłecki 2014-11-08 21:41:21 +00:00
parent fcc8fe9bd2
commit 93b3924128
6 changed files with 126 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
target/linux/bcm53xx/patches-3.14/410-mtd-bcm47xxpart-alloc-memory-for-more-partitions.patch
View File

@ -1,32 +0,0 @@
From 6b833541d73894b5afd40d69949f8f6099db2abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Thu, 2 Oct 2014 11:33:40 +0200
Subject: [PATCH] mtd: bcm47xxpart: alloc memory for more partitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is needed for some new Netgear devices (e.g. R6250).
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
drivers/mtd/bcm47xxpart.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -15,8 +15,12 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-/* 10 parts were found on sflash on Netgear WNDR4500 */
-#define BCM47XXPART_MAX_PARTS 12
+/*
+ * 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
+ * memory will be freed soon anyway (see mtd_device_parse_register).
+ */
+#define BCM47XXPART_MAX_PARTS 20
/*
* Amount of bytes we read when analyzing each block of flash memory.

32
target/linux/bcm53xx/patches-3.18/410-mtd-bcm47xxpart-alloc-memory-for-more-partitions.patch
View File

@ -1,32 +0,0 @@
From 6b833541d73894b5afd40d69949f8f6099db2abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Thu, 2 Oct 2014 11:33:40 +0200
Subject: [PATCH] mtd: bcm47xxpart: alloc memory for more partitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is needed for some new Netgear devices (e.g. R6250).
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
drivers/mtd/bcm47xxpart.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -15,8 +15,12 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-/* 10 parts were found on sflash on Netgear WNDR4500 */
-#define BCM47XXPART_MAX_PARTS 12
+/*
+ * 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
+ * memory will be freed soon anyway (see mtd_device_parse_register).
+ */
+#define BCM47XXPART_MAX_PARTS 20
/*
* Amount of bytes we read when analyzing each block of flash memory.

50
target/linux/generic/patches-3.14/050-mtd-bcm47xxpart-backports-from-3.19.patch Normal file
View File

@ -0,0 +1,50 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -15,8 +15,12 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-/* 10 parts were found on sflash on Netgear WNDR4500 */
-#define BCM47XXPART_MAX_PARTS 12
+/*
+ * 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
+ * memory will be freed soon anyway (see mtd_device_parse_register).
+ */
+#define BCM47XXPART_MAX_PARTS 20
/*
* Amount of bytes we read when analyzing each block of flash memory.
@@ -168,18 +172,26 @@ static int bcm47xxpart_parse(struct mtd_
i++;
}
- bcm47xxpart_add_part(&parts[curr_part++], "linux",
- offset + trx->offset[i], 0);
- i++;
+ if (trx->offset[i]) {
+ bcm47xxpart_add_part(&parts[curr_part++],
+ "linux",
+ offset + trx->offset[i],
+ 0);
+ i++;
+ }
/*
* Pure rootfs size is known and can be calculated as:
* trx->length - trx->offset[i]. We don't fill it as
* we want to have jffs2 (overlay) in the same mtd.
*/
- bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
- offset + trx->offset[i], 0);
- i++;
+ if (trx->offset[i]) {
+ bcm47xxpart_add_part(&parts[curr_part++],
+ "rootfs",
+ offset + trx->offset[i],
+ 0);
+ i++;
+ }
last_trx_part = curr_part - 1;

26
target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/bcm47xxpart.c --- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c
@@ -36,6 +36,7 @@ @@ -40,6 +40,7 @@
#define ML_MAGIC2 0x26594131 #define ML_MAGIC2 0x26594131
#define TRX_MAGIC 0x30524448 #define TRX_MAGIC 0x30524448
#define SQSH_MAGIC 0x71736873 /* shsq */ #define SQSH_MAGIC 0x71736873 /* shsq */
@ -8,7 +8,7 @@
struct trx_header { struct trx_header {
uint32_t magic; uint32_t magic;
@@ -46,7 +47,7 @@ struct trx_header { @@ -50,7 +51,7 @@ struct trx_header {
uint32_t offset[3]; uint32_t offset[3];
} __packed; } __packed;
@ -17,7 +17,7 @@
u64 offset, uint32_t mask_flags) u64 offset, uint32_t mask_flags)
{ {
part->name = name; part->name = name;
@@ -54,6 +55,26 @@ static void bcm47xxpart_add_part(struct @@ -58,6 +59,26 @@ static void bcm47xxpart_add_part(struct
part->mask_flags = mask_flags; part->mask_flags = mask_flags;
} }
@ -44,7 +44,7 @@
static int bcm47xxpart_parse(struct mtd_info *master, static int bcm47xxpart_parse(struct mtd_info *master,
struct mtd_partition **pparts, struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
@@ -147,6 +168,8 @@ static int bcm47xxpart_parse(struct mtd_ @@ -151,6 +172,8 @@ static int bcm47xxpart_parse(struct mtd_
/* TRX */ /* TRX */
if (buf[0x000 / 4] == TRX_MAGIC) { if (buf[0x000 / 4] == TRX_MAGIC) {
@ -53,14 +53,14 @@
if (BCM47XXPART_MAX_PARTS - curr_part < 4) { if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
pr_warn("Not enough partitions left to register trx, scanning stopped!\n"); pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
break; break;
@@ -177,7 +200,9 @@ static int bcm47xxpart_parse(struct mtd_ @@ -186,8 +209,9 @@ static int bcm47xxpart_parse(struct mtd_
* trx->length - trx->offset[i]. We don't fill it as
* we want to have jffs2 (overlay) in the same mtd. * we want to have jffs2 (overlay) in the same mtd.
*/ */
- bcm47xxpart_add_part(&parts[curr_part++], "rootfs", if (trx->offset[i]) {
+ name = bcm47xxpart_trx_data_part_name(master, + name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
+ offset + trx->offset[i]); bcm47xxpart_add_part(&parts[curr_part++],
+ bcm47xxpart_add_part(&parts[curr_part++], name, - "rootfs",
offset + trx->offset[i], 0); + name,
i++; offset + trx->offset[i],
0);
i++;

50
target/linux/generic/patches-3.18/040-mtd-bcm47xxpart-backports-from-3.19.patch Normal file
View File

@ -0,0 +1,50 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -15,8 +15,12 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-/* 10 parts were found on sflash on Netgear WNDR4500 */
-#define BCM47XXPART_MAX_PARTS 12
+/*
+ * 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
+ * memory will be freed soon anyway (see mtd_device_parse_register).
+ */
+#define BCM47XXPART_MAX_PARTS 20
/*
* Amount of bytes we read when analyzing each block of flash memory.
@@ -168,18 +172,26 @@ static int bcm47xxpart_parse(struct mtd_
i++;
}
- bcm47xxpart_add_part(&parts[curr_part++], "linux",
- offset + trx->offset[i], 0);
- i++;
+ if (trx->offset[i]) {
+ bcm47xxpart_add_part(&parts[curr_part++],
+ "linux",
+ offset + trx->offset[i],
+ 0);
+ i++;
+ }
/*
* Pure rootfs size is known and can be calculated as:
* trx->length - trx->offset[i]. We don't fill it as
* we want to have jffs2 (overlay) in the same mtd.
*/
- bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
- offset + trx->offset[i], 0);
- i++;
+ if (trx->offset[i]) {
+ bcm47xxpart_add_part(&parts[curr_part++],
+ "rootfs",
+ offset + trx->offset[i],
+ 0);
+ i++;
+ }
last_trx_part = curr_part - 1;

26
target/linux/generic/patches-3.18/431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/bcm47xxpart.c --- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c
@@ -36,6 +36,7 @@ @@ -40,6 +40,7 @@
#define ML_MAGIC2 0x26594131 #define ML_MAGIC2 0x26594131
#define TRX_MAGIC 0x30524448 #define TRX_MAGIC 0x30524448
#define SQSH_MAGIC 0x71736873 /* shsq */ #define SQSH_MAGIC 0x71736873 /* shsq */
@ -8,7 +8,7 @@
struct trx_header { struct trx_header {
uint32_t magic; uint32_t magic;
@@ -46,7 +47,7 @@ struct trx_header { @@ -50,7 +51,7 @@ struct trx_header {
uint32_t offset[3]; uint32_t offset[3];
} __packed; } __packed;
@ -17,7 +17,7 @@
u64 offset, uint32_t mask_flags) u64 offset, uint32_t mask_flags)
{ {
part->name = name; part->name = name;
@@ -54,6 +55,26 @@ static void bcm47xxpart_add_part(struct @@ -58,6 +59,26 @@ static void bcm47xxpart_add_part(struct
part->mask_flags = mask_flags; part->mask_flags = mask_flags;
} }
@ -44,7 +44,7 @@
static int bcm47xxpart_parse(struct mtd_info *master, static int bcm47xxpart_parse(struct mtd_info *master,
struct mtd_partition **pparts, struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
@@ -147,6 +168,8 @@ static int bcm47xxpart_parse(struct mtd_ @@ -151,6 +172,8 @@ static int bcm47xxpart_parse(struct mtd_
/* TRX */ /* TRX */
if (buf[0x000 / 4] == TRX_MAGIC) { if (buf[0x000 / 4] == TRX_MAGIC) {
@ -53,14 +53,14 @@
if (BCM47XXPART_MAX_PARTS - curr_part < 4) { if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
pr_warn("Not enough partitions left to register trx, scanning stopped!\n"); pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
break; break;
@@ -177,7 +200,9 @@ static int bcm47xxpart_parse(struct mtd_ @@ -186,8 +209,9 @@ static int bcm47xxpart_parse(struct mtd_
* trx->length - trx->offset[i]. We don't fill it as
* we want to have jffs2 (overlay) in the same mtd. * we want to have jffs2 (overlay) in the same mtd.
*/ */
- bcm47xxpart_add_part(&parts[curr_part++], "rootfs", if (trx->offset[i]) {
+ name = bcm47xxpart_trx_data_part_name(master, + name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
+ offset + trx->offset[i]); bcm47xxpart_add_part(&parts[curr_part++],
+ bcm47xxpart_add_part(&parts[curr_part++], name, - "rootfs",
offset + trx->offset[i], 0); + name,
i++; offset + trx->offset[i],
0);
i++;