From 0d29b60641438d4383eec5410a31c3acaa9f807a Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Tue, 12 Aug 2008 11:58:00 +0000 Subject: 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: Segher Boessenkool Acked-by: Stefan Reinauer --- flashrom.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 4fd509c3..03a8eeb6 100644 --- a/flashrom.c +++ b/flashrom.c @@ -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) { -- cgit v1.2.3