Commit 0d29b606 authored by Segher Boessenkool's avatar Segher Boessenkool
Browse files

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.

Corresponding to flashrom svn r308 and coreboot v2 svn r3502.
Signed-off-by: default avatarSegher Boessenkool <segher@kernel.crashing.org>
Acked-by: default avatarStefan Reinauer <stepan@coresystems.de>
parent bff9bf24
......@@ -116,14 +116,6 @@ struct flashchip *probe_flash(struct flashchip *flash, int force)
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 ->
* "Can't mmap memory using /dev/mem: Invalid argument"
* 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();
}
#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,
fd_mem, (off_t) flash_baseaddr);
if (bios == MAP_FAILED) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment