diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2014-10-30 12:50:03 +0100 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-11-24 07:45:08 +0100 |
commit | 341097f17c76b3dd39539526a2af9e7fff43705e (patch) | |
tree | 0b86e1c6e555ebc92c44f2f9297384a2eb706637 /arch/mips/bcm47xx | |
parent | 9d1d08646af4491aec41d40341930b9bfd62ffa9 (diff) | |
download | linux-341097f17c76b3dd39539526a2af9e7fff43705e.tar.gz linux-341097f17c76b3dd39539526a2af9e7fff43705e.tar.bz2 linux-341097f17c76b3dd39539526a2af9e7fff43705e.zip |
MIPS: BCM47XX: Clean up nvram header
1) Move private defines to the .c file
2) Move SPROM helper to the sprom.c
3) Drop unused code
4) Rename magic to the NVRAM_MAGIC
5) Add const to the char pointer we never modify
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8289/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/bcm47xx')
-rw-r--r-- | arch/mips/bcm47xx/nvram.c | 23 | ||||
-rw-r--r-- | arch/mips/bcm47xx/sprom.c | 14 |
2 files changed, 32 insertions, 5 deletions
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c index 8b6499100db3..c5c381c43f17 100644 --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c @@ -18,6 +18,19 @@ #include <linux/mtd/mtd.h> #include <bcm47xx_nvram.h> +#define NVRAM_MAGIC 0x48534C46 /* 'FLSH' */ +#define NVRAM_SPACE 0x8000 + +#define FLASH_MIN 0x00020000 /* Minimum flash size */ + +struct nvram_header { + u32 magic; + u32 len; + u32 crc_ver_init; /* 0:7 crc, 8:15 ver, 16:31 sdram_init */ + u32 config_refresh; /* 0:15 sdram_config, 16:31 sdram_refresh */ + u32 config_ncdl; /* ncdl values for memc */ +}; + static char nvram_buf[NVRAM_SPACE]; static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000}; @@ -28,7 +41,7 @@ static u32 find_nvram_size(void __iomem *end) for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) { header = (struct nvram_header *)(end - nvram_sizes[i]); - if (header->magic == NVRAM_HEADER) + if (header->magic == NVRAM_MAGIC) return nvram_sizes[i]; } @@ -63,13 +76,13 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim) /* Try embedded NVRAM at 4 KB and 1 KB as last resorts */ header = (struct nvram_header *)(iobase + 4096); - if (header->magic == NVRAM_HEADER) { + if (header->magic == NVRAM_MAGIC) { size = NVRAM_SPACE; goto found; } header = (struct nvram_header *)(iobase + 1024); - if (header->magic == NVRAM_HEADER) { + if (header->magic == NVRAM_MAGIC) { size = NVRAM_SPACE; goto found; } @@ -139,7 +152,7 @@ static int nvram_init(void) err = mtd_read(mtd, from, sizeof(header), &bytes_read, (uint8_t *)&header); - if (!err && header.magic == NVRAM_HEADER) { + if (!err && header.magic == NVRAM_MAGIC) { u8 *dst = (uint8_t *)nvram_buf; size_t len = header.len; @@ -162,7 +175,7 @@ static int nvram_init(void) return -ENXIO; } -int bcm47xx_nvram_getenv(char *name, char *val, size_t val_len) +int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len) { char *var, *value, *end, *eq; int err; diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c index e772e775c797..2eff7fe99c6b 100644 --- a/arch/mips/bcm47xx/sprom.c +++ b/arch/mips/bcm47xx/sprom.c @@ -136,6 +136,20 @@ static void nvram_read_leddc(const char *prefix, const char *name, *leddc_off_time = (val >> 16) & 0xff; } +static void bcm47xx_nvram_parse_macaddr(char *buf, u8 macaddr[6]) +{ + if (strchr(buf, ':')) + sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], + &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4], + &macaddr[5]); + else if (strchr(buf, '-')) + sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0], + &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4], + &macaddr[5]); + else + pr_warn("Can not parse mac address: %s\n", buf); +} + static void nvram_read_macaddr(const char *prefix, const char *name, u8 val[6], bool fallback) { |