brcm47xx: add patches for kernel 4.0
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-4.0 / 400-mtd-bcm47xxpart-get-nvram.patch
1 --- a/drivers/mtd/bcm47xxpart.c
2 +++ b/drivers/mtd/bcm47xxpart.c
3 @@ -97,6 +97,7 @@ static int bcm47xxpart_parse(struct mtd_
4 int trx_part = -1;
5 int last_trx_part = -1;
6 int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
7 + bool found_nvram = false;
8
9 /*
10 * Some really old flashes (like AT45DB*) had smaller erasesize-s, but
11 @@ -300,12 +301,23 @@ static int bcm47xxpart_parse(struct mtd_
12 if (buf[0] == NVRAM_HEADER) {
13 bcm47xxpart_add_part(&parts[curr_part++], "nvram",
14 master->size - blocksize, 0);
15 + found_nvram = true;
16 break;
17 }
18 }
19
20 kfree(buf);
21
22 + if (!found_nvram) {
23 + pr_err("can not find a nvram partition reserve last block\n");
24 + bcm47xxpart_add_part(&parts[curr_part++], "nvram_guess",
25 + master->size - blocksize * 2, MTD_WRITEABLE);
26 + for (i = 0; i < curr_part; i++) {
27 + if (parts[i].size + parts[i].offset == master->size)
28 + parts[i].offset -= blocksize * 2;
29 + }
30 + }
31 +
32 /*
33 * Assume that partitions end at the beginning of the one they are
34 * followed by.