Change in coreboot[master]: soc/amd/common/block/spi/fch_spi_ctrl: handle failure in execute_command

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/60119 )

Change subject: soc/amd/common/block/spi/fch_spi_ctrl: handle failure in execute_command
......................................................................

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 
---
M src/soc/amd/common/block/spi/fch_spi_ctrl.c
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Raul Rangel: Looks good to me, approved

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 aad8de7..33e1139 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 @@

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);