Commit 94a0535b authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Ralf Baechle
Browse files

MIPS: BCM47xx: Add helper variable for storing NVRAM length 



This simplifies code just a bit (also maybe makes it a bit more
intuitive?) and will allow us to stop storing header. Right now we copy
whole NVRAM including its header to the internal buffer. It is not
needed to store a header as we don't access all these details like CRC,
flags, etc. The next improvement that should follow is copying only the
real contents.

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
Cc: Arend van Spriel <arend@broadcom.com>
Cc: Hante Meuleman <meuleman@broadcom.com>
Patchwork: https://patchwork.linux-mips.org/patch/10535/


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

arch/mips/bcm47xx/nvram.c

+16 −21
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ struct nvram_header { 
};

};





static char nvram_buf[NVRAM_SPACE];

static char nvram_buf[NVRAM_SPACE];

static size_t nvram_len;

static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};

static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};





static u32 find_nvram_size(void __iomem *end)

static u32 find_nvram_size(void __iomem *end)
@@ -60,7 +61,7 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim) 
	u32 *src, *dst;

	u32 *src, *dst;

	u32 size;

	u32 size;





	if (nvram_buf[0]) {

	if (nvram_len) {

		pr_warn("nvram already initialized\n");

		pr_warn("nvram already initialized\n");

		return -EEXIST;

		return -EEXIST;

	}

	}
@@ -99,17 +100,18 @@ found: 
	for (i = 0; i < sizeof(struct nvram_header); i += 4)

	for (i = 0; i < sizeof(struct nvram_header); i += 4)

		*dst++ = __raw_readl(src++);

		*dst++ = __raw_readl(src++);

	header = (struct nvram_header *)nvram_buf;

	header = (struct nvram_header *)nvram_buf;

	if (header->len > size) {

	nvram_len = header->len;

	if (nvram_len > size) {

		pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");

		pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");

		header->len = size;

		nvram_len = size;

	}

	}

	if (header->len >= NVRAM_SPACE) {

	if (nvram_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",

		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 - 1);

		       header->len, NVRAM_SPACE - 1);

		header->len = NVRAM_SPACE - 1;

		nvram_len = NVRAM_SPACE - 1;

	}

	}

	/* proceed reading data after header */

	/* proceed reading data after header */

	for (; i < header->len; i += 4)

	for (; i < nvram_len; i += 4)

		*dst++ = readl(src++);

		*dst++ = readl(src++);

	nvram_buf[NVRAM_SPACE - 1] = '\0';

	nvram_buf[NVRAM_SPACE - 1] = '\0';
@@ -144,7 +146,6 @@ static int nvram_init(void) 
#ifdef CONFIG_MTD

#ifdef CONFIG_MTD

	struct mtd_info *mtd;

	struct mtd_info *mtd;

	struct nvram_header header;

	struct nvram_header header;

	struct nvram_header *pheader;

	size_t bytes_read;

	size_t bytes_read;

	int err;

	int err;
@@ -155,20 +156,16 @@ static int nvram_init(void) 
	err = mtd_read(mtd, 0, sizeof(header), &bytes_read, (uint8_t *)&header);

	err = mtd_read(mtd, 0, sizeof(header), &bytes_read, (uint8_t *)&header);

	if (!err && header.magic == NVRAM_MAGIC &&

	if (!err && header.magic == NVRAM_MAGIC &&

	    header.len > sizeof(header)) {

	    header.len > sizeof(header)) {

		if (header.len >= NVRAM_SPACE) {

		nvram_len = header.len;

		if (nvram_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",

			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);

				header.len, NVRAM_SPACE);

			header.len = NVRAM_SPACE - 1;

			nvram_len = NVRAM_SPACE - 1;

		}

		}





		err = mtd_read(mtd, 0, header.len, &bytes_read,

		err = mtd_read(mtd, 0, nvram_len, &nvram_len,

			       (u8 *)nvram_buf);

			       (u8 *)nvram_buf);

		if (err)

		return err;

		return err;



		pheader = (struct nvram_header *)nvram_buf;

		pheader->len = header.len;

		return 0;

	}

	}

#endif

#endif
@@ -183,7 +180,7 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len) 
	if (!name)

	if (!name)

		return -EINVAL;

		return -EINVAL;





	if (!nvram_buf[0]) {

	if (!nvram_len) {

		err = nvram_init();

		err = nvram_init();

		if (err)

		if (err)

			return err;

			return err;
@@ -231,16 +228,14 @@ char *bcm47xx_nvram_get_contents(size_t *nvram_size) 
{

{

	int err;

	int err;

	char *nvram;

	char *nvram;

	struct nvram_header *header;





	if (!nvram_buf[0]) {

	if (!nvram_len) {

		err = nvram_init();

		err = nvram_init();

		if (err)

		if (err)

			return NULL;

			return NULL;

	}

	}





	header = (struct nvram_header *)nvram_buf;

	*nvram_size = nvram_len - sizeof(struct nvram_header);

	*nvram_size = header->len - sizeof(struct nvram_header);

	nvram = vmalloc(*nvram_size);

	nvram = vmalloc(*nvram_size);

	if (!nvram)

	if (!nvram)

		return NULL;

		return NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE