Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 341097f1 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Ralf Baechle
Browse files

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: default avatarRafał Miłecki <zajec5@gmail.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8289/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 9d1d0864

arch/mips/bcm47xx/nvram.c

+18 −5
Original line number Diff line number Diff line
@@ -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;

arch/mips/bcm47xx/sprom.c

+14 −0
Original line number Diff line number Diff line
@@ -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)

{

arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h

+1 −34
Original line number Diff line number Diff line
@@ -14,41 +14,8 @@ 
#include <linux/types.h>

#include <linux/kernel.h>



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 */

};



#define NVRAM_HEADER		0x48534C46	/* 'FLSH' */

#define NVRAM_VERSION		1

#define NVRAM_HEADER_SIZE	20

#define NVRAM_SPACE		0x8000



#define FLASH_MIN		0x00020000	/* Minimum flash size */



#define NVRAM_MAX_VALUE_LEN 255

#define NVRAM_MAX_PARAM_LEN 64



int bcm47xx_nvram_init_from_mem(u32 base, u32 lim);

extern int bcm47xx_nvram_getenv(char *name, char *val, size_t val_len);



static inline 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

		printk(KERN_WARNING "Can not parse mac address: %s\n", buf);

}



int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);

int bcm47xx_nvram_gpio_pin(const char *name);



#endif /* __BCM47XX_NVRAM_H */