iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware: bcm47xx_nvram: extract code copying NVRAM

Browse Source 
This simplifies function finding NVRAM. It doesn't directly deal with
NVRAM structure anymore and is a bit smaller.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Rafał Miłecki
2021-03-08 10:03:18 +01:00
committed by Thomas Bogendoerfer
parent 0a24b51a32
commit 298923cf99
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/firmware/broadcom/bcm47xx_nvram.c
View File

@ -54,12 +54,35 @@ static u32 find_nvram_size(void __iomem *end)
return 0; return 0;
} }
/**
* bcm47xx_nvram_copy - copy NVRAM to internal buffer
*/
static void bcm47xx_nvram_copy(void __iomem *nvram_start, size_t res_size)
{
struct nvram_header __iomem *header = nvram_start;
size_t copy_size;
copy_size = header->len;
if (copy_size > res_size) {
pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
copy_size = res_size;
}
if (copy_size >= NVRAM_SPACE) {
pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
copy_size, NVRAM_SPACE - 1);
copy_size = NVRAM_SPACE - 1;
}
__ioread32_copy(nvram_buf, nvram_start, DIV_ROUND_UP(copy_size, 4));
nvram_buf[NVRAM_SPACE - 1] = '\0';
nvram_len = copy_size;
}
/** /**
* bcm47xx_nvram_find_and_copy - find NVRAM on flash mapping & copy it * bcm47xx_nvram_find_and_copy - find NVRAM on flash mapping & copy it
*/ */
static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_size) static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_size)
{ {
struct nvram_header __iomem *header;
size_t flash_size; size_t flash_size;
size_t offset; size_t offset;
u32 size; u32 size;
@ -95,23 +118,7 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
return -ENXIO; return -ENXIO;
found: found:
header = (struct nvram_header *)(flash_start + offset); bcm47xx_nvram_copy(flash_start + offset, res_size - offset);
__ioread32_copy(nvram_buf, header, sizeof(*header) / 4);
nvram_len = ((struct nvram_header *)(nvram_buf))->len;
size = res_size - offset;
if (nvram_len > size) {
pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
nvram_len = size;
}
if (nvram_len >= NVRAM_SPACE) {
pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
nvram_len, NVRAM_SPACE - 1);
nvram_len = NVRAM_SPACE - 1;
}
/* proceed reading data after header */
__ioread32_copy(nvram_buf + sizeof(*header), header + 1,
DIV_ROUND_UP(nvram_len, 4));
nvram_buf[NVRAM_SPACE - 1] = '\0';
return 0; return 0;
} }