evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MIPS: BCM47XX: Don't try guessing NVRAM size on MTD partition

Browse source 
When dealing with whole flash content (bcm47xx_nvram_init_from_mem) we
need to find NVRAM start trying various partition sizes (nvram_sizes).
This is not needed when using MTD as we have direct partition access.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: https://patchwork.linux-mips.org/patch/9652/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Rafał Miłecki 2015-04-01 08:23:05 +02:00 • committed by Ralf Baechle
parent 6ab7c29099
commit 40d12172c8
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
arch/mips/bcm47xx/nvram.c
View file

@ -139,36 +139,28 @@ static int nvram_init(void)
struct mtd_info *mtd; struct mtd_info *mtd;
struct nvram_header header; struct nvram_header header;
size_t bytes_read; size_t bytes_read;
int err, i; int err;
mtd = get_mtd_device_nm("nvram"); mtd = get_mtd_device_nm("nvram");
if (IS_ERR(mtd)) if (IS_ERR(mtd))
return -ENODEV; return -ENODEV;
for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) { err = mtd_read(mtd, 0, sizeof(header), &bytes_read, (uint8_t *)&header);
loff_t from = mtd->size - nvram_sizes[i]; if (!err && header.magic == NVRAM_MAGIC) {
u8 *dst = (uint8_t *)nvram_buf;
size_t len = header.len;
if (from < 0) if (header.len > NVRAM_SPACE) {
continue; pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
header.len, NVRAM_SPACE);
err = mtd_read(mtd, from, sizeof(header), &bytes_read, len = NVRAM_SPACE;
(uint8_t *)&header);
if (!err && header.magic == NVRAM_MAGIC) {
u8 *dst = (uint8_t *)nvram_buf;
size_t len = header.len;
if (header.len > NVRAM_SPACE) {
pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
header.len, NVRAM_SPACE);
len = NVRAM_SPACE;
}
err = mtd_read(mtd, from, len, &bytes_read, dst);
if (err)
return err;
return 0;
} }
err = mtd_read(mtd, 0, len, &bytes_read, dst);
if (err)
return err;
return 0;
} }
#endif #endif