1 The Netgear wgt634u uses a different format for storing the
2 configuration. This patch is needed to read out the correct
3 configuration. The cfe_env.c file uses a different method way to read
4 out the configuration than the in kernel cfe config reader.
6 --- a/arch/mips/bcm47xx/Makefile
7 +++ b/arch/mips/bcm47xx/Makefile
9 obj-y += irq.o nvram.o prom.o serial.o setup.o time.o sprom.o
14 +++ b/arch/mips/bcm47xx/cfe_env.c
17 + * CFE environment variable access
19 + * Copyright 2001-2003, Broadcom Corporation
20 + * Copyright 2006, Felix Fietkau <nbd@openwrt.org>
22 + * This program is free software; you can redistribute it and/or modify it
23 + * under the terms of the GNU General Public License as published by the
24 + * Free Software Foundation; either version 2 of the License, or (at your
25 + * option) any later version.
28 +#include <linux/init.h>
29 +#include <linux/module.h>
30 +#include <linux/kernel.h>
31 +#include <linux/string.h>
33 +#include <asm/uaccess.h>
35 +#define NVRAM_SIZE (0x1ff0)
36 +static char _nvdata[NVRAM_SIZE];
37 +static char _valuestr[256];
40 + * TLV types. These codes are used in the "type-length-value"
41 + * encoding of the items stored in the NVRAM device (flash or EEPROM)
43 + * The layout of the flash/nvram is as follows:
45 + * <type> <length> <data ...> <type> <length> <data ...> <type_end>
47 + * The type code of "ENV_TLV_TYPE_END" marks the end of the list.
48 + * The "length" field marks the length of the data section, not
49 + * including the type and length fields.
51 + * Environment variables are stored as follows:
53 + * <type_env> <length> <flags> <name> = <value>
55 + * If bit 0 (low bit) is set, the length is an 8-bit value.
56 + * If bit 0 (low bit) is clear, the length is a 16-bit value
58 + * Bit 7 set indicates "user" TLVs. In this case, bit 0 still
59 + * indicates the size of the length field.
61 + * Flags are from the constants below:
64 +#define ENV_LENGTH_16BITS 0x00 /* for low bit */
65 +#define ENV_LENGTH_8BITS 0x01
67 +#define ENV_TYPE_USER 0x80
69 +#define ENV_CODE_SYS(n,l) (((n)<<1)|(l))
70 +#define ENV_CODE_USER(n,l) ((((n)<<1)|(l)) | ENV_TYPE_USER)
73 + * The actual TLV types we support
76 +#define ENV_TLV_TYPE_END 0x00
77 +#define ENV_TLV_TYPE_ENV ENV_CODE_SYS(0,ENV_LENGTH_8BITS)
80 + * Environment variable flags
83 +#define ENV_FLG_NORMAL 0x00 /* normal read/write */
84 +#define ENV_FLG_BUILTIN 0x01 /* builtin - not stored in flash */
85 +#define ENV_FLG_READONLY 0x02 /* read-only - cannot be changed */
87 +#define ENV_FLG_MASK 0xFF /* mask of attributes we keep */
88 +#define ENV_FLG_ADMIN 0x100 /* lets us internally override permissions */
91 +/* *********************************************************************
92 + * _nvram_read(buffer,offset,length)
94 + * Read data from the NVRAM device
97 + * buffer - destination buffer
98 + * offset - offset of data to read
99 + * length - number of bytes to read
102 + * number of bytes read, or <0 if error occured
103 + ********************************************************************* */
105 +_nvram_read(unsigned char *nv_buf, unsigned char *buffer, int offset, int length)
108 + if (offset > NVRAM_SIZE)
111 + for ( i = 0; i < length; i++) {
112 + buffer[i] = ((volatile unsigned char*)nv_buf)[offset + i];
119 +_strnchr(const char *dest,int c,size_t cnt)
121 + while (*dest && (cnt > 0)) {
122 + if (*dest == c) return (char *) dest;
132 + * Core support API: Externally visible.
136 + * Get the value of an NVRAM variable
137 + * @param name name of variable to get
138 + * @return value of variable or NULL if undefined
142 +cfe_env_get(unsigned char *nv_buf, char* name)
145 + unsigned char *buffer;
146 + unsigned char *ptr;
147 + unsigned char *envval;
148 + unsigned int reclen;
149 + unsigned int rectype;
153 + if (!strcmp(name, "nvram_type"))
157 + buffer = &_nvdata[0];
162 + /* Read the record type and length */
163 + if (_nvram_read(nv_buf, ptr,offset,1) != 1) {
167 + while ((*ptr != ENV_TLV_TYPE_END) && (size > 1)) {
169 + /* Adjust pointer for TLV type */
175 + * Read the length. It can be either 1 or 2 bytes
176 + * depending on the code
178 + if (rectype & ENV_LENGTH_8BITS) {
179 + /* Read the record type and length - 8 bits */
180 + if (_nvram_read(nv_buf, ptr,offset,1) != 1) {
188 + /* Read the record type and length - 16 bits, MSB first */
189 + if (_nvram_read(nv_buf, ptr,offset,2) != 2) {
192 + reclen = (((unsigned int) *(ptr)) << 8) + (unsigned int) *(ptr+1);
198 + break; /* should not happen, bad NVRAM */
201 + case ENV_TLV_TYPE_ENV:
202 + /* Read the TLV data */
203 + if (_nvram_read(nv_buf, ptr,offset,reclen) != reclen)
206 + envval = (unsigned char *) _strnchr(ptr,'=',(reclen-1));
209 + memcpy(_valuestr,envval,(reclen-1)-(envval-ptr));
210 + _valuestr[(reclen-1)-(envval-ptr)] = '\0';
212 + printk(KERN_INFO "NVRAM:%s=%s\n", ptr, _valuestr);
214 + if(!strcmp(ptr, name)){
217 + if((strlen(ptr) > 1) && !strcmp(&ptr[1], name))
223 + /* Unknown TLV type, skip it. */
228 + * Advance to next TLV
231 + size -= (int)reclen;
234 + /* Read the next record type */
236 + if (_nvram_read(nv_buf, ptr,offset,1) != 1)
245 --- a/arch/mips/bcm47xx/nvram.c
246 +++ b/arch/mips/bcm47xx/nvram.c
248 #include <asm/mach-bcm47xx/bcm47xx.h>
250 static char nvram_buf[NVRAM_SPACE];
252 +extern char *cfe_env_get(char *nv_buf, const char *name);
254 static u32 find_nvram_size(u32 end)
256 @@ -47,6 +49,26 @@ static int nvram_find_and_copy(u32 base,
262 + /* XXX: hack for supporting the CFE environment stuff on WGT634U */
263 + if (lim >= 8 * 1024 * 1024) {
264 + src = (u32 *) KSEG1ADDR(base + 8 * 1024 * 1024 - 0x2000);
265 + dst = (u32 *) nvram_buf;
267 + if ((*src & 0xff00ff) == 0x000001) {
268 + printk("early_nvram_init: WGT634U NVRAM found.\n");
270 + for (i = 0; i < 0x1ff0; i++) {
271 + if (*src == 0xFFFFFFFF)
280 /* TODO: when nvram is on nand flash check for bad blocks first. */
283 @@ -173,6 +195,13 @@ int bcm47xx_nvram_getenv(char *name, cha
288 + value = cfe_env_get(nvram_buf, name);
291 + return snprintf(val, val_len, "%s", value);
294 /* Look for name=value and return value */
295 var = &nvram_buf[sizeof(struct nvram_header)];
296 end = nvram_buf + sizeof(nvram_buf) - 2;
297 @@ -221,6 +250,9 @@ char *nvram_get(const char *name)
302 + return cfe_env_get(nvram_buf, name);
304 /* Look for name=value and return value */
305 var = &nvram_buf[sizeof(struct nvram_header)];
306 end = nvram_buf + sizeof(nvram_buf) - 2;