coreboot-gerrit November 2013

coreboot-gerrit@coreboot.org

1 participants
856 discussions

Patch set updated for coreboot: 812a589 peppy: Add an inverted input GPIO type
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4247 -gerrit commit 812a5895f3e1fd240029585f62554076c4f0662a Author: Shawn Nematbakhsh <shawnn(a)google.com> Date: Tue Jun 11 20:30:09 2013 -0700 peppy: Add an inverted input GPIO type The wake device input pins are active low and the GPIOs need to be set as inverted when they are marked as an input so they are not spuriously logged. Also sync pin states from Falco initial commit. Reference change: I15d38dcc9b2fb4b2b0eb27da358fa3c343e22323 Change-Id: I66e136d389d53a367436d816fa84dacdc8e86bad Reviewed-on: https://gerrit.chromium.org/gerrit/58334 Tested-by: Shawn Nematbakhsh <shawnn(a)chromium.org> Reviewed-by: Dave Parker <dparker(a)chromium.org> Commit-Queue: Shawn Nematbakhsh <shawnn(a)chromium.org> Signed-off-by: Shawn Nematbakhsh <shawnn(a)google.com> --- src/mainboard/google/peppy/gpio.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mainboard/google/peppy/gpio.h b/src/mainboard/google/peppy/gpio.h index 6dfb98f..5cf1d3a 100644 --- a/src/mainboard/google/peppy/gpio.h +++ b/src/mainboard/google/peppy/gpio.h @@ -35,7 +35,7 @@ const struct pch_lp_gpio_map mainboard_gpio_map[] = { LP_GPIO_INPUT, /* 9: RAM_ID1 */ LP_GPIO_ACPI_SCI, /* 10: WLAN_WAKE_L_Q */ LP_GPIO_UNUSED, /* 11: UNUSED */ - LP_GPIO_IRQ_EDGE, /* 12: TRACKPAD_INT_L */ + LP_GPIO_INPUT_INVERT, /* 12: TRACKPAD_INT_L (WAKE) */ LP_GPIO_INPUT, /* 13: RAM_ID0 */ LP_GPIO_INPUT, /* 14: EC_IN_RW */ LP_GPIO_UNUSED, /* 15: UNUSED (STRAP) */ @@ -48,7 +48,7 @@ const struct pch_lp_gpio_map mainboard_gpio_map[] = { LP_GPIO_UNUSED, /* 22: UNUSED */ LP_GPIO_UNUSED, /* 23: UNUSED */ LP_GPIO_UNUSED, /* 24: UNUSED */ - LP_GPIO_IRQ_EDGE, /* 25: TOUCH_INT_L */ + LP_GPIO_INPUT_INVERT, /* 25: TOUCH_INT_L (WAKE) */ LP_GPIO_UNUSED, /* 26: UNUSED */ LP_GPIO_UNUSED, /* 27: UNUSED */ LP_GPIO_UNUSED, /* 28: UNUSED */ @@ -74,10 +74,10 @@ const struct pch_lp_gpio_map mainboard_gpio_map[] = { LP_GPIO_UNUSED, /* 48: UNUSED */ LP_GPIO_OUT_LOW, /* 49: PP3300_SSD_IO_EN (iSSD VCC_IO) */ LP_GPIO_UNUSED, /* 50: UNUSED */ - LP_GPIO_IRQ_EDGE, /* 51: ALS_INT_L */ - LP_GPIO_IRQ_EDGE, /* 52: SIM_DET */ - LP_GPIO_ACPI_SCI, /* 53: TRACKPAD_INT_DX (WAKE) */ - LP_GPIO_ACPI_SCI, /* 54: TOUCH_INT_L_DX (WAKE) */ + LP_GPIO_INPUT, /* 51: ALS_INT_L */ + LP_GPIO_INPUT, /* 52: SIM_DET */ + LP_GPIO_PIRQ, /* 53: TRACKPAD_INT_DX */ + LP_GPIO_PIRQ, /* 54: TOUCH_INT_L_DX */ LP_GPIO_UNUSED, /* 55: UNUSED */ LP_GPIO_UNUSED, /* 56: UNUSED */ LP_GPIO_OUT_HIGH, /* 57: PP3300_CCD_EN */

1 0

