From 1105fe89131c3841378f44d584acda674f91db28 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 10 Dec 2021 18:38:16 +0100 Subject: [PATCH] soc/amd/common/block/spi/fch_spi_ctrl: handle failure in execute_command When wait_for_ready returned a timeout, execute_command still ended up returning success. Fix this be returning a failure in this case. Signed-off-by: Felix Held Change-Id: Id012e74e26065c12d003793322dcdd448df758b0 Reviewed-on: https://review.coreboot.org/c/coreboot/+/60119 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel --- src/soc/amd/common/block/spi/fch_spi_ctrl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/soc/amd/common/block/spi/fch_spi_ctrl.c b/src/soc/amd/common/block/spi/fch_spi_ctrl.c index aad8de7f69..33e1139d69 100644 --- a/src/soc/amd/common/block/spi/fch_spi_ctrl.c +++ b/src/soc/amd/common/block/spi/fch_spi_ctrl.c @@ -97,9 +97,10 @@ static int execute_command(void) spi_write8(SPI_CMD_TRIGGER, SPI_CMD_TRIGGER_EXECUTE); - if (wait_for_ready()) - printk(BIOS_ERR, - "FCH_SC Error: Timeout executing command\n"); + if (wait_for_ready()) { + printk(BIOS_ERR, "FCH_SC Error: Timeout executing command\n"); + return -1; + } dump_state(SPI_DUMP_STATE_AFTER_CMD);