GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flashrom: Fix error -EINVAL on mmap() 

Don't calculate "flash_baseaddr" until the final value of "size"
is known, otherwise we end up trying to map a page right after
the end of memory.

Fixes #112.

Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3502 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Segher Boessenkool 2008-08-12 11:58:00 +00:00
parent d133d9a230
commit 716c720468
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/flashrom/flashrom.c
View File

@ -116,14 +116,6 @@ struct flashchip *probe_flash(struct flashchip *flash, int force)
size = flash->total_size * 1024; size = flash->total_size * 1024;
#ifdef TS5300
// FIXME: Wrong place for this decision
// FIXME: This should be autodetected. It is trivial.
flash_baseaddr = 0x9400000;
#else
flash_baseaddr = (0xffffffff - size + 1);
#endif
/* If getpagesize() > size -> /* If getpagesize() > size ->
* "Can't mmap memory using /dev/mem: Invalid argument" * "Can't mmap memory using /dev/mem: Invalid argument"
* This should never happen as we don't support any flash chips * This should never happen as we don't support any flash chips
@ -139,6 +131,14 @@ struct flashchip *probe_flash(struct flashchip *flash, int force)
size = getpagesize(); size = getpagesize();
} }
#ifdef TS5300
// FIXME: Wrong place for this decision
// FIXME: This should be autodetected. It is trivial.
flash_baseaddr = 0x9400000;
#else
flash_baseaddr = (0xffffffff - size + 1);
#endif
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
fd_mem, (off_t) flash_baseaddr); fd_mem, (off_t) flash_baseaddr);
if (bios == MAP_FAILED) { if (bios == MAP_FAILED) {