openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-30 16:33:41 +02:00
Code Issues Releases Wiki Activity

ene_lpc.c: Clean up cosmetics

Browse Source 
Reflow long lines, drop unnecessary parentheses, add spaces after `if`
and `while` keywords and add braces to a single-statement `else if`
block that follows a multi-statement `if` block.

TEST=Build with `make distclean && make VERSION=none -j` with and
     without this patch, the flashrom executable does not change.

Change-Id: Iaa5277b12fca192c46c11f5e0f375dc43d06bf5c
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/52413
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Angel Pons 2021-04-16 11:16:52 +02:00 committed by Nico Huber
parent 1ce155d5d5
commit b4a63e9616
1 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ene_lpc.c
View File

@ -166,7 +166,7 @@ static void ec_command(const ene_chip_t *chip, uint8_t cmd, uint8_t data)
gettimeofday(&begin, NULL); gettimeofday(&begin, NULL);
while (INB(chip->port_ec_command) & MASK_INPUT_BUFFER_FULL) { while (INB(chip->port_ec_command) & MASK_INPUT_BUFFER_FULL) {
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if ((now.tv_sec - begin.tv_sec) >= EC_COMMAND_TIMEOUT) { if (now.tv_sec - begin.tv_sec >= EC_COMMAND_TIMEOUT) {
msg_pdbg("%s: buf not empty\n", __func__); msg_pdbg("%s: buf not empty\n", __func__);
return; return;
} }
@ -178,11 +178,9 @@ static void ec_command(const ene_chip_t *chip, uint8_t cmd, uint8_t data)
if (chip->chip_id == ENE_KB932) { if (chip->chip_id == ENE_KB932) {
/* Spin wait for EC input buffer empty */ /* Spin wait for EC input buffer empty */
gettimeofday(&begin, NULL); gettimeofday(&begin, NULL);
while (INB(chip->port_ec_command) & while (INB(chip->port_ec_command) & MASK_INPUT_BUFFER_FULL) {
MASK_INPUT_BUFFER_FULL) {
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if ((now.tv_sec - begin.tv_sec) >= if (now.tv_sec - begin.tv_sec >= EC_COMMAND_TIMEOUT) {
EC_COMMAND_TIMEOUT) {
msg_pdbg("%s: buf not empty\n", __func__); msg_pdbg("%s: buf not empty\n", __func__);
return; return;
} }
@ -295,9 +293,9 @@ static int ene_spi_wait(const ene_chip_t *chip)
struct timeval begin, now; struct timeval begin, now;
gettimeofday(&begin, NULL); gettimeofday(&begin, NULL);
while(ene_read(chip, REG_SPI_CONFIG) & CFG_STATUS) { while (ene_read(chip, REG_SPI_CONFIG) & CFG_STATUS) {
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if ((now.tv_sec - begin.tv_sec) >= EC_COMMAND_TIMEOUT) { if (now.tv_sec - begin.tv_sec >= EC_COMMAND_TIMEOUT) {
msg_pdbg("%s: spi busy\n", __func__); msg_pdbg("%s: spi busy\n", __func__);
return 1; return 1;
} }
@ -318,17 +316,14 @@ static int ene_pause_ec(ene_lpc_data_t *ctx_data)
gettimeofday(&begin, NULL); gettimeofday(&begin, NULL);
/* Spin wait for EC ready */ /* Spin wait for EC ready */
while (ene_read(chip, chip->ec_status_buf) != while (ene_read(chip, chip->ec_status_buf) != chip->ec_is_pausing) {
chip->ec_is_pausing) {
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if ((now.tv_sec - begin.tv_sec) >= if (now.tv_sec - begin.tv_sec >= EC_COMMAND_TIMEOUT) {
EC_COMMAND_TIMEOUT) {
msg_pdbg("%s: unable to pause ec\n", __func__); msg_pdbg("%s: unable to pause ec\n", __func__);
return -1; return -1;
} }
} }
gettimeofday(&ctx_data->pause_begin, NULL); gettimeofday(&ctx_data->pause_begin, NULL);
ctx_data->ec_state = EC_STATE_IDLE; ctx_data->ec_state = EC_STATE_IDLE;
return 0; return 0;
@ -346,11 +341,9 @@ static int ene_resume_ec(ene_lpc_data_t *ctx_data)
ene_write(chip, REG_EC_EXTCMD, 0xff); ene_write(chip, REG_EC_EXTCMD, 0xff);
gettimeofday(&begin, NULL); gettimeofday(&begin, NULL);
while (ene_read(chip, chip->ec_status_buf) != while (ene_read(chip, chip->ec_status_buf) != chip->ec_is_running) {
chip->ec_is_running) {
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if ((now.tv_sec - begin.tv_sec) >= if (now.tv_sec - begin.tv_sec >= EC_COMMAND_TIMEOUT) {
EC_COMMAND_TIMEOUT) {
msg_pdbg("%s: unable to resume ec\n", __func__); msg_pdbg("%s: unable to resume ec\n", __func__);
return -1; return -1;
} }
@ -364,11 +357,9 @@ static int ene_pause_timeout_check(ene_lpc_data_t *ctx_data)
{ {
struct timeval pause_now; struct timeval pause_now;
gettimeofday(&pause_now, NULL); gettimeofday(&pause_now, NULL);
if ((pause_now.tv_sec - ctx_data->pause_begin.tv_sec) >= if (pause_now.tv_sec - ctx_data->pause_begin.tv_sec >= EC_PAUSE_TIMEOUT) {
EC_PAUSE_TIMEOUT) { if (ene_resume_ec(ctx_data) == 0)
if(ene_resume_ec(ctx_data) == 0)
ene_pause_ec(ctx_data); ene_pause_ec(ctx_data);
} }
return 0; return 0;
} }
@ -385,11 +376,9 @@ static int ene_reset_ec(ene_lpc_data_t *ctx_data)
ec_command(chip, chip->ec_reset_cmd, chip->ec_reset_data); ec_command(chip, chip->ec_reset_cmd, chip->ec_reset_data);
/* Spin wait for EC ready */ /* Spin wait for EC ready */
while (ene_read(chip, chip->ec_status_buf) != while (ene_read(chip, chip->ec_status_buf) != chip->ec_is_stopping) {
chip->ec_is_stopping) {
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if ((now.tv_sec - begin.tv_sec) >= if (now.tv_sec - begin.tv_sec >= EC_COMMAND_TIMEOUT) {
EC_COMMAND_TIMEOUT) {
msg_pdbg("%s: unable to reset ec\n", __func__); msg_pdbg("%s: unable to reset ec\n", __func__);
return -1; return -1;
} }
@ -440,9 +429,9 @@ static int ene_spi_send_command(const struct flashctx *flash,
ctx_data->ec_state = EC_STATE_IDLE; ctx_data->ec_state = EC_STATE_IDLE;
return 1; return 1;
} }
} } else if (chip->chip_id == ENE_KB94X && ctx_data->ec_state == EC_STATE_IDLE) {
else if(chip->chip_id == ENE_KB94X && ctx_data->ec_state == EC_STATE_IDLE)
ene_pause_timeout_check(ctx_data); ene_pause_timeout_check(ctx_data);
}
ene_spi_start(chip); ene_spi_start(chip);
@ -487,19 +476,16 @@ static int ene_leave_flash_mode(void *data)
gettimeofday(&begin, NULL); gettimeofday(&begin, NULL);
/* EC restart */ /* EC restart */
while (ene_read(chip, chip->ec_status_buf) != while (ene_read(chip, chip->ec_status_buf) != chip->ec_is_running) {
chip->ec_is_running) {
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
if ((now.tv_sec - begin.tv_sec) >= if (now.tv_sec - begin.tv_sec >= EC_RESTART_TIMEOUT) {
EC_RESTART_TIMEOUT) {
msg_pdbg("%s: ec restart busy\n", __func__); msg_pdbg("%s: ec restart busy\n", __func__);
rv = 1; rv = 1;
goto exit; goto exit;
} }
} }
msg_pdbg("%s: send ec restart\n", __func__); msg_pdbg("%s: send ec restart\n", __func__);
ec_command(chip, chip->ec_restart_cmd, ec_command(chip, chip->ec_restart_cmd, chip->ec_restart_data);
chip->ec_restart_data);
ctx_data->ec_state = EC_STATE_NORMAL; ctx_data->ec_state = EC_STATE_NORMAL;
rv = 0; rv = 0;