V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

tools/env: fix environment alignment tests for block devices 

commit 183923d3e4 enforces that the
environment must start at an erase block boundary.

For block devices the sample fw_env.config does not mandate a erase block size
for block devices. A missing setting defaults to the full env size.

Depending on the environment location the alignment check now errors out for
perfectly legal settings.

Fix this by defaulting to the standard blocksize of 0x200 for environments
stored in a block device.
That keeps the fw_env.config files for block devices working even with that
new check.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
This commit is contained in:
Max Krummenacher 2016-11-19 13:58:56 +01:00 committed by Tom Rini
parent d0fc6dc5e9
commit 333ee16d04
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tools/env/fw_env.c vendored
View File

@ -1291,18 +1291,6 @@ static int check_device_config(int dev)
struct stat st; struct stat st;
int fd, rc = 0; int fd, rc = 0;
if (DEVOFFSET(dev) % DEVESIZE(dev) != 0) {
fprintf(stderr, "Environment does not start on (erase) block boundary\n");
errno = EINVAL;
return -1;
}
if (ENVSIZE(dev) > ENVSECTORS(dev) * DEVESIZE(dev)) {
fprintf(stderr, "Environment does not fit into available sectors\n");
errno = EINVAL;
return -1;
}
fd = open(DEVNAME(dev), O_RDONLY); fd = open(DEVNAME(dev), O_RDONLY);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, fprintf(stderr,
@ -1335,9 +1323,15 @@ static int check_device_config(int dev)
goto err; goto err;
} }
DEVTYPE(dev) = mtdinfo.type; DEVTYPE(dev) = mtdinfo.type;
if (DEVESIZE(dev) == 0)
/* Assume the erase size is the same as the env-size */
DEVESIZE(dev) = ENVSIZE(dev);
} else { } else {
uint64_t size; uint64_t size;
DEVTYPE(dev) = MTD_ABSENT; DEVTYPE(dev) = MTD_ABSENT;
if (DEVESIZE(dev) == 0)
/* Assume the erase size to be 512 bytes */
DEVESIZE(dev) = 0x200;
/* /*
* Check for negative offsets, treat it as backwards offset * Check for negative offsets, treat it as backwards offset
@ -1359,6 +1353,22 @@ static int check_device_config(int dev)
} }
} }
if (ENVSECTORS(dev) == 0)
/* Assume enough sectors to cover the environment */
ENVSECTORS(dev) = DIV_ROUND_UP(ENVSIZE(dev), DEVESIZE(dev));
if (DEVOFFSET(dev) % DEVESIZE(dev) != 0) {
fprintf(stderr, "Environment does not start on (erase) block boundary\n");
errno = EINVAL;
return -1;
}
if (ENVSIZE(dev) > ENVSECTORS(dev) * DEVESIZE(dev)) {
fprintf(stderr, "Environment does not fit into available sectors\n");
errno = EINVAL;
return -1;
}
err: err:
close(fd); close(fd);
return rc; return rc;
@ -1382,10 +1392,10 @@ static int parse_config(struct env_opts *opts)
DEVNAME (0) = DEVICE1_NAME; DEVNAME (0) = DEVICE1_NAME;
DEVOFFSET (0) = DEVICE1_OFFSET; DEVOFFSET (0) = DEVICE1_OFFSET;
ENVSIZE (0) = ENV1_SIZE; ENVSIZE (0) = ENV1_SIZE;
/* Default values are: erase-size=env-size */
DEVESIZE (0) = ENVSIZE (0); /* Set defaults for DEVESIZE, ENVSECTORS later once we
/* #sectors=env-size/erase-size (rounded up) */ * know DEVTYPE
ENVSECTORS (0) = (ENVSIZE(0) + DEVESIZE(0) - 1) / DEVESIZE(0); */
#ifdef DEVICE1_ESIZE #ifdef DEVICE1_ESIZE
DEVESIZE (0) = DEVICE1_ESIZE; DEVESIZE (0) = DEVICE1_ESIZE;
#endif #endif
@ -1397,10 +1407,10 @@ static int parse_config(struct env_opts *opts)
DEVNAME (1) = DEVICE2_NAME; DEVNAME (1) = DEVICE2_NAME;
DEVOFFSET (1) = DEVICE2_OFFSET; DEVOFFSET (1) = DEVICE2_OFFSET;
ENVSIZE (1) = ENV2_SIZE; ENVSIZE (1) = ENV2_SIZE;
/* Default values are: erase-size=env-size */
DEVESIZE (1) = ENVSIZE (1); /* Set defaults for DEVESIZE, ENVSECTORS later once we
/* #sectors=env-size/erase-size (rounded up) */ * know DEVTYPE
ENVSECTORS (1) = (ENVSIZE(1) + DEVESIZE(1) - 1) / DEVESIZE(1); */
#ifdef DEVICE2_ESIZE #ifdef DEVICE2_ESIZE
DEVESIZE (1) = DEVICE2_ESIZE; DEVESIZE (1) = DEVICE2_ESIZE;
#endif #endif
@ -1466,13 +1476,9 @@ static int get_config (char *fname)
DEVNAME(i) = devname; DEVNAME(i) = devname;
if (rc < 4) /* Set defaults for DEVESIZE, ENVSECTORS later once we
/* Assume the erase size is the same as the env-size */ * know DEVTYPE
DEVESIZE(i) = ENVSIZE(i); */
if (rc < 5)
/* Assume enough env sectors to cover the environment */
ENVSECTORS (i) = (ENVSIZE(i) + DEVESIZE(i) - 1) / DEVESIZE(i);
i++; i++;
} }