Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9424
-gerrit
commit 93e8629bcb6f26c5689fbeacef2a2e01f13b5308 Author: Furquan Shaikh furquan@google.com Date: Wed Nov 12 16:19:37 2014 -0800
elog: Fix typecast issues related to 64-bit compilation.
BUG=chrome-os-partner:33764 BRANCH=None TEST=Compiles successfully for ryu and nyan.
Change-Id: I036fd42d5cd4b71bcb68eea0fdd9a4e1aa4711e9 Signed-off-by: Patrick Georgi pgeorgi@chromium.org Original-Commit-Id: 7c3db3d5c8e00b6c273ae240da137062597749aa Original-Change-Id: I5e38966fe06aa3302a7c1b536f5ffd8bb22d4947 Original-Signed-off-by: Furquan Shaikh furquan@google.com Original-Reviewed-on: https://chromium-review.googlesource.com/229413 Original-Reviewed-by: Aaron Durbin adurbin@chromium.org Original-Commit-Queue: Furquan Shaikh furquan@chromium.org Original-Tested-by: Furquan Shaikh furquan@chromium.org --- src/drivers/elog/elog.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index 8bc8a07..f6b0006 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -108,26 +108,11 @@ static inline u32 elog_flash_address_to_offset(u8 *address)
return (u32)address - ((u32)~0UL - rom_size + 1); #else - return (u32)address; + return (u32)(uintptr_t)address; #endif }
/* - * Convert a flash offset into a memory mapped flash address - */ -static inline u8* elog_flash_offset_to_address(u32 offset) -{ - u32 rom_size; - - if (!elog_spi) - return NULL; - - rom_size = get_rom_size(); - - return (u8*)((u32)~0UL - rom_size + 1 + offset); -} - -/* * Pointer to an event log header in the event data area */ static inline struct event_header* @@ -452,6 +437,23 @@ static int elog_shrink(void) }
#ifndef __SMM__ +#if IS_ENABLED(CONFIG_ARCH_X86) + +/* + * Convert a flash offset into a memory mapped flash address + */ +static inline u8 *elog_flash_offset_to_address(u32 offset) +{ + u32 rom_size; + + if (!elog_spi) + return NULL; + + rom_size = get_rom_size(); + + return (u8 *)((u32)~0UL - rom_size + 1 + offset); +} + /* * Fill out SMBIOS Type 15 table entry so the * event log can be discovered at runtime. @@ -492,6 +494,7 @@ int elog_smbios_write_type15(unsigned long *current, int handle) return len; } #endif +#endif
/* * Clear the entire event log