diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-02-16 20:28:24 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-02-16 20:28:24 +0000 |
| commit | 1a8218d6e4f770c026149a836f93fe9f9e2b4a4f (patch) | |
| tree | 2dc2d4678f4c56f10e3ff13a6dab51eaa1579851 /target/linux/brcm47xx/patches-3.8/023-mtd-bcm47xxpart-improve-probing-of-nvram-partition.patch | |
| parent | 1d6574b9c3fb992b9bf509d02c76e9250834ae24 (diff) | |
| download | upstream-1a8218d6e4f770c026149a836f93fe9f9e2b4a4f.tar.gz upstream-1a8218d6e4f770c026149a836f93fe9f9e2b4a4f.tar.bz2 upstream-1a8218d6e4f770c026149a836f93fe9f9e2b4a4f.zip | |
brcm47xx: add initial support for kernel 3.8
This contains the following new bigger changes:
* new partition parser which still could lake some features or have bugs
* new nand flash driver
* using physmap-flash flash driver for parallel flash
* some changes to the serial flash driver
With these changes OpenWrt starts using more of the mainline flash drivers.
SVN-Revision: 35632
Diffstat (limited to 'target/linux/brcm47xx/patches-3.8/023-mtd-bcm47xxpart-improve-probing-of-nvram-partition.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.8/023-mtd-bcm47xxpart-improve-probing-of-nvram-partition.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.8/023-mtd-bcm47xxpart-improve-probing-of-nvram-partition.patch b/target/linux/brcm47xx/patches-3.8/023-mtd-bcm47xxpart-improve-probing-of-nvram-partition.patch new file mode 100644 index 0000000000..b1115326f4 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.8/023-mtd-bcm47xxpart-improve-probing-of-nvram-partition.patch @@ -0,0 +1,61 @@ +--- a/drivers/mtd/bcm47xxpart.c ++++ b/drivers/mtd/bcm47xxpart.c +@@ -19,12 +19,6 @@ + /* 10 parts were found on sflash on Netgear WNDR4500 */ + #define BCM47XXPART_MAX_PARTS 12 + +-/* +- * Amount of bytes we read when analyzing each block of flash memory. +- * Set it big enough to allow detecting partition and reading important data. +- */ +-#define BCM47XXPART_BYTES_TO_READ 0x404 +- + /* Magics */ + #define BOARD_DATA_MAGIC 0x5246504D /* MPFR */ + #define POT_MAGIC1 0x54544f50 /* POTT */ +@@ -63,14 +57,17 @@ static int bcm47xxpart_parse(struct mtd_ + struct trx_header *trx; + int trx_part = -1; + int last_trx_part = -1; ++ int max_bytes_to_read = 0x8004; + + if (blocksize <= 0x10000) + blocksize = 0x10000; ++ if (blocksize == 0x20000) ++ max_bytes_to_read = 0x18004; + + /* Alloc */ + parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS, + GFP_KERNEL); +- buf = kzalloc(BCM47XXPART_BYTES_TO_READ, GFP_KERNEL); ++ buf = kzalloc(max_bytes_to_read, GFP_KERNEL); + + /* Parse block by block looking for magics */ + for (offset = 0; offset <= master->size - blocksize; +@@ -85,7 +82,7 @@ static int bcm47xxpart_parse(struct mtd_ + } + + /* Read beginning of the block */ +- if (mtd_read(master, offset, BCM47XXPART_BYTES_TO_READ, ++ if (mtd_read(master, offset, max_bytes_to_read, + &bytes_read, (uint8_t *)buf) < 0) { + pr_err("mtd_read error while parsing (offset: 0x%X)!\n", + offset); +@@ -100,9 +97,16 @@ static int bcm47xxpart_parse(struct mtd_ + } + + /* Standard NVRAM */ +- if (buf[0x000 / 4] == NVRAM_HEADER) { ++ if (buf[0x000 / 4] == NVRAM_HEADER || ++ buf[0x1000 / 4] == NVRAM_HEADER || ++ buf[0x8000 / 4] == NVRAM_HEADER || ++ (blocksize == 0x20000 && ( ++ buf[0x10000 / 4] == NVRAM_HEADER || ++ buf[0x11000 / 4] == NVRAM_HEADER || ++ buf[0x18000 / 4] == NVRAM_HEADER))) { + bcm47xxpart_add_part(&parts[curr_part++], "nvram", + offset, 0); ++ offset = rounddown(offset, blocksize); + continue; + } + |