--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <uapi/linux/magic.h>
-@@ -159,6 +160,28 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -250,6 +251,28 @@ static int bcm47xxpart_parse(struct mtd_
break;
}
--- /dev/null
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Subject: [PATCH 1/2] mtd: bcm47xxpart: move TRX parsing code to separated
+ function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This change simplifies main parsing loop logic a bit. In future it may
+be useful for moving TRX support to separated module / parser (if we
+implement support for them at some point).
+Finally parsing TRX at the end puts us in a better position as we have
+better flash layout knowledge. It may be useful e.g. if it appears there
+is more than 1 TRX partition.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+---
+ drivers/mtd/bcm47xxpart.c | 124 ++++++++++++++++++++++++++++------------------
+ 1 file changed, 77 insertions(+), 47 deletions(-)
+
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -83,6 +83,70 @@ out_default:
+ return "rootfs";
+ }
+
++static int bcm47xxpart_parse_trx(struct mtd_info *master,
++ struct mtd_partition *trx,
++ struct mtd_partition *parts,
++ size_t parts_len)
++{
++ struct mtd_partition *part;
++ struct trx_header header;
++ size_t bytes_read;
++ int curr_part = 0;
++ int i, err;
++
++ if (parts_len < 3) {
++ pr_warn("No enough space to add TRX partitions!\n");
++ return -ENOMEM;
++ }
++
++ err = mtd_read(master, trx->offset, sizeof(header), &bytes_read,
++ (uint8_t *)&header);
++ if (err && !mtd_is_bitflip(err)) {
++ pr_err("mtd_read error while reading TRX header: %d\n", err);
++ return err;
++ }
++
++ i = 0;
++
++ /* We have LZMA loader if offset[2] points to sth */
++ if (header.offset[2]) {
++ part = &parts[curr_part++];
++ part->name = "loader";
++ part->offset = trx->offset + header.offset[i];
++ i++;
++ }
++
++ if (header.offset[i]) {
++ part = &parts[curr_part++];
++ part->name = "linux";
++ part->offset = trx->offset + header.offset[i];
++ i++;
++ }
++
++ if (header.offset[i]) {
++ size_t offset = trx->offset + header.offset[i];
++
++ part = &parts[curr_part++];
++ part->name = bcm47xxpart_trx_data_part_name(master, offset);
++ part->offset = offset;
++ i++;
++ }
++
++ /*
++ * Assume that every partition ends at the beginning of the one it is
++ * followed by.
++ */
++ for (i = 0; i < curr_part; i++) {
++ u64 next_part_offset = (i < curr_part - 1) ?
++ parts[i + 1].offset :
++ trx->offset + trx->size;
++
++ parts[i].size = next_part_offset - parts[i].offset;
++ }
++
++ return curr_part;
++}
++
+ static int bcm47xxpart_parse(struct mtd_info *master,
+ struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+@@ -93,9 +157,7 @@ static int bcm47xxpart_parse(struct mtd_
+ size_t bytes_read;
+ uint32_t offset;
+ uint32_t blocksize = master->erasesize;
+- struct trx_header *trx;
+ int trx_part = -1;
+- int last_trx_part = -1;
+ int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
+ int err;
+
+@@ -182,54 +244,14 @@ static int bcm47xxpart_parse(struct mtd_
+
+ /* TRX */
+ if (buf[0x000 / 4] == TRX_MAGIC) {
+- if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
+- pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
+- break;
+- }
+-
+- trx = (struct trx_header *)buf;
++ struct trx_header *trx;
+
+ trx_part = curr_part;
+ bcm47xxpart_add_part(&parts[curr_part++], "firmware",
+ offset, 0);
+
+- i = 0;
+- /* We have LZMA loader if offset[2] points to sth */
+- if (trx->offset[2]) {
+- bcm47xxpart_add_part(&parts[curr_part++],
+- "loader",
+- 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.
+- */
+- if (trx->offset[i]) {
+- const char *name;
+-
+- name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
+- bcm47xxpart_add_part(&parts[curr_part++],
+- name,
+- offset + trx->offset[i],
+- 0);
+- i++;
+- }
+-
+- last_trx_part = curr_part - 1;
+-
+ /* Jump to the end of TRX */
++ trx = (struct trx_header *)buf;
+ offset = roundup(offset + trx->length, blocksize);
+ /* Next loop iteration will increase the offset */
+ offset -= blocksize;
+@@ -307,9 +329,17 @@ static int bcm47xxpart_parse(struct mtd_
+ parts[i + 1].offset : master->size;
+
+ parts[i].size = next_part_offset - parts[i].offset;
+- if (i == last_trx_part && trx_part >= 0)
+- parts[trx_part].size = next_part_offset -
+- parts[trx_part].offset;
++ }
++
++ /* If there was TRX parse it now */
++ if (trx_part >= 0) {
++ int num_parts;
++
++ num_parts = bcm47xxpart_parse_trx(master, &parts[trx_part],
++ parts + curr_part,
++ BCM47XXPART_MAX_PARTS - curr_part);
++ if (num_parts > 0)
++ curr_part += num_parts;
+ }
+
+ *pparts = parts;
--- /dev/null
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Subject: [PATCH 2/2] mtd: bcm47xxpart: support layouts with multiple TRX
+ partitions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some devices may have an extra TRX partition used as failsafe one. If
+we detect such partition we should set a proper name for it and don't
+parse it.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+---
+ drivers/mtd/bcm47xxpart.c | 56 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 46 insertions(+), 10 deletions(-)
+
+--- a/drivers/mtd/bcm47xxpart.c
++++ b/drivers/mtd/bcm47xxpart.c
+@@ -9,6 +9,7 @@
+ *
+ */
+
++#include <linux/bcm47xx_nvram.h>
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+@@ -147,6 +148,30 @@ static int bcm47xxpart_parse_trx(struct
+ return curr_part;
+ }
+
++/**
++ * bcm47xxpart_bootpartition - gets index of TRX partition used by bootloader
++ *
++ * Some devices may have more than one TRX partition. In such case one of them
++ * is the main one and another a failsafe one. Bootloader may fallback to the
++ * failsafe firmware if it detects corruption of the main image.
++ *
++ * This function provides info about currently used TRX partition. It's the one
++ * containing kernel started by the bootloader.
++ */
++static int bcm47xxpart_bootpartition(void)
++{
++ char buf[4];
++ int bootpartition;
++
++ /* Check CFE environment variable */
++ if (bcm47xx_nvram_getenv("bootpartition", buf, sizeof(buf)) > 0) {
++ if (!kstrtoint(buf, 0, &bootpartition))
++ return bootpartition;
++ }
++
++ return 0;
++}
++
+ static int bcm47xxpart_parse(struct mtd_info *master,
+ struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+@@ -157,7 +182,8 @@ static int bcm47xxpart_parse(struct mtd_
+ size_t bytes_read;
+ uint32_t offset;
+ uint32_t blocksize = master->erasesize;
+- int trx_part = -1;
++ int trx_parts[2]; /* Array with indexes of TRX partitions */
++ int trx_num = 0; /* Number of found TRX partitions */
+ int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
+ int err;
+
+@@ -246,7 +272,11 @@ static int bcm47xxpart_parse(struct mtd_
+ if (buf[0x000 / 4] == TRX_MAGIC) {
+ struct trx_header *trx;
+
+- trx_part = curr_part;
++ if (trx_num >= ARRAY_SIZE(trx_parts))
++ pr_warn("No enough space to store another TRX found at 0x%X\n",
++ offset);
++ else
++ trx_parts[trx_num++] = curr_part;
+ bcm47xxpart_add_part(&parts[curr_part++], "firmware",
+ offset, 0);
+
+@@ -332,14 +362,20 @@ static int bcm47xxpart_parse(struct mtd_
+ }
+
+ /* If there was TRX parse it now */
+- if (trx_part >= 0) {
+- int num_parts;
++ for (i = 0; i < trx_num; i++) {
++ struct mtd_partition *trx = &parts[trx_parts[i]];
+
+- num_parts = bcm47xxpart_parse_trx(master, &parts[trx_part],
+- parts + curr_part,
+- BCM47XXPART_MAX_PARTS - curr_part);
+- if (num_parts > 0)
+- curr_part += num_parts;
++ if (i == bcm47xxpart_bootpartition()) {
++ int num_parts;
++
++ num_parts = bcm47xxpart_parse_trx(master, trx,
++ parts + curr_part,
++ BCM47XXPART_MAX_PARTS - curr_part);
++ if (num_parts > 0)
++ curr_part += num_parts;
++ } else {
++ trx->name = "failsafe";
++ }
+ }
+
+ *pparts = parts;
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
-@@ -61,6 +61,34 @@ static void bcm47xxpart_add_part(struct
+@@ -62,6 +62,34 @@ static void bcm47xxpart_add_part(struct
part->mask_flags = mask_flags;
}
static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master,
size_t offset)
{
-@@ -182,6 +210,8 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -113,19 +141,22 @@ static int bcm47xxpart_parse_trx(struct
+ if (header.offset[2]) {
+ part = &parts[curr_part++];
+ part->name = "loader";
+- part->offset = trx->offset + header.offset[i];
++ part->offset = bcm47xxpart_real_offset(master, trx->offset,
++ header.offset[i]);
+ i++;
+ }
- /* TRX */
- if (buf[0x000 / 4] == TRX_MAGIC) {
-+ uint32_t tmp;
-+
- if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
- pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
- break;
-@@ -196,18 +226,18 @@ static int bcm47xxpart_parse(struct mtd_
- i = 0;
- /* We have LZMA loader if offset[2] points to sth */
- if (trx->offset[2]) {
-+ tmp = bcm47xxpart_real_offset(master, offset,
-+ trx->offset[i]);
- bcm47xxpart_add_part(&parts[curr_part++],
-- "loader",
-- offset + trx->offset[i],
-- 0);
-+ "loader", tmp, 0);
- i++;
- }
-
- if (trx->offset[i]) {
-+ tmp = bcm47xxpart_real_offset(master, offset,
-+ trx->offset[i]);
- bcm47xxpart_add_part(&parts[curr_part++],
-- "linux",
-- offset + trx->offset[i],
-- 0);
-+ "linux", tmp, 0);
- i++;
- }
-
-@@ -219,11 +249,11 @@ static int bcm47xxpart_parse(struct mtd_
- if (trx->offset[i]) {
- const char *name;
+ if (header.offset[i]) {
+ part = &parts[curr_part++];
+ part->name = "linux";
+- part->offset = trx->offset + header.offset[i];
++ part->offset = bcm47xxpart_real_offset(master, trx->offset,
++ header.offset[i]);
+ i++;
+ }
-- name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
-+ tmp = bcm47xxpart_real_offset(master, offset,
-+ trx->offset[i]);
-+ name = bcm47xxpart_trx_data_part_name(master, tmp);
- bcm47xxpart_add_part(&parts[curr_part++],
-- name,
-- offset + trx->offset[i],
-- 0);
-+ name, tmp, 0);
- i++;
- }
+ if (header.offset[i]) {
+- size_t offset = trx->offset + header.offset[i];
++ size_t offset = bcm47xxpart_real_offset(master, trx->offset,
++ header.offset[i]);
+ part = &parts[curr_part++];
+ part->name = bcm47xxpart_trx_data_part_name(master, offset);
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
-@@ -38,6 +38,7 @@
+@@ -39,6 +39,7 @@
#define NVRAM_HEADER 0x48534C46 /* FLSH */
#define POT_MAGIC1 0x54544f50 /* POTT */
#define POT_MAGIC2 0x504f /* OP */
#define ML_MAGIC1 0x39685a42
#define ML_MAGIC2 0x26594131
#define TRX_MAGIC 0x30524448
-@@ -207,6 +208,15 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -298,6 +299,15 @@ static int bcm47xxpart_parse(struct mtd_
MTD_WRITEABLE);
continue;
}
projects / openwrt / openwrt.git / commitdiff