]> Pileus Git - ~andy/linux/commitdiff
mtd: bcm47xxpart: register extra "firmware" partition
authorRafał Miłecki <zajec5@gmail.com>
Sun, 6 Jan 2013 15:08:36 +0000 (16:08 +0100)
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Mon, 4 Feb 2013 07:26:30 +0000 (09:26 +0200)
It's required for accessing trx header (usually re-calculating a
checksum) and for writing a new firmware.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/mtd/bcm47xxpart.c

index 06125eb59f142a97f1530df14834898c09430618..3411bc2a1482f350c9abadab43e721db4d98b307 100644 (file)
@@ -61,6 +61,8 @@ static int bcm47xxpart_parse(struct mtd_info *master,
        uint32_t offset;
        uint32_t blocksize = 0x10000;
        struct trx_header *trx;
+       int trx_part = -1;
+       int last_trx_part = -1;
 
        /* Alloc */
        parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS,
@@ -131,6 +133,10 @@ static int bcm47xxpart_parse(struct mtd_info *master,
                if (buf[0x000 / 4] == TRX_MAGIC) {
                        trx = (struct trx_header *)buf;
 
+                       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]) {
@@ -154,6 +160,8 @@ static int bcm47xxpart_parse(struct mtd_info *master,
                                             offset + trx->offset[i], 0);
                        i++;
 
+                       last_trx_part = curr_part - 1;
+
                        /*
                         * We have whole TRX scanned, skip to the next part. Use
                         * roundown (not roundup), as the loop will increase
@@ -174,6 +182,9 @@ static int bcm47xxpart_parse(struct mtd_info *master,
                                       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;
        }
 
        *pparts = parts;