GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/elog: remove parameters from elog_flash_erase() 

The elog_flash_erase() was only called to erase the entire
elog region in flash. Therefore, drop the parameters and
perform the full erase.

BUG=chrome-os-partner:55932

Change-Id: I6590347ae60d407bc0df141e9196eb70532f8585
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/16094
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Aaron Durbin 2016-08-03 21:57:15 -05:00 committed by Martin Roth
parent fb8fb0e142
commit 83f79083ce
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/drivers/elog/elog.c
View File

@ -226,21 +226,16 @@ static void elog_flash_write(void *address, u32 size)
* Erase the first block specified in the address. * Erase the first block specified in the address.
* Only handles flash area within a single flash block. * Only handles flash area within a single flash block.
*/ */
static void elog_flash_erase(void *address, u32 size) static void elog_flash_erase(void)
{ {
u32 offset; if (!elog_spi)
if (!address || !size || !elog_spi)
return; return;
offset = flash_base; elog_debug("elog_flash_erase(offset=0x%08x size=%u)\n",
offset += (u8 *)address - (u8*)elog_area; flash_base, total_size);
elog_debug("elog_flash_erase(address=0x%p offset=0x%08x size=%u)\n",
address, offset, size);
/* Erase the sectors in this region */ /* Erase the sectors in this region */
elog_spi->erase(elog_spi, offset, size); elog_spi->erase(elog_spi, flash_base, total_size);
} }
/* /*
@ -371,7 +366,7 @@ static int elog_shrink(void)
memmove(&elog_area->data[0], &elog_area->data[offset], new_size); memmove(&elog_area->data[0], &elog_area->data[offset], new_size);
memset(&elog_area->data[new_size], ELOG_TYPE_EOL, log_size - new_size); memset(&elog_area->data[new_size], ELOG_TYPE_EOL, log_size - new_size);
elog_flash_erase(elog_area, total_size); elog_flash_erase();
elog_flash_write(elog_area, total_size); elog_flash_write(elog_area, total_size);
elog_scan_flash(); elog_scan_flash();
@ -459,7 +454,7 @@ int elog_clear(void)
return -1; return -1;
/* Erase flash area */ /* Erase flash area */
elog_flash_erase(elog_area, total_size); elog_flash_erase();
elog_prepare_empty(); elog_prepare_empty();
if (!elog_is_area_valid()) if (!elog_is_area_valid())
@ -546,7 +541,7 @@ int elog_init(void)
/* If the header is invalid or the events are corrupted, /* If the header is invalid or the events are corrupted,
* no events can be salvaged so erase the entire area. */ * no events can be salvaged so erase the entire area. */
printk(BIOS_ERR, "ELOG: flash area invalid\n"); printk(BIOS_ERR, "ELOG: flash area invalid\n");
elog_flash_erase(elog_area, total_size); elog_flash_erase();
elog_prepare_empty(); elog_prepare_empty();
} }