1 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
2 Date: Sat, 2 Jan 2016 01:04:52 +0100
3 Subject: [PATCH] mtd: bcm47xxpart: check for bad blocks when calculating
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
11 drivers/mtd/bcm47xxpart.c | 50 +++++++++++++++++++++++++++++++++++++----------
12 1 file changed, 40 insertions(+), 10 deletions(-)
14 --- a/drivers/mtd/bcm47xxpart.c
15 +++ b/drivers/mtd/bcm47xxpart.c
16 @@ -61,6 +61,34 @@ static void bcm47xxpart_add_part(struct
17 part->mask_flags = mask_flags;
21 + * Calculate real end offset (address) for a given amount of data. It checks
22 + * all blocks skipping bad ones.
24 +static size_t bcm47xxpart_real_offset(struct mtd_info *master, size_t offset,
27 + size_t real_offset = offset;
29 + if (mtd_block_isbad(master, real_offset))
30 + pr_warn("Base offset shouldn't be at bad block");
32 + while (bytes >= master->erasesize) {
33 + bytes -= master->erasesize;
34 + real_offset += master->erasesize;
35 + while (mtd_block_isbad(master, real_offset)) {
36 + real_offset += master->erasesize;
38 + if (real_offset >= master->size)
39 + return real_offset - master->erasesize;
43 + real_offset += bytes;
48 static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master,
51 @@ -182,6 +210,8 @@ static int bcm47xxpart_parse(struct mtd_
54 if (buf[0x000 / 4] == TRX_MAGIC) {
57 if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
58 pr_warn("Not enough partitions left to register trx, scanning stopped!\n");
60 @@ -196,18 +226,18 @@ static int bcm47xxpart_parse(struct mtd_
62 /* We have LZMA loader if offset[2] points to sth */
64 + tmp = bcm47xxpart_real_offset(master, offset,
66 bcm47xxpart_add_part(&parts[curr_part++],
68 - offset + trx->offset[i],
75 + tmp = bcm47xxpart_real_offset(master, offset,
77 bcm47xxpart_add_part(&parts[curr_part++],
79 - offset + trx->offset[i],
85 @@ -219,11 +249,11 @@ static int bcm47xxpart_parse(struct mtd_
89 - name = bcm47xxpart_trx_data_part_name(master, offset + trx->offset[i]);
90 + tmp = bcm47xxpart_real_offset(master, offset,
92 + name = bcm47xxpart_trx_data_part_name(master, tmp);
93 bcm47xxpart_add_part(&parts[curr_part++],
95 - offset + trx->offset[i],