From 10a070b447c2b847352b3fc9b8e23cb51a080309 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Fri, 28 Jun 2013 12:30:53 -0700 Subject: [PATCH] elog: handle ROM_SIZE differences from detected flash size The elog code calculates flash offsets and their equivalent addresses in the memory address space. However, it assumes the detected flash size is entirely mapped into the address space. This can lead to incorrect calculations. Add code to allow ROM_SIZE to be less than detected flash size. The underlying assumption is that the first ROM_SIZE bytes are programmed into the larger device. Change-Id: Id848f136515289b40594b7d3762e26e3e55da62f Signed-off-by: Aaron Durbin Reviewed-on: https://gerrit.chromium.org/gerrit/60501 Reviewed-by: Duncan Laurie Reviewed-on: http://review.coreboot.org/4332 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc --- src/drivers/elog/elog.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index cff78867ce..de349281d6 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -72,14 +72,33 @@ static u16 event_count; static int elog_initialized; static struct spi_flash *elog_spi; + +static inline u32 get_rom_size(void) +{ + u32 rom_size; + + /* Assume the used space of the ROM image starts from 0. The + * physical size of the device may not be completely used. */ + rom_size = elog_spi->size; + if (rom_size > CONFIG_ROM_SIZE) + rom_size = CONFIG_ROM_SIZE; + + return rom_size; +} + /* * Convert a memory mapped flash address into a flash offset */ static inline u32 elog_flash_address_to_offset(u8 *address) { + u32 rom_size; + if (!elog_spi) return 0; - return (u32)address - ((u32)~0UL - elog_spi->size + 1); + + rom_size = get_rom_size(); + + return (u32)address - ((u32)~0UL - rom_size + 1); } /* @@ -87,9 +106,14 @@ static inline u32 elog_flash_address_to_offset(u8 *address) */ static inline u8* elog_flash_offset_to_address(u32 offset) { + u32 rom_size; + if (!elog_spi) return NULL; - return (u8*)((u32)~0UL - elog_spi->size + 1 + offset); + + rom_size = get_rom_size(); + + return (u8*)((u32)~0UL - rom_size + 1 + offset); } /*