From 77a2315f6bdac768f09f322e1e1a1d000b80f64c Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Mon, 22 Aug 2016 17:41:13 -0500 Subject: [PATCH] UPSTREAM: drivers/spi: be sure to call spi_init() before spi_flash_probe() It's necessary to call spi_init() prior to calling spi_flash_probe() such that the SPI drivers can do any work required prior to performing SPI transactions. It could be argued that the drivers should handle such situations, however the SPI API implementations seem to assume the callers ensured spi_init() was called before any SPI transactions. This fixes systems that failed to boot introduced by [1]. Issue tracked in https://ticket.coreboot.org/issues/67. [1] I2aa75f88409309e3f9b9bd79b52d27c0061139c8 https://review.coreboot.org/16200 BUG=chrome-os-partner:56151 BRANCH=None TEST=None Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/16297 Tested-by: build bot (Jenkins) Reviewed-by: Philipp Deppenwiese Reviewed-by: Furquan Shaikh Reviewed-by: Paul Menzel Tested-by: Raptor Engineering Automated Test Stand Change-Id: I2d8d5ac685833521f1efe212b07a4b61ba0d9bc3 Reviewed-on: https://chromium-review.googlesource.com/374121 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/drivers/spi/boot_device_rw_nommap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/drivers/spi/boot_device_rw_nommap.c b/src/drivers/spi/boot_device_rw_nommap.c index 2a9f19f1f8..bf15e99f94 100644 --- a/src/drivers/spi/boot_device_rw_nommap.c +++ b/src/drivers/spi/boot_device_rw_nommap.c @@ -78,6 +78,9 @@ void boot_device_init(void) if (car_get_var(sfg) != NULL) return; + /* Ensure any necessary setup is performed by the drivers. */ + spi_init(); + car_set_var(sfg, spi_flash_probe(bus, cs)); }