Patch set updated for coreboot: 3263cdd falco/slippy: Fix DMIC nid verb.
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4246 -gerrit commit 3263cddc98bf184c31c3d9b0857df66bc4296afa Author: Dylan Reid <dgreid(a)chromium.org> Date: Fri Jun 14 11:50:35 2013 -0700 falco/slippy: Fix DMIC nid verb. Set nid 0x12 instead of nid 0x05. The DMIC is on NIC 0x12. Change-Id: Ifc883b65a50aeec6a6d3ad02fe8418f124e6241d Signed-off-by: Dylan Reid <dgreid(a)chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/58711 Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Commit-Queue: Duncan Laurie <dlaurie(a)chromium.org> Tested-by: Duncan Laurie <dlaurie(a)chromium.org> Reviewed-by: Jay Kim <yongjaek(a)chromium.org> Tested-by: Jay Kim <yongjaek(a)chromium.org> --- src/mainboard/google/falco/hda_verb.h | 8 ++++---- src/mainboard/google/slippy/hda_verb.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mainboard/google/falco/hda_verb.h b/src/mainboard/google/falco/hda_verb.h index 3866a51..958b6c2 100644 --- a/src/mainboard/google/falco/hda_verb.h +++ b/src/mainboard/google/falco/hda_verb.h @@ -32,10 +32,10 @@ static const u32 mainboard_cim_verb_data[] = { /* Pin Widget Verb Table */ /* Pin Complex (NID 0x12) DMIC - interior mobile lid */ - 0x00571c10, - 0x00571d10, - 0x00571ea6, - 0x00571fb7, + 0x01271c10, + 0x01271d10, + 0x01271ea6, + 0x01271fb7, /* Pin Complex (NID 0x14) SPKR-OUT PORTD */ 0x01471c10, // group 1, front left/right diff --git a/src/mainboard/google/slippy/hda_verb.h b/src/mainboard/google/slippy/hda_verb.h index 3866a51..958b6c2 100644 --- a/src/mainboard/google/slippy/hda_verb.h +++ b/src/mainboard/google/slippy/hda_verb.h @@ -32,10 +32,10 @@ static const u32 mainboard_cim_verb_data[] = { /* Pin Widget Verb Table */ /* Pin Complex (NID 0x12) DMIC - interior mobile lid */ - 0x00571c10, - 0x00571d10, - 0x00571ea6, - 0x00571fb7, + 0x01271c10, + 0x01271d10, + 0x01271ea6, + 0x01271fb7, /* Pin Complex (NID 0x14) SPKR-OUT PORTD */ 0x01471c10, // group 1, front left/right

1 0

Patch set updated for coreboot: 9a8e3eb elog: Get rid of the descriptor type and some unnecessary wrappers
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4245 -gerrit commit 9a8e3eb5d6e4e777b658f3b97bcb41794fe6f42a Author: Gabe Black <gabeblack(a)google.com> Date: Fri Apr 26 03:34:00 2013 -0700 elog: Get rid of the descriptor type and some unnecessary wrappers There was always exactly one elog descriptor declared and initialized, but its contents were being accessed through a pointer that was passed back and forth between functions instead of being accessed directly. This made the code more verbose than it needed to be and harder to follow. To address this the descriptor type was eliminated, its contents were turned into individual global variables, and various functions were adjusted to no longer take the descriptor as an argument. Similarly, the code was more verbose and complicated than it needed to be because of several wrapper functions which wrapped a single line of code which called an underlying function with particular arguments and were only used once. This makes it harder to tell what the code is doing because the call to the real function you may already be familiar with is obscured behind a new function you've never seen before. It also adds one more text to the file as a whole while providing at best a marginal benefit. Those functions were removed and their callers now call their contents directly. Built and booted on Link. Ran mosys eventlog list. Cleared the event log and ran mosys eventlog list again. Added 2000 events and ran mosys eventlog list. Cleared the log again and ran mosys eventlog list. Change-Id: I4f5f6b9f4f508548077b7f5a92f4322db99e01ca Signed-off-by: Gabe Black <gabeblack(a)google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/49310 Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Commit-Queue: Gabe Black <gabeblack(a)chromium.org> Tested-by: Gabe Black <gabeblack(a)chromium.org> --- src/drivers/elog/elog.c | 265 ++++++++++++++++----------------------- src/drivers/elog/elog_internal.h | 19 +-- 2 files changed, 115 insertions(+), 169 deletions(-) diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index 7786d3b..cff7886 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -57,14 +57,20 @@ /* * Static variables for ELOG state */ +static struct elog_area *elog_area; +static u16 total_size; +static u16 log_size; +static u32 flash_base; + +static elog_area_state area_state; +static elog_header_state header_state; +static elog_event_buffer_state event_buffer_state; + +static u16 next_event_offset; +static u16 event_count; + static int elog_initialized; static struct spi_flash *elog_spi; -static struct elog_descriptor elog_flash_area; - -static inline struct elog_descriptor* elog_get_flash(void) -{ - return &elog_flash_area; -} /* * Convert a memory mapped flash address into a flash offset @@ -87,30 +93,12 @@ static inline u8* elog_flash_offset_to_address(u32 offset) } /* - * The ELOG header is at the very beginning of the area - */ -static inline struct elog_header* -elog_get_header(struct elog_descriptor *elog) -{ - return elog->backing_store; -} - -/* * Pointer to an event log header in the event data area */ static inline struct event_header* -elog_get_event_base(struct elog_descriptor *elog, u32 offset) +elog_get_event_base(u32 offset) { - return (struct event_header *)&elog->data[offset]; -} - -/* - * Pointer to where the next event should be stored - */ -static inline struct event_header* -elog_get_next_event_base(struct elog_descriptor *elog) -{ - return elog_get_event_base(elog, elog->next_event_offset); + return (struct event_header *)&elog_area->data[offset]; } /* @@ -138,7 +126,7 @@ static u8 elog_checksum_event(struct event_header *event) /* * Check if a raw buffer is filled with ELOG_TYPE_EOL byte */ -static int elog_is_buffer_clear(u8 *base, u32 size) +static int elog_is_buffer_clear(void *base, u32 size) { u8 *current = base; u8 *end = current + size; @@ -153,25 +141,17 @@ static int elog_is_buffer_clear(u8 *base, u32 size) } /* - * Verify whether ELOG area is filled with ELOG_TYPE_EOL byte - */ -static int elog_is_area_clear(struct elog_descriptor *elog) -{ - return elog_is_buffer_clear(elog->backing_store, elog->total_size); -} - -/* * Check that the ELOG area has been initialized and is valid. */ -static int elog_is_area_valid(struct elog_descriptor *elog) +static int elog_is_area_valid(void) { elog_debug("elog_is_area_valid()\n"); - if (elog->area_state != ELOG_AREA_HAS_CONTENT) + if (area_state != ELOG_AREA_HAS_CONTENT) return 0; - if (elog->header_state != ELOG_HEADER_VALID) + if (header_state != ELOG_HEADER_VALID) return 0; - if (elog->event_buffer_state != ELOG_EVENT_BUFFER_OK) + if (event_buffer_state != ELOG_EVENT_BUFFER_OK) return 0; return 1; } @@ -205,17 +185,17 @@ static int elog_is_header_valid(struct elog_header *header) /* * Validate the event header and data. */ -static int elog_is_event_valid(struct elog_descriptor *elog, u32 offset) +static int elog_is_event_valid(u32 offset) { struct event_header *event; - event = elog_get_event_base(elog, offset); + event = elog_get_event_base(offset); if (!event) return 0; /* Validate event length */ if ((offsetof(struct event_header, type) + - sizeof(event->type) - 1 + offset) >= elog->data_size) + sizeof(event->type) - 1 + offset) >= log_size) return 0; /* End of event marker has been found */ @@ -224,14 +204,14 @@ static int elog_is_event_valid(struct elog_descriptor *elog, u32 offset) /* Check if event fits in area */ if ((offsetof(struct event_header, length) + - sizeof(event->length) - 1 + offset) >= elog->data_size) + sizeof(event->length) - 1 + offset) >= log_size) return 0; /* * If the current event length + the current offset exceeds * the area size then the event area is corrupt. */ - if ((event->length + offset) >= elog->data_size) + if ((event->length + offset) >= log_size) return 0; /* Event length must be at least header size + checksum */ @@ -251,16 +231,15 @@ static int elog_is_event_valid(struct elog_descriptor *elog, u32 offset) * store into flash. This will not erase the flash and it assumes the flash * area has been erased appropriately. */ -static void elog_flash_write(u8 *address, u32 size) +static void elog_flash_write(void *address, u32 size) { - struct elog_descriptor *flash = elog_get_flash(); u32 offset; if (!address || !size || !elog_spi) return; - offset = flash->flash_base; - offset += address - (u8*)flash->backing_store; + offset = flash_base; + offset += (u8 *)address - (u8 *)elog_area; elog_debug("elog_flash_write(address=0x%p offset=0x%08x size=%u)\n", address, offset, size); @@ -273,16 +252,15 @@ static void elog_flash_write(u8 *address, u32 size) * Erase the first block specified in the address. * Only handles flash area within a single flash block. */ -static void elog_flash_erase(u8 *address, u32 size) +static void elog_flash_erase(void *address, u32 size) { - struct elog_descriptor *flash = elog_get_flash(); u32 offset; if (!address || !size || !elog_spi) return; - offset = flash->flash_base; - offset += address - (u8*)flash->backing_store; + offset = flash_base; + offset += (u8 *)address - (u8*)elog_area; elog_debug("elog_flash_erase(address=0x%p offset=0x%08x size=%u)\n", address, offset, size); @@ -292,10 +270,9 @@ static void elog_flash_erase(u8 *address, u32 size) } /* - * Scan the event area and validate each entry and - * update the ELOG descriptor state. + * Scan the event area and validate each entry and update the ELOG state. */ -static void elog_update_event_buffer_state(struct elog_descriptor *elog) +static void elog_update_event_buffer_state(void) { u32 count = 0; u32 offset = 0; @@ -305,12 +282,12 @@ static void elog_update_event_buffer_state(struct elog_descriptor *elog) /* Go through each event and validate it */ while (1) { - event = elog_get_event_base(elog, offset); + event = elog_get_event_base(offset); /* Do not de-reference anything past the area length */ if ((offsetof(struct event_header, type) + - sizeof(event->type) - 1 + offset) >= elog->data_size) { - elog->event_buffer_state = ELOG_EVENT_BUFFER_CORRUPTED; + sizeof(event->type) - 1 + offset) >= log_size) { + event_buffer_state = ELOG_EVENT_BUFFER_CORRUPTED; break; } @@ -319,8 +296,8 @@ static void elog_update_event_buffer_state(struct elog_descriptor *elog) break; /* Validate the event */ - if (!elog_is_event_valid(elog, offset)) { - elog->event_buffer_state = ELOG_EVENT_BUFFER_CORRUPTED; + if (!elog_is_event_valid(offset)) { + event_buffer_state = ELOG_EVENT_BUFFER_CORRUPTED; break; } @@ -330,67 +307,62 @@ static void elog_update_event_buffer_state(struct elog_descriptor *elog) } /* Ensure the remaining buffer is empty */ - if (!elog_is_buffer_clear(&elog->data[offset], - elog->data_size - offset)) - elog->event_buffer_state = ELOG_EVENT_BUFFER_CORRUPTED; + if (!elog_is_buffer_clear(&elog_area->data[offset], log_size - offset)) + event_buffer_state = ELOG_EVENT_BUFFER_CORRUPTED; - /* Update data into elog descriptor */ - elog->event_count = count; - elog->next_event_offset = offset; + /* Update ELOG state */ + event_count = count; + next_event_offset = offset; } -/* - * (Re)initialize a new ELOG descriptor - */ -static void elog_scan_flash(struct elog_descriptor *elog) +static void elog_scan_flash(void) { elog_debug("elog_scan_flash()\n"); - elog->area_state = ELOG_AREA_UNDEFINED; - elog->header_state = ELOG_HEADER_INVALID; - elog->event_buffer_state = ELOG_EVENT_BUFFER_OK; + area_state = ELOG_AREA_UNDEFINED; + header_state = ELOG_HEADER_INVALID; + event_buffer_state = ELOG_EVENT_BUFFER_OK; /* Fill memory buffer by reading from SPI */ - elog_spi->read(elog_spi, elog->flash_base, elog->total_size, - elog->backing_store); + elog_spi->read(elog_spi, flash_base, total_size, elog_area); - elog->next_event_offset = 0; - elog->event_count = 0; + next_event_offset = 0; + event_count = 0; /* Check if the area is empty or not */ - if (elog_is_area_clear(elog)) { - elog->area_state = ELOG_AREA_EMPTY; + if (elog_is_buffer_clear(elog_area, total_size)) { + area_state = ELOG_AREA_EMPTY; return; } - elog->area_state = ELOG_AREA_HAS_CONTENT; + area_state = ELOG_AREA_HAS_CONTENT; /* Validate the header */ - if (!elog_is_header_valid(elog_get_header(elog))) { - elog->header_state = ELOG_HEADER_INVALID; + if (!elog_is_header_valid(&elog_area->header)) { + header_state = ELOG_HEADER_INVALID; return; } - elog->header_state = ELOG_HEADER_VALID; - elog_update_event_buffer_state(elog); + header_state = ELOG_HEADER_VALID; + elog_update_event_buffer_state(); } -static void elog_prepare_empty(struct elog_descriptor *elog) +static void elog_prepare_empty(void) { struct elog_header *header; - elog_debug("elog_prepare_empty(%u bytes)\n", data_size); + elog_debug("elog_prepare_empty()\n"); /* Write out the header */ - header = elog_get_header(elog); + header = &elog_area->header; header->magic = ELOG_SIGNATURE; header->version = ELOG_VERSION; header->header_size = sizeof(struct elog_header); header->reserved[0] = ELOG_TYPE_EOL; header->reserved[1] = ELOG_TYPE_EOL; - elog_flash_write(elog->backing_store, header->header_size); + elog_flash_write(elog_area, header->header_size); - elog_scan_flash(elog); + elog_scan_flash(); } /* @@ -399,7 +371,6 @@ static void elog_prepare_empty(struct elog_descriptor *elog) */ static int elog_shrink(void) { - struct elog_descriptor *flash = elog_get_flash(); struct event_header *event; u16 discard_count = 0; u16 offset = 0; @@ -407,7 +378,7 @@ static int elog_shrink(void) elog_debug("elog_shrink()\n"); - if (flash->next_event_offset < CONFIG_ELOG_SHRINK_SIZE) + if (next_event_offset < CONFIG_ELOG_SHRINK_SIZE) return 0; while (1) { @@ -415,7 +386,7 @@ static int elog_shrink(void) if (offset > CONFIG_ELOG_SHRINK_SIZE) break; - event = elog_get_event_base(flash, offset); + event = elog_get_event_base(offset); /* Reached the end of the area */ if (!event || event->type == ELOG_TYPE_EOL) @@ -425,17 +396,16 @@ static int elog_shrink(void) discard_count++; } - new_size = flash->next_event_offset - offset; - memmove(&flash->data[0], &flash->data[offset], new_size); - memset(&flash->data[new_size], ELOG_TYPE_EOL, - flash->data_size - new_size); + new_size = next_event_offset - offset; + memmove(&elog_area->data[0], &elog_area->data[offset], new_size); + memset(&elog_area->data[new_size], ELOG_TYPE_EOL, log_size - new_size); - elog_flash_erase(flash->backing_store, flash->total_size); - elog_flash_write(flash->backing_store, flash->total_size); - elog_scan_flash(flash); + elog_flash_erase(elog_area, total_size); + elog_flash_write(elog_area, total_size); + elog_scan_flash(); /* Ensure the area was successfully erased */ - if (flash->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) { + if (next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) { printk(BIOS_ERR, "ELOG: Flash area was not erased!\n"); return -1; } @@ -453,23 +423,22 @@ static int elog_shrink(void) */ int elog_smbios_write_type15(unsigned long *current, int handle) { - struct elog_descriptor *flash = elog_get_flash(); struct smbios_type15 *t = (struct smbios_type15 *)*current; int len = sizeof(struct smbios_type15); #if CONFIG_ELOG_CBMEM /* Save event log buffer into CBMEM for the OS to read */ - void *cbmem = cbmem_add(CBMEM_ID_ELOG, flash->total_size); + void *cbmem = cbmem_add(CBMEM_ID_ELOG, total_size); if (!cbmem) return 0; - memcpy(cbmem, flash->backing_store, flash->total_size); + memcpy(cbmem, elog_area, total_size); #endif memset(t, 0, len); t->type = SMBIOS_EVENT_LOG; t->length = len - 2; t->handle = handle; - t->area_length = flash->total_size - 1; + t->area_length = total_size - 1; t->header_offset = 0; t->data_offset = sizeof(struct elog_header); t->access_method = SMBIOS_EVENTLOG_ACCESS_METHOD_MMIO32; @@ -478,7 +447,7 @@ int elog_smbios_write_type15(unsigned long *current, int handle) #if CONFIG_ELOG_CBMEM t->address = (u32)cbmem; #else - t->address = (u32)elog_flash_offset_to_address(flash->flash_base); + t->address = (u32)elog_flash_offset_to_address(flash_base); #endif t->header_format = ELOG_HEADER_TYPE_OEM; t->log_type_descriptors = 0; @@ -494,8 +463,6 @@ int elog_smbios_write_type15(unsigned long *current, int handle) */ int elog_clear(void) { - struct elog_descriptor *flash = elog_get_flash(); - elog_debug("elog_clear()\n"); /* Make sure ELOG structures are initialized */ @@ -503,44 +470,45 @@ int elog_clear(void) return -1; /* Erase flash area */ - elog_flash_erase(flash->backing_store, flash->total_size); - elog_prepare_empty(flash); + elog_flash_erase(elog_area, total_size); + elog_prepare_empty(); - if (!elog_is_area_valid(flash)) + if (!elog_is_area_valid()) return -1; /* Log the clear event */ - elog_add_event_word(ELOG_TYPE_LOG_CLEAR, flash->total_size); + elog_add_event_word(ELOG_TYPE_LOG_CLEAR, total_size); return 0; } -static void elog_find_flash(u32 *base, int *size) +static void elog_find_flash(void) { #if CONFIG_CHROMEOS u8 *flash_base_ptr; #endif - elog_debug("elog_find_flash(base = %p, size = %p)\n", base, size); + elog_debug("elog_find_flash()\n"); #if CONFIG_CHROMEOS /* Find the ELOG base and size in FMAP */ - *size = find_fmap_entry("RW_ELOG", (void **)&flash_base_ptr); - if (*size < 0) { + total_size = find_fmap_entry("RW_ELOG", (void **)&flash_base_ptr); + if (total_size < 0) { printk(BIOS_WARNING, "ELOG: Unable to find RW_ELOG in FMAP, " "using CONFIG_ELOG_FLASH_BASE instead\n"); - *size = CONFIG_ELOG_AREA_SIZE; + total_size = CONFIG_ELOG_AREA_SIZE; } else { - *base = elog_flash_address_to_offset(flash_base_ptr); + flash_base = elog_flash_address_to_offset(flash_base_ptr); /* Use configured size if smaller than FMAP size */ - if (*size > CONFIG_ELOG_AREA_SIZE) - *size = CONFIG_ELOG_AREA_SIZE; + if (total_size > CONFIG_ELOG_AREA_SIZE) + total_size = CONFIG_ELOG_AREA_SIZE; } #else - *base = CONFIG_ELOG_FLASH_BASE; - *size = CONFIG_ELOG_AREA_SIZE; + flash_base = CONFIG_ELOG_FLASH_BASE; + total_size = CONFIG_ELOG_AREA_SIZE; #endif + log_size = total_size - sizeof(struct elog_header); } /* @@ -548,10 +516,6 @@ static void elog_find_flash(u32 *base, int *size) */ int elog_init(void) { - struct elog_descriptor *flash = elog_get_flash(); - u32 flash_base = CONFIG_ELOG_FLASH_BASE; - int flash_size = CONFIG_ELOG_AREA_SIZE; - if (elog_initialized) return 0; @@ -566,41 +530,35 @@ int elog_init(void) } /* Set up the backing store */ - elog_find_flash(&flash_base, &flash_size); + elog_find_flash(); if (flash_base == 0) { printk(BIOS_ERR, "ELOG: Invalid flash base\n"); return -1; } - flash->backing_store = malloc(flash_size); - if (!flash->backing_store) { + elog_area = malloc(total_size); + if (!elog_area) { printk(BIOS_ERR, "ELOG: Unable to allocate backing store\n"); return -1; } - flash->flash_base = flash_base; - flash->total_size = flash_size; - - /* Data starts immediately after header */ - flash->data = flash->backing_store + sizeof(struct elog_header); - flash->data_size = flash_size - sizeof(struct elog_header); /* Load the log from flash */ - elog_scan_flash(flash); + elog_scan_flash(); /* Prepare the flash if necessary */ - if (flash->header_state == ELOG_HEADER_INVALID || - flash->event_buffer_state == ELOG_EVENT_BUFFER_CORRUPTED) { + if (header_state == ELOG_HEADER_INVALID || + event_buffer_state == ELOG_EVENT_BUFFER_CORRUPTED) { /* If the header is invalid or the events are corrupted, * no events can be salvaged so erase the entire area. */ printk(BIOS_ERR, "ELOG: flash area invalid\n"); - elog_flash_erase(flash->backing_store, flash->total_size); - elog_prepare_empty(flash); + elog_flash_erase(elog_area, total_size); + elog_prepare_empty(); } - if (flash->area_state == ELOG_AREA_EMPTY) - elog_prepare_empty(flash); + if (area_state == ELOG_AREA_EMPTY) + elog_prepare_empty(); - if (!elog_is_area_valid(flash)) { + if (!elog_is_area_valid()) { printk(BIOS_ERR, "ELOG: Unable to prepare flash\n"); return -1; } @@ -608,18 +566,18 @@ int elog_init(void) elog_initialized = 1; printk(BIOS_INFO, "ELOG: FLASH @0x%p [SPI 0x%08x]\n", - flash->backing_store, flash->flash_base); + elog_area, flash_base); printk(BIOS_INFO, "ELOG: area is %d bytes, full threshold %d," - " shrink size %d\n", flash_size, + " shrink size %d\n", total_size, CONFIG_ELOG_FULL_THRESHOLD, CONFIG_ELOG_SHRINK_SIZE); /* Log a clear event if necessary */ - if (flash->event_count == 0) - elog_add_event_word(ELOG_TYPE_LOG_CLEAR, flash->total_size); + if (event_count == 0) + elog_add_event_word(ELOG_TYPE_LOG_CLEAR, total_size); /* Shrink the log if we are getting too full */ - if (flash->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) + if (next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) if (elog_shrink() < 0) return -1; @@ -666,7 +624,6 @@ static void elog_fill_timestamp(struct event_header *event) void elog_add_event_raw(u8 event_type, void *data, u8 data_size) { struct event_header *event; - struct elog_descriptor *flash = elog_get_flash(); u8 event_size; elog_debug("elog_add_event_raw(type=%X)\n", event_type); @@ -684,14 +641,14 @@ void elog_add_event_raw(u8 event_type, void *data, u8 data_size) } /* Make sure event data can fit */ - if ((flash->next_event_offset + event_size) >= flash->data_size) { + if ((next_event_offset + event_size) >= log_size) { printk(BIOS_ERR, "ELOG: Event(%X) does not fit\n", event_type); return; } /* Fill out event data */ - event = elog_get_next_event_base(flash); + event = elog_get_event_base(next_event_offset); event->type = event_type; event->length = event_size; elog_fill_timestamp(event); @@ -703,18 +660,18 @@ void elog_add_event_raw(u8 event_type, void *data, u8 data_size) elog_update_checksum(event, 0); elog_update_checksum(event, -(elog_checksum_event(event))); - /* Update memory descriptor parameters */ - flash->event_count++; + /* Update the ELOG state */ + event_count++; elog_flash_write((void *)event, event_size); - flash->next_event_offset += event_size; + next_event_offset += event_size; printk(BIOS_INFO, "ELOG: Event(%X) added with size %d\n", event_type, event_size); /* Shrink the log if we are getting too full */ - if (flash->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) + if (next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) elog_shrink(); } diff --git a/src/drivers/elog/elog_internal.h b/src/drivers/elog/elog_internal.h index e83df5f..dd28231 100644 --- a/src/drivers/elog/elog_internal.h +++ b/src/drivers/elog/elog_internal.h @@ -63,20 +63,9 @@ typedef enum elog_event_buffer_state { ELOG_EVENT_BUFFER_CORRUPTED, } elog_event_buffer_state; -/* - * Internal handler for event log buffers - */ -struct elog_descriptor { - elog_area_state area_state; - elog_header_state header_state; - elog_event_buffer_state event_buffer_state; - void *backing_store; - u8 *data; - u32 flash_base; - u16 total_size; - u16 data_size; - u16 next_event_offset; - u16 event_count; -}; +struct elog_area { + struct elog_header header; + u8 data[0]; +} __attribute__((packed)); #endif /* ELOG_INTERNAL_H_ */

1 0

Patch set updated for coreboot: 190f8d1 elog: Stream line the elog driver.
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4244 -gerrit commit 190f8d18aecad9e51e68b1fa2dbbeb3b20f417e6 Author: Gabe Black <gabeblack(a)google.com> Date: Wed Apr 24 23:31:41 2013 -0700 elog: Stream line the elog driver. The elog driver's design was a bit more elaborate than it really needed to be since it no longer had to keep track of multiple copies of the log in flash and also in memory. This change streamlines it by removing unnecessary compartmentalization of some bits of code, and some variables which tracked the last entry added which were never used. Built and booted on Link. Ran mosys eventlog list. Added 2000 events to the event log and ran mosys eventlog list again. Cleared the log by echoing 1 into /sys/firmware/gsmi/clear_eventlog and ran mosys eventlog list. Change-Id: I7d4cdebf2f5b1f6bb1fc70e65eca18f71b124b18 Signed-off-by: Gabe Black <gabeblack(a)google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/49309 Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Commit-Queue: Gabe Black <gabeblack(a)chromium.org> Tested-by: Gabe Black <gabeblack(a)chromium.org> --- src/drivers/elog/elog.c | 270 ++++++++++++--------------------------- src/drivers/elog/elog_internal.h | 2 - 2 files changed, 79 insertions(+), 193 deletions(-) diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index ca5b3fb..7786d3b 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -114,15 +114,6 @@ elog_get_next_event_base(struct elog_descriptor *elog) } /* - * Pointer to the last logged event - */ -static inline struct event_header* -elog_get_last_event_base(struct elog_descriptor *elog) -{ - return elog_get_event_base(elog, elog->last_event_offset); -} - -/* * Update the checksum at the last byte */ static void elog_update_checksum(struct event_header *event, u8 checksum) @@ -308,8 +299,6 @@ static void elog_update_event_buffer_state(struct elog_descriptor *elog) { u32 count = 0; u32 offset = 0; - u32 last_offset = 0; - u32 last_event_size = 0; struct event_header *event; elog_debug("elog_update_event_buffer_state()\n"); @@ -337,8 +326,6 @@ static void elog_update_event_buffer_state(struct elog_descriptor *elog) /* Move to the next event */ count++; - last_offset = offset; - last_event_size = event->length; offset += event->length; } @@ -350,16 +337,14 @@ static void elog_update_event_buffer_state(struct elog_descriptor *elog) /* Update data into elog descriptor */ elog->event_count = count; elog->next_event_offset = offset; - elog->last_event_offset = last_offset; - elog->last_event_size = last_event_size; } /* * (Re)initialize a new ELOG descriptor */ -static void elog_init_descriptor(struct elog_descriptor *elog) +static void elog_scan_flash(struct elog_descriptor *elog) { - elog_debug("elog_init_descriptor()\n"); + elog_debug("elog_scan_flash()\n"); elog->area_state = ELOG_AREA_UNDEFINED; elog->header_state = ELOG_HEADER_INVALID; @@ -370,8 +355,6 @@ static void elog_init_descriptor(struct elog_descriptor *elog) elog->backing_store); elog->next_event_offset = 0; - elog->last_event_offset = 0; - elog->last_event_size = 0; elog->event_count = 0; /* Check if the area is empty or not */ @@ -392,61 +375,12 @@ static void elog_init_descriptor(struct elog_descriptor *elog) elog_update_event_buffer_state(elog); } -/* - * Create ELOG descriptor data structures for all ELOG areas. - */ -static int elog_setup_descriptors(u32 flash_base, u32 area_size) -{ - u8 *area; - struct elog_descriptor *flash = elog_get_flash(); - - elog_debug("elog_setup_descriptors(base=0x%08x size=%u)\n", - flash_base, area_size); - - /* Prepare flash descriptors */ - if (flash_base == 0) { - printk(BIOS_ERR, "ELOG: Invalid flash base\n"); - return -1; - } - - area = malloc(area_size); - if (!area) { - printk(BIOS_ERR, "ELOG: Unable to allocate backing store\n"); - return -1; - } - flash->flash_base = flash_base; - flash->backing_store = area; - flash->total_size = area_size; - - /* Data starts immediately after header */ - flash->data = area + sizeof(struct elog_header); - flash->data_size = area_size - sizeof(struct elog_header); - - elog_init_descriptor(flash); - - return 0; -} - -static void elog_flash_erase_area(void) -{ - struct elog_descriptor *elog = elog_get_flash(); - - elog_debug("elog_flash_erase_area()\n"); - - elog_flash_erase(elog->backing_store, elog->total_size); - memset(elog->backing_store, ELOG_TYPE_EOL, elog->total_size); - elog_init_descriptor(elog); -} - static void elog_prepare_empty(struct elog_descriptor *elog) { struct elog_header *header; elog_debug("elog_prepare_empty(%u bytes)\n", data_size); - if (!elog_is_area_clear(elog)) - return; - /* Write out the header */ header = elog_get_header(elog); header->magic = ELOG_SIGNATURE; @@ -456,64 +390,7 @@ static void elog_prepare_empty(struct elog_descriptor *elog) header->reserved[1] = ELOG_TYPE_EOL; elog_flash_write(elog->backing_store, header->header_size); - elog_init_descriptor(elog); -} - -static int elog_sync_flash_to_mem(void) -{ - struct elog_descriptor *flash = elog_get_flash(); - - elog_debug("elog_sync_flash_to_mem()\n"); - - /* Fill with empty pattern first */ - memset(flash->backing_store, ELOG_TYPE_EOL, flash->total_size); - - /* Read the header from SPI to memory */ - elog_spi->read(elog_spi, flash->flash_base, - sizeof(struct elog_header), flash->backing_store); - - /* Read the valid flash contents from SPI to memory */ - elog_spi->read(elog_spi, flash->flash_base + sizeof(struct elog_header), - flash->next_event_offset, flash->data); - - elog_init_descriptor(flash); - - return elog_is_area_valid(flash) ? 0 : -1; -} - -/* - * Called during ELOG entry handler to prepare state for flash. - */ -static int elog_flash_area_bootstrap(void) -{ - struct elog_descriptor *elog = elog_get_flash(); - - elog_debug("elog_flash_area_bootstrap()\n"); - - switch (elog->area_state) { - case ELOG_AREA_UNDEFINED: - printk(BIOS_ERR, "ELOG: flash area undefined\n"); - return -1; - - case ELOG_AREA_EMPTY: - /* Write a new header with no data */ - elog_prepare_empty(elog); - break; - - case ELOG_AREA_HAS_CONTENT: - break; - } - - if (elog->header_state == ELOG_HEADER_INVALID || - elog->event_buffer_state == ELOG_EVENT_BUFFER_CORRUPTED) { - /* If the header is invalid or the events are corrupted, - * no events can be salvaged so erase the entire area. */ - printk(BIOS_ERR, "ELOG: flash area invalid\n"); - elog_flash_erase_area(); - elog_prepare_empty(elog); - } - - return 0; + elog_scan_flash(elog); } /* @@ -555,7 +432,7 @@ static int elog_shrink(void) elog_flash_erase(flash->backing_store, flash->total_size); elog_flash_write(flash->backing_store, flash->total_size); - elog_init_descriptor(flash); + elog_scan_flash(flash); /* Ensure the area was successfully erased */ if (flash->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) { @@ -569,22 +446,6 @@ static int elog_shrink(void) return 0; } -/* - * Initialize the SPI bus and probe for a flash chip - */ -static int elog_spi_init(void) -{ - elog_debug("elog_spi_init()\n"); - - /* Prepare SPI subsystem */ - spi_init(); - - /* Look for flash chip */ - elog_spi = spi_flash_probe(0, 0, 0, 0); - - return elog_spi ? 0 : -1; -} - #ifndef __SMM__ /* * Fill out SMBIOS Type 15 table entry so the @@ -642,13 +503,10 @@ int elog_clear(void) return -1; /* Erase flash area */ - elog_flash_erase_area(); - - /* Prepare new empty area */ + elog_flash_erase(flash->backing_store, flash->total_size); elog_prepare_empty(flash); - /* Update memory area from flash */ - if (elog_sync_flash_to_mem() < 0) + if (!elog_is_area_valid(flash)) return -1; /* Log the clear event */ @@ -657,90 +515,122 @@ int elog_clear(void) return 0; } +static void elog_find_flash(u32 *base, int *size) +{ +#if CONFIG_CHROMEOS + u8 *flash_base_ptr; +#endif + + elog_debug("elog_find_flash(base = %p, size = %p)\n", base, size); + +#if CONFIG_CHROMEOS + /* Find the ELOG base and size in FMAP */ + *size = find_fmap_entry("RW_ELOG", (void **)&flash_base_ptr); + if (*size < 0) { + printk(BIOS_WARNING, "ELOG: Unable to find RW_ELOG in FMAP, " + "using CONFIG_ELOG_FLASH_BASE instead\n"); + *size = CONFIG_ELOG_AREA_SIZE; + } else { + *base = elog_flash_address_to_offset(flash_base_ptr); + + /* Use configured size if smaller than FMAP size */ + if (*size > CONFIG_ELOG_AREA_SIZE) + *size = CONFIG_ELOG_AREA_SIZE; + } +#else + *base = CONFIG_ELOG_FLASH_BASE; + *size = CONFIG_ELOG_AREA_SIZE; +#endif +} + /* * Event log main entry point */ int elog_init(void) { + struct elog_descriptor *flash = elog_get_flash(); u32 flash_base = CONFIG_ELOG_FLASH_BASE; int flash_size = CONFIG_ELOG_AREA_SIZE; -#if CONFIG_CHROMEOS - u8 *flash_base_ptr; -#endif if (elog_initialized) return 0; elog_debug("elog_init()\n"); - /* Find SPI flash chip for backing store */ - if (elog_spi_init() < 0) { + /* Prepare SPI */ + spi_init(); + elog_spi = spi_flash_probe(0, 0, 0, 0); + if (!elog_spi) { printk(BIOS_ERR, "ELOG: Unable to find SPI flash\n"); return -1; } -#if CONFIG_CHROMEOS - /* Find the ELOG base and size in FMAP */ - flash_size = find_fmap_entry("RW_ELOG", (void **)&flash_base_ptr); - if (flash_size < 0) { - printk(BIOS_WARNING, "ELOG: Unable to find RW_ELOG in FMAP, " - "using CONFIG_ELOG_FLASH_BASE instead\n"); - flash_size = CONFIG_ELOG_AREA_SIZE; - } else { - flash_base = elog_flash_address_to_offset(flash_base_ptr); - - /* Use configured size if smaller than FMAP size */ - if (flash_size > CONFIG_ELOG_AREA_SIZE) - flash_size = CONFIG_ELOG_AREA_SIZE; + /* Set up the backing store */ + elog_find_flash(&flash_base, &flash_size); + if (flash_base == 0) { + printk(BIOS_ERR, "ELOG: Invalid flash base\n"); + return -1; } -#endif - /* Setup descriptors for flash and memory areas */ - if (elog_setup_descriptors(flash_base, flash_size) < 0) { - printk(BIOS_ERR, "ELOG: Unable to initialize descriptors\n"); + flash->backing_store = malloc(flash_size); + if (!flash->backing_store) { + printk(BIOS_ERR, "ELOG: Unable to allocate backing store\n"); return -1; } + flash->flash_base = flash_base; + flash->total_size = flash_size; - /* Bootstrap the flash area */ - if (elog_flash_area_bootstrap() < 0) { - printk(BIOS_ERR, "ELOG: Unable to bootstrap flash area\n"); - return -1; + /* Data starts immediately after header */ + flash->data = flash->backing_store + sizeof(struct elog_header); + flash->data_size = flash_size - sizeof(struct elog_header); + + /* Load the log from flash */ + elog_scan_flash(flash); + + /* Prepare the flash if necessary */ + if (flash->header_state == ELOG_HEADER_INVALID || + flash->event_buffer_state == ELOG_EVENT_BUFFER_CORRUPTED) { + /* If the header is invalid or the events are corrupted, + * no events can be salvaged so erase the entire area. */ + printk(BIOS_ERR, "ELOG: flash area invalid\n"); + elog_flash_erase(flash->backing_store, flash->total_size); + elog_prepare_empty(flash); } - /* Initialize the memory area */ - if (elog_sync_flash_to_mem() < 0) { - printk(BIOS_ERR, "ELOG: Unable to initialize memory area\n"); + if (flash->area_state == ELOG_AREA_EMPTY) + elog_prepare_empty(flash); + + if (!elog_is_area_valid(flash)) { + printk(BIOS_ERR, "ELOG: Unable to prepare flash\n"); return -1; } elog_initialized = 1; printk(BIOS_INFO, "ELOG: FLASH @0x%p [SPI 0x%08x]\n", - elog_get_flash()->backing_store, elog_get_flash()->flash_base); + flash->backing_store, flash->flash_base); - printk(BIOS_INFO, "ELOG: areas are %d bytes, full threshold %d," - " shrink size %d\n", CONFIG_ELOG_AREA_SIZE, + printk(BIOS_INFO, "ELOG: area is %d bytes, full threshold %d," + " shrink size %d\n", flash_size, CONFIG_ELOG_FULL_THRESHOLD, CONFIG_ELOG_SHRINK_SIZE); /* Log a clear event if necessary */ - if (elog_get_flash()->event_count == 0) - elog_add_event_word(ELOG_TYPE_LOG_CLEAR, - elog_get_flash()->total_size); + if (flash->event_count == 0) + elog_add_event_word(ELOG_TYPE_LOG_CLEAR, flash->total_size); /* Shrink the log if we are getting too full */ - if (elog_get_flash()->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) + if (flash->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) if (elog_shrink() < 0) return -1; -#if CONFIG_ELOG_BOOT_COUNT && !defined(__SMM__) +#if !defined(__SMM__) /* Log boot count event except in S3 resume */ - if (acpi_slp_type != 3) + if (CONFIG_ELOG_BOOT_COUNT && acpi_slp_type != 3) elog_add_event_dword(ELOG_TYPE_BOOT, boot_count_read()); -#endif -#if CONFIG_CMOS_POST && !defined(__SMM__) /* Check and log POST codes from previous boot */ - cmos_post_log(); + if (CONFIG_CMOS_POST) + cmos_post_log(); #endif return 0; @@ -818,8 +708,6 @@ void elog_add_event_raw(u8 event_type, void *data, u8 data_size) elog_flash_write((void *)event, event_size); - flash->last_event_offset = flash->next_event_offset; - flash->last_event_size = event_size; flash->next_event_offset += event_size; printk(BIOS_INFO, "ELOG: Event(%X) added with size %d\n", diff --git a/src/drivers/elog/elog_internal.h b/src/drivers/elog/elog_internal.h index 799e7e2..e83df5f 100644 --- a/src/drivers/elog/elog_internal.h +++ b/src/drivers/elog/elog_internal.h @@ -76,8 +76,6 @@ struct elog_descriptor { u16 total_size; u16 data_size; u16 next_event_offset; - u16 last_event_offset; - u16 last_event_size; u16 event_count; };

1 0

Patch set updated for coreboot: 53721bd elog: Merge elog_validate_and_fill into elog_init_descriptor.
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4243 -gerrit commit 53721bdcc41c6b027a858efabe0c4cec34fe6920 Author: Gabe Black <gabeblack(a)google.com> Date: Wed Apr 24 17:54:37 2013 -0700 elog: Merge elog_validate_and_fill into elog_init_descriptor. elog_validate_and_fill was called in exactly one place, in elog_init_descriptor. It didn't actually do what its name implied since the data in the event log was already "filled" by elog_init_descriptor. Likewise elog_init_descriptor was delegating an important part of its own job, scanning through the list of events, to elog_validate_and_fill. Since one function was basically just a displaced part of the other which couldn't really stand on its own, this change merges them together. Built and booted on Link. Ran mosys eventlog list. Added 2000 events with the SMI handler and ran mosys eventlog list again. Change-Id: Ic899eeb18146d0f127d0dded207d37d63cbc716f Signed-off-by: Gabe Black <gabeblack(a)google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/49308 Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Commit-Queue: Gabe Black <gabeblack(a)chromium.org> Tested-by: Gabe Black <gabeblack(a)chromium.org> --- src/drivers/elog/elog.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index 8f47ca2..ca5b3fb 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -354,28 +354,6 @@ static void elog_update_event_buffer_state(struct elog_descriptor *elog) elog->last_event_size = last_event_size; } -static void elog_validate_and_fill(struct elog_descriptor *elog) -{ - elog_debug("elog_validate_and_fill()\n"); - - /* Check if the area is empty or not */ - if (elog_is_area_clear(elog)) { - elog->area_state = ELOG_AREA_EMPTY; - return; - } - - elog->area_state = ELOG_AREA_HAS_CONTENT; - - /* Validate the header */ - if (!elog_is_header_valid(elog_get_header(elog))) { - elog->header_state = ELOG_HEADER_INVALID; - return; - } - - elog->header_state = ELOG_HEADER_VALID; - elog_update_event_buffer_state(elog); -} - /* * (Re)initialize a new ELOG descriptor */ @@ -396,7 +374,22 @@ static void elog_init_descriptor(struct elog_descriptor *elog) elog->last_event_size = 0; elog->event_count = 0; - elog_validate_and_fill(elog); + /* Check if the area is empty or not */ + if (elog_is_area_clear(elog)) { + elog->area_state = ELOG_AREA_EMPTY; + return; + } + + elog->area_state = ELOG_AREA_HAS_CONTENT; + + /* Validate the header */ + if (!elog_is_header_valid(elog_get_header(elog))) { + elog->header_state = ELOG_HEADER_INVALID; + return; + } + + elog->header_state = ELOG_HEADER_VALID; + elog_update_event_buffer_state(elog); } /*

1 0

Patch set updated for coreboot: 7714801 elog: Get rid of elog_reinit_descriptor.
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4242 -gerrit commit 771480143ef4529e29b6af9399543ba931a8f0e2 Author: Gabe Black <gabeblack(a)google.com> Date: Wed Apr 24 17:36:53 2013 -0700 elog: Get rid of elog_reinit_descriptor. This function was just a wrapper around elog_init_descriptor, and all it did was pass the current backing store location and size back in so it would be reused. Those values, which never change, are now set in elog_setup_descriptors, eliminating those parameters to init and eliminating the need for _reinit_. Built and booted on Link. Ran mosys eventlog list. Added 2000 events to the log and ran mosys eventlog list again. Change-Id: I133768aa798dfc10f32e14db95235a88666890c3 Signed-off-by: Gabe Black <gabeblack(a)google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/49307 Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Commit-Queue: Gabe Black <gabeblack(a)chromium.org> Tested-by: Gabe Black <gabeblack(a)chromium.org> --- src/drivers/elog/elog.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index 439ccc3..8f47ca2 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -377,25 +377,19 @@ static void elog_validate_and_fill(struct elog_descriptor *elog) } /* - * Initialize a new ELOG descriptor + * (Re)initialize a new ELOG descriptor */ -static void elog_init_descriptor(struct elog_descriptor *elog, - u8 *buffer, u32 size) +static void elog_init_descriptor(struct elog_descriptor *elog) { - elog_debug("elog_init_descriptor(buffer=0x%p size=%u)\n", buffer, size); + elog_debug("elog_init_descriptor()\n"); elog->area_state = ELOG_AREA_UNDEFINED; elog->header_state = ELOG_HEADER_INVALID; elog->event_buffer_state = ELOG_EVENT_BUFFER_OK; - elog->backing_store = buffer; - elog->total_size = size; /* Fill memory buffer by reading from SPI */ - elog_spi->read(elog_spi, elog->flash_base, size, buffer); - - /* Data starts immediately after header */ - elog->data = &buffer[sizeof(struct elog_header)]; - elog->data_size = size - sizeof(struct elog_header); + elog_spi->read(elog_spi, elog->flash_base, elog->total_size, + elog->backing_store); elog->next_event_offset = 0; elog->last_event_offset = 0; @@ -406,20 +400,12 @@ static void elog_init_descriptor(struct elog_descriptor *elog, } /* - * Re-initialize an existing ELOG descriptor - */ -static void elog_reinit_descriptor(struct elog_descriptor *elog) -{ - elog_debug("elog_reinit_descriptor()\n"); - elog_init_descriptor(elog, elog->backing_store, elog->total_size); -} - -/* * Create ELOG descriptor data structures for all ELOG areas. */ static int elog_setup_descriptors(u32 flash_base, u32 area_size) { u8 *area; + struct elog_descriptor *flash = elog_get_flash(); elog_debug("elog_setup_descriptors(base=0x%08x size=%u)\n", flash_base, area_size); @@ -435,8 +421,15 @@ static int elog_setup_descriptors(u32 flash_base, u32 area_size) printk(BIOS_ERR, "ELOG: Unable to allocate backing store\n"); return -1; } - elog_get_flash()->flash_base = flash_base; - elog_init_descriptor(elog_get_flash(), area, area_size); + flash->flash_base = flash_base; + flash->backing_store = area; + flash->total_size = area_size; + + /* Data starts immediately after header */ + flash->data = area + sizeof(struct elog_header); + flash->data_size = area_size - sizeof(struct elog_header); + + elog_init_descriptor(flash); return 0; } @@ -449,7 +442,7 @@ static void elog_flash_erase_area(void) elog_flash_erase(elog->backing_store, elog->total_size); memset(elog->backing_store, ELOG_TYPE_EOL, elog->total_size); - elog_reinit_descriptor(elog); + elog_init_descriptor(elog); } static void elog_prepare_empty(struct elog_descriptor *elog) @@ -470,7 +463,7 @@ static void elog_prepare_empty(struct elog_descriptor *elog) header->reserved[1] = ELOG_TYPE_EOL; elog_flash_write(elog->backing_store, header->header_size); - elog_reinit_descriptor(elog); + elog_init_descriptor(elog); } static int elog_sync_flash_to_mem(void) @@ -490,7 +483,7 @@ static int elog_sync_flash_to_mem(void) elog_spi->read(elog_spi, flash->flash_base + sizeof(struct elog_header), flash->next_event_offset, flash->data); - elog_reinit_descriptor(flash); + elog_init_descriptor(flash); return elog_is_area_valid(flash) ? 0 : -1; } @@ -569,7 +562,7 @@ static int elog_shrink(void) elog_flash_erase(flash->backing_store, flash->total_size); elog_flash_write(flash->backing_store, flash->total_size); - elog_reinit_descriptor(flash); + elog_init_descriptor(flash); /* Ensure the area was successfully erased */ if (flash->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) {

1 0

Patch set updated for coreboot: 7900d42 elog: Eliminate the second in memory copy of the event log.
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4241 -gerrit commit 7900d42c1e762a37cc041fdce69af8c2e8f16391 Author: Gabe Black <gabeblack(a)google.com> Date: Wed Apr 24 04:11:40 2013 -0700 elog: Eliminate the second in memory copy of the event log. The event log driver keeps two copies of the event log in memory, one to take the place of the historically memory mapped image of flash which is now read and written manually, and one originally intended to be an in memory cache of flash. Since both are now just copies in memory, there's no value in having them both and keeping them in sync. Built and booted on Link. Ran mosys eventlog list. Added 2000 events to the log and ran mosys eventlog list again. Cleared the log by echoing a 1 into /sys/firmware/gsmi/clear_eventlog and ran mosys eventlog list again. Change-Id: Ibed62a10c78884849726aa15ec795ab2914afc35 Signed-off-by: Gabe Black <gabeblack(a)google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/49306 Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Commit-Queue: Gabe Black <gabeblack(a)chromium.org> Tested-by: Gabe Black <gabeblack(a)chromium.org> --- src/drivers/elog/elog.c | 210 ++++++++++----------------------------- src/drivers/elog/elog_internal.h | 7 -- 2 files changed, 55 insertions(+), 162 deletions(-) diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index ab255d8..439ccc3 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -60,12 +60,6 @@ static int elog_initialized; static struct spi_flash *elog_spi; static struct elog_descriptor elog_flash_area; -static struct elog_descriptor elog_mem_area; - -static inline struct elog_descriptor* elog_get_mem(void) -{ - return &elog_mem_area; -} static inline struct elog_descriptor* elog_get_flash(void) { @@ -262,29 +256,26 @@ static int elog_is_event_valid(struct elog_descriptor *elog, u32 offset) } /* - * Write 'size' bytes of data provided in 'buffer' into flash - * device at offset 'offset'. This will not erase the flash and - * it assumes the flash area is erased appropriately. + * Write 'size' bytes of data pointed to by 'address' in the flash backing + * store into flash. This will not erase the flash and it assumes the flash + * area has been erased appropriately. */ -static void elog_flash_write(u8 *address, u8 *buffer, u32 size) +static void elog_flash_write(u8 *address, u32 size) { struct elog_descriptor *flash = elog_get_flash(); u32 offset; - if (!address || !buffer || !size || !elog_spi) + if (!address || !size || !elog_spi) return; offset = flash->flash_base; offset += address - (u8*)flash->backing_store; - elog_debug("elog_flash_write(address=0x%p offset=0x%08x buffer=0x%p " - "size=%u)\n", address, offset, buffer, size); + elog_debug("elog_flash_write(address=0x%p offset=0x%08x size=%u)\n", + address, offset, size); /* Write the data to flash */ - elog_spi->write(elog_spi, offset, size, buffer); - - /* Update the copy in memory */ - memcpy(address, buffer, size); + elog_spi->write(elog_spi, offset, size, address); } /* @@ -389,13 +380,10 @@ static void elog_validate_and_fill(struct elog_descriptor *elog) * Initialize a new ELOG descriptor */ static void elog_init_descriptor(struct elog_descriptor *elog, - elog_descriptor_type type, u8 *buffer, u32 size) { - elog_debug("elog_init_descriptor(type=%u buffer=0x%p size=%u)\n", - type, buffer, size); + elog_debug("elog_init_descriptor(buffer=0x%p size=%u)\n", buffer, size); - elog->type = type; elog->area_state = ELOG_AREA_UNDEFINED; elog->header_state = ELOG_HEADER_INVALID; elog->event_buffer_state = ELOG_EVENT_BUFFER_OK; @@ -403,8 +391,7 @@ static void elog_init_descriptor(struct elog_descriptor *elog, elog->total_size = size; /* Fill memory buffer by reading from SPI */ - if (type == ELOG_DESCRIPTOR_FLASH) - elog_spi->read(elog_spi, elog->flash_base, size, buffer); + elog_spi->read(elog_spi, elog->flash_base, size, buffer); /* Data starts immediately after header */ elog->data = &buffer[sizeof(struct elog_header)]; @@ -424,8 +411,7 @@ static void elog_init_descriptor(struct elog_descriptor *elog, static void elog_reinit_descriptor(struct elog_descriptor *elog) { elog_debug("elog_reinit_descriptor()\n"); - elog_init_descriptor(elog, elog->type, elog->backing_store, - elog->total_size); + elog_init_descriptor(elog, elog->backing_store, elog->total_size); } /* @@ -450,17 +436,7 @@ static int elog_setup_descriptors(u32 flash_base, u32 area_size) return -1; } elog_get_flash()->flash_base = flash_base; - elog_init_descriptor(elog_get_flash(), ELOG_DESCRIPTOR_FLASH, - area, area_size); - - /* Initialize the memory area to look like a cleared flash area */ - area = malloc(area_size); - if (!area) { - printk(BIOS_ERR, "ELOG: Unable to allocate mem area\n"); - return -1; - } - memset(area, ELOG_TYPE_EOL, area_size); - elog_init_descriptor(elog_get_mem(), ELOG_DESCRIPTOR_MEMORY,area, area_size); + elog_init_descriptor(elog_get_flash(), area, area_size); return 0; } @@ -476,8 +452,7 @@ static void elog_flash_erase_area(void) elog_reinit_descriptor(elog); } -static void elog_prepare_empty(struct elog_descriptor *elog, - u8 *data, u32 data_size) +static void elog_prepare_empty(struct elog_descriptor *elog) { struct elog_header *header; @@ -493,84 +468,31 @@ static void elog_prepare_empty(struct elog_descriptor *elog, header->header_size = sizeof(struct elog_header); header->reserved[0] = ELOG_TYPE_EOL; header->reserved[1] = ELOG_TYPE_EOL; - elog_flash_write(elog->backing_store, (u8*)header, - header->header_size); - - /* Write out the data */ - if (data) - elog_flash_write(elog->data, data, data_size); + elog_flash_write(elog->backing_store, header->header_size); elog_reinit_descriptor(elog); - - /* Clear the log if corrupt */ - if (!elog_is_area_valid(elog)) - elog_flash_erase_area(); } static int elog_sync_flash_to_mem(void) { - struct elog_descriptor *mem = elog_get_mem(); struct elog_descriptor *flash = elog_get_flash(); elog_debug("elog_sync_flash_to_mem()\n"); /* Fill with empty pattern first */ - memset(mem->backing_store, ELOG_TYPE_EOL, mem->total_size); + memset(flash->backing_store, ELOG_TYPE_EOL, flash->total_size); /* Read the header from SPI to memory */ elog_spi->read(elog_spi, flash->flash_base, - sizeof(struct elog_header), mem->backing_store); + sizeof(struct elog_header), flash->backing_store); /* Read the valid flash contents from SPI to memory */ elog_spi->read(elog_spi, flash->flash_base + sizeof(struct elog_header), - flash->next_event_offset, mem->data); - - elog_reinit_descriptor(mem); - - return elog_is_area_valid(mem) ? 0 : -1; -} - -static int elog_sync_mem_to_flash(void) -{ - struct elog_descriptor *mem = elog_get_mem(); - struct elog_descriptor *flash = elog_get_flash(); - u8 *src, *dest; - u32 size; - - elog_debug("elog_sync_mem_to_flash()\n"); - - /* - * In the case of a BIOS flash the active area will be cleared. - * One can catch this case and log the proper shutdown event by - * checking if the active flash elog is empty. Note that if the - * header size changes we will have corrupted the flash area. - * However that will be corrected on the next boot. - */ - if (elog_is_area_clear(flash)) { - elog_prepare_empty(flash, - (u8*)elog_get_last_event_base(mem), - mem->last_event_size); - elog_sync_flash_to_mem(); - return 0; - } - - /* Calculate the destination and source bases */ - dest = (u8*)elog_get_next_event_base(flash); - src = (u8*)elog_get_event_base(mem, flash->next_event_offset); - - /* Calculate how much data to sync */ - size = mem->next_event_offset - flash->next_event_offset; - - /* Write the log data */ - elog_flash_write(dest, src, size); + flash->next_event_offset, flash->data); - /* Update descriptor */ - flash->event_count = mem->event_count; - flash->next_event_offset = mem->next_event_offset; - flash->last_event_offset = mem->last_event_offset; - flash->last_event_size = mem->last_event_size; + elog_reinit_descriptor(flash); - return 0; + return elog_is_area_valid(flash) ? 0 : -1; } /* @@ -589,26 +511,20 @@ static int elog_flash_area_bootstrap(void) case ELOG_AREA_EMPTY: /* Write a new header with no data */ - elog_prepare_empty(elog, NULL, 0); + elog_prepare_empty(elog); break; case ELOG_AREA_HAS_CONTENT: break; } - if (elog->header_state == ELOG_HEADER_INVALID) { - /* If the header is invalid no events can be salvaged - * so erase the entire area. */ - printk(BIOS_ERR, "ELOG: flash area header invalid\n"); - elog_flash_erase_area(); - elog_prepare_empty(elog, NULL, 0); - } - - if (elog->event_buffer_state == ELOG_EVENT_BUFFER_CORRUPTED) { - /* Wipe the source flash area */ + if (elog->header_state == ELOG_HEADER_INVALID || + elog->event_buffer_state == ELOG_EVENT_BUFFER_CORRUPTED) { + /* If the header is invalid or the events are corrupted, + * no events can be salvaged so erase the entire area. */ + printk(BIOS_ERR, "ELOG: flash area invalid\n"); elog_flash_erase_area(); - elog_prepare_empty(elog, elog_get_mem()->data, - elog_get_mem()->next_event_offset); + elog_prepare_empty(elog); } return 0; @@ -620,7 +536,6 @@ static int elog_flash_area_bootstrap(void) */ static int elog_shrink(void) { - struct elog_descriptor *mem = elog_get_mem(); struct elog_descriptor *flash = elog_get_flash(); struct event_header *event; u16 discard_count = 0; @@ -629,7 +544,7 @@ static int elog_shrink(void) elog_debug("elog_shrink()\n"); - if (mem->next_event_offset < CONFIG_ELOG_SHRINK_SIZE) + if (flash->next_event_offset < CONFIG_ELOG_SHRINK_SIZE) return 0; while (1) { @@ -637,7 +552,7 @@ static int elog_shrink(void) if (offset > CONFIG_ELOG_SHRINK_SIZE) break; - event = elog_get_event_base(mem, offset); + event = elog_get_event_base(flash, offset); /* Reached the end of the area */ if (!event || event->type == ELOG_TYPE_EOL) @@ -647,23 +562,21 @@ static int elog_shrink(void) discard_count++; } - new_size = mem->next_event_offset - offset; - memmove(&mem->data[0], &mem->data[offset], new_size); - memset(&mem->data[new_size], ELOG_TYPE_EOL, mem->data_size - new_size); - elog_reinit_descriptor(mem); + new_size = flash->next_event_offset - offset; + memmove(&flash->data[0], &flash->data[offset], new_size); + memset(&flash->data[new_size], ELOG_TYPE_EOL, + flash->data_size - new_size); elog_flash_erase(flash->backing_store, flash->total_size); + elog_flash_write(flash->backing_store, flash->total_size); + elog_reinit_descriptor(flash); /* Ensure the area was successfully erased */ - if (mem->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) { + if (flash->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) { printk(BIOS_ERR, "ELOG: Flash area was not erased!\n"); return -1; } - elog_flash_write(flash->backing_store, mem->backing_store, - mem->total_size); - elog_reinit_descriptor(flash); - /* Add clear event */ elog_add_event_word(ELOG_TYPE_LOG_CLEAR, offset); @@ -746,7 +659,7 @@ int elog_clear(void) elog_flash_erase_area(); /* Prepare new empty area */ - elog_prepare_empty(flash, NULL, 0); + elog_prepare_empty(flash); /* Update memory area from flash */ if (elog_sync_flash_to_mem() < 0) @@ -816,8 +729,7 @@ int elog_init(void) elog_initialized = 1; - printk(BIOS_INFO, "ELOG: MEM @0x%p FLASH @0x%p [SPI 0x%08x]\n", - elog_get_mem()->backing_store, + printk(BIOS_INFO, "ELOG: FLASH @0x%p [SPI 0x%08x]\n", elog_get_flash()->backing_store, elog_get_flash()->flash_base); printk(BIOS_INFO, "ELOG: areas are %d bytes, full threshold %d," @@ -830,7 +742,7 @@ int elog_init(void) elog_get_flash()->total_size); /* Shrink the log if we are getting too full */ - if (elog_get_mem()->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) + if (elog_get_flash()->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) if (elog_shrink() < 0) return -1; @@ -873,37 +785,37 @@ static void elog_fill_timestamp(struct event_header *event) } /* - * Add an event to the memory area + * Add an event to the log */ -static int elog_add_event_mem(u8 event_type, void *data, u8 data_size) +void elog_add_event_raw(u8 event_type, void *data, u8 data_size) { struct event_header *event; - struct elog_descriptor *mem = elog_get_mem(); + struct elog_descriptor *flash = elog_get_flash(); u8 event_size; - elog_debug("elog_add_event_mem(type=%X)\n", event_type); + elog_debug("elog_add_event_raw(type=%X)\n", event_type); /* Make sure ELOG structures are initialized */ if (elog_init() < 0) - return -1; + return; /* Header + Data + Checksum */ event_size = sizeof(*event) + data_size + 1; if (event_size > MAX_EVENT_SIZE) { printk(BIOS_ERR, "ELOG: Event(%X) data size too " "big (%d)\n", event_type, event_size); - return -1; + return; } /* Make sure event data can fit */ - if ((mem->next_event_offset + event_size) >= mem->data_size) { + if ((flash->next_event_offset + event_size) >= flash->data_size) { printk(BIOS_ERR, "ELOG: Event(%X) does not fit\n", event_type); - return -1; + return; } /* Fill out event data */ - event = elog_get_next_event_base(mem); + event = elog_get_next_event_base(flash); event->type = event_type; event->length = event_size; elog_fill_timestamp(event); @@ -916,31 +828,19 @@ static int elog_add_event_mem(u8 event_type, void *data, u8 data_size) elog_update_checksum(event, -(elog_checksum_event(event))); /* Update memory descriptor parameters */ - mem->event_count++; - mem->last_event_offset = mem->next_event_offset; - mem->last_event_size = event_size; - mem->next_event_offset += event_size; - - printk(BIOS_INFO, "ELOG: Event(%X) added with size %d\n", - event_type, event_size); - return 0; -} + flash->event_count++; -void elog_add_event_raw(u8 event_type, void *data, u8 data_size) -{ - elog_debug("elog_add_event_raw(type=%X)\n", event_type); + elog_flash_write((void *)event, event_size); - /* Add event to the memory area */ - if (elog_add_event_mem(event_type, data, data_size) < 0) { - printk(BIOS_ERR, "Unable to add event to memory area\n"); - return; - } + flash->last_event_offset = flash->next_event_offset; + flash->last_event_size = event_size; + flash->next_event_offset += event_size; - /* Sync the memory buffer to flash */ - elog_sync_mem_to_flash(); + printk(BIOS_INFO, "ELOG: Event(%X) added with size %d\n", + event_type, event_size); /* Shrink the log if we are getting too full */ - if (elog_get_mem()->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) + if (flash->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) elog_shrink(); } diff --git a/src/drivers/elog/elog_internal.h b/src/drivers/elog/elog_internal.h index 67026af..799e7e2 100644 --- a/src/drivers/elog/elog_internal.h +++ b/src/drivers/elog/elog_internal.h @@ -47,12 +47,6 @@ struct event_header { /* SMBIOS Type 15 related constants */ #define ELOG_HEADER_TYPE_OEM 0x88 -typedef enum elog_descriptor_type { - ELOG_DESCRIPTOR_UNKNOWN, - ELOG_DESCRIPTOR_MEMORY, - ELOG_DESCRIPTOR_FLASH, -} elog_descriptor_type; - typedef enum elog_area_state { ELOG_AREA_UNDEFINED, /* Initial boot strap state */ ELOG_AREA_EMPTY, /* Entire area is empty */ @@ -73,7 +67,6 @@ typedef enum elog_event_buffer_state { * Internal handler for event log buffers */ struct elog_descriptor { - elog_descriptor_type type; elog_area_state area_state; elog_header_state header_state; elog_event_buffer_state event_buffer_state;

1 0

Patch set updated for coreboot: ff906f4 Make elog_shrink not depend on having seperate memory/flash descriptors.
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4240 -gerrit commit ff906f45d591fecf0a1e89e55004385ba7d0e889 Author: Gabe Black <gabeblack(a)google.com> Date: Wed Apr 24 03:16:21 2013 -0700 Make elog_shrink not depend on having seperate memory/flash descriptors. The way elog_shrink currently works is that it completely clears the data in the flash/flash descriptor and then recreates it using the part of the log it's going to keep as stored in the memory descriptor. That scheme depends on there being to independent copies of the log. This change reworks elog_shrink so that it moves the data it wants to keep within a single descriptor and then propogates it to the other and to flash intact. This way, when one of the descriptors goes away, all we have to do is remove the code that would update it. Built and booted into ChromeOS on Link. Ran mosys eventlog list. Added 2000 events to the log and ran mosys eventlog list again. Echoed a 1 into /sys/firmware/gsmi/clear_eventlog and ran mosys eventlog list. BRANCH=None Change-Id: I50d77a4f00ea3c6b3e0ec8996dab1a3b31580205 Signed-off-by: Gabe Black <gabeblack(a)google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/49305 Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Commit-Queue: Gabe Black <gabeblack(a)chromium.org> Tested-by: Gabe Black <gabeblack(a)chromium.org> --- src/drivers/elog/elog.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index fd638a5..ab255d8 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -621,9 +621,11 @@ static int elog_flash_area_bootstrap(void) static int elog_shrink(void) { struct elog_descriptor *mem = elog_get_mem(); + struct elog_descriptor *flash = elog_get_flash(); struct event_header *event; u16 discard_count = 0; u16 offset = 0; + u16 new_size = 0; elog_debug("elog_shrink()\n"); @@ -645,25 +647,22 @@ static int elog_shrink(void) discard_count++; } - /* Erase flash area */ - elog_flash_erase_area(); + new_size = mem->next_event_offset - offset; + memmove(&mem->data[0], &mem->data[offset], new_size); + memset(&mem->data[new_size], ELOG_TYPE_EOL, mem->data_size - new_size); + elog_reinit_descriptor(mem); + + elog_flash_erase(flash->backing_store, flash->total_size); /* Ensure the area was successfully erased */ - if (elog_get_flash()->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) { + if (mem->next_event_offset >= CONFIG_ELOG_FULL_THRESHOLD) { printk(BIOS_ERR, "ELOG: Flash area was not erased!\n"); return -1; } - /* Write new flash area */ - elog_prepare_empty(elog_get_flash(), - (u8*)elog_get_event_base(mem, offset), - mem->next_event_offset - offset); - - /* Update memory area from flash */ - if (elog_sync_flash_to_mem() < 0) { - printk(BIOS_ERR, "Unable to update memory area from flash\n"); - return -1; - } + elog_flash_write(flash->backing_store, mem->backing_store, + mem->total_size); + elog_reinit_descriptor(flash); /* Add clear event */ elog_add_event_word(ELOG_TYPE_LOG_CLEAR, offset);

1 0

Patch set updated for coreboot: c270bc7 elog: Get rid of the staging_header variable.
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4239 -gerrit commit c270bc7c7bb67bfc1204661a4c9af6c9419a6bf6 Author: Gabe Black <gabeblack(a)google.com> Date: Tue Apr 23 19:36:01 2013 -0700 elog: Get rid of the staging_header variable. The header is at the start of the log. There's no reason to either keep a seperate pointer to it, or to keep a copy of it in some other bit of memory. Built and booted on Link and used 'mosys eventlog list' to list the contents of the log. Ran for x in $(seq 1 2000); do cat elog.event.kernel_clean > /sys/firmware/gsmi/append_to_eventlog; done And ran mosys eventlog list again to verify that the log had been shrunk correctly. Change-Id: I2afcd52c0ce5bbb662ac56f2895cdbea28d5c2ce Signed-off-by: Gabe Black <gabeblack(a)google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/49304 Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Commit-Queue: Gabe Black <gabeblack(a)chromium.org> Tested-by: Gabe Black <gabeblack(a)chromium.org> --- src/drivers/elog/elog.c | 27 +++++++-------------------- src/drivers/elog/elog_internal.h | 1 - 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index bc72e97..fd638a5 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -376,7 +376,7 @@ static void elog_validate_and_fill(struct elog_descriptor *elog) elog->area_state = ELOG_AREA_HAS_CONTENT; /* Validate the header */ - if (!elog_is_header_valid(elog->staging_header)) { + if (!elog_is_header_valid(elog_get_header(elog))) { elog->header_state = ELOG_HEADER_INVALID; return; } @@ -390,8 +390,7 @@ static void elog_validate_and_fill(struct elog_descriptor *elog) */ static void elog_init_descriptor(struct elog_descriptor *elog, elog_descriptor_type type, - u8 *buffer, u32 size, - struct elog_header *header) + u8 *buffer, u32 size) { elog_debug("elog_init_descriptor(type=%u buffer=0x%p size=%u)\n", type, buffer, size); @@ -407,10 +406,6 @@ static void elog_init_descriptor(struct elog_descriptor *elog, if (type == ELOG_DESCRIPTOR_FLASH) elog_spi->read(elog_spi, elog->flash_base, size, buffer); - /* Get staging header from backing store */ - elog->staging_header = header; - memcpy(header, buffer, sizeof(struct elog_header)); - /* Data starts immediately after header */ elog->data = &buffer[sizeof(struct elog_header)]; elog->data_size = size - sizeof(struct elog_header); @@ -430,7 +425,7 @@ static void elog_reinit_descriptor(struct elog_descriptor *elog) { elog_debug("elog_reinit_descriptor()\n"); elog_init_descriptor(elog, elog->type, elog->backing_store, - elog->total_size, elog->staging_header); + elog->total_size); } /* @@ -438,7 +433,6 @@ static void elog_reinit_descriptor(struct elog_descriptor *elog) */ static int elog_setup_descriptors(u32 flash_base, u32 area_size) { - struct elog_header *staging_header; u8 *area; elog_debug("elog_setup_descriptors(base=0x%08x size=%u)\n", @@ -450,20 +444,14 @@ static int elog_setup_descriptors(u32 flash_base, u32 area_size) return -1; } - staging_header = malloc(sizeof(struct elog_header)); - if (!staging_header) { - printk(BIOS_ERR, "ELOG: Unable to allocate header\n"); - return -1; - } - area = malloc(area_size); if (!area) { - printk(BIOS_ERR, "ELOG: Unable to determine flash address\n"); + printk(BIOS_ERR, "ELOG: Unable to allocate backing store\n"); return -1; } elog_get_flash()->flash_base = flash_base; elog_init_descriptor(elog_get_flash(), ELOG_DESCRIPTOR_FLASH, - area, area_size, staging_header); + area, area_size); /* Initialize the memory area to look like a cleared flash area */ area = malloc(area_size); @@ -472,8 +460,7 @@ static int elog_setup_descriptors(u32 flash_base, u32 area_size) return -1; } memset(area, ELOG_TYPE_EOL, area_size); - elog_init_descriptor(elog_get_mem(), ELOG_DESCRIPTOR_MEMORY, - area, area_size, (struct elog_header *)area); + elog_init_descriptor(elog_get_mem(), ELOG_DESCRIPTOR_MEMORY,area, area_size); return 0; } @@ -500,7 +487,7 @@ static void elog_prepare_empty(struct elog_descriptor *elog, return; /* Write out the header */ - header = elog->staging_header; + header = elog_get_header(elog); header->magic = ELOG_SIGNATURE; header->version = ELOG_VERSION; header->header_size = sizeof(struct elog_header); diff --git a/src/drivers/elog/elog_internal.h b/src/drivers/elog/elog_internal.h index f6aa051..67026af 100644 --- a/src/drivers/elog/elog_internal.h +++ b/src/drivers/elog/elog_internal.h @@ -77,7 +77,6 @@ struct elog_descriptor { elog_area_state area_state; elog_header_state header_state; elog_event_buffer_state event_buffer_state; - struct elog_header *staging_header; void *backing_store; u8 *data; u32 flash_base;

1 0

Patch set updated for coreboot: 9b17997 peppy: Add 2GB DRAM configuration.
by Stefan Reinauer 26 Nov '13

26 Nov '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4238 -gerrit commit 9b17997c40b6bb02abee7b11fafe42ef356bb7bf Author: Shawn Nematbakhsh <shawnn(a)google.com> Date: Thu Jun 13 19:47:47 2013 -0700 peppy: Add 2GB DRAM configuration. Currently, all Peppy boards w/ '000' SPD GPIOs have 2GB DRAM. Disable the second DRAM channel based upon the GPIOs. Need to change / confirm this for upcoming builds. Change-Id: I7085ddecb80626cc0bed99ba7b174c6b80350696 Reviewed-on: https://gerrit.chromium.org/gerrit/58620 Commit-Queue: Shawn Nematbakhsh <shawnn(a)chromium.org> Reviewed-by: Shawn Nematbakhsh <shawnn(a)chromium.org> Tested-by: Shawn Nematbakhsh <shawnn(a)chromium.org> --- src/mainboard/google/peppy/romstage.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mainboard/google/peppy/romstage.c b/src/mainboard/google/peppy/romstage.c index d979203..fa5e714 100644 --- a/src/mainboard/google/peppy/romstage.c +++ b/src/mainboard/google/peppy/romstage.c @@ -92,6 +92,12 @@ static void copy_spd(struct pei_data *peid) if (spd_file->len < sizeof(peid->spd_data[0])) die("Missing SPD data."); + /* Index 0 is 2GB config with CH0 only. This is suject to change. + * TODO(shawnn): Check the decoding before next build. + */ + if (spd_index == 0) + peid->dimm_channel1_disabled = 3; + memcpy(peid->spd_data[0], ((char*)CBFS_SUBHEADER(spd_file)) + spd_index * sizeof(peid->spd_data[0]),

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2013