drivers/spi/spi_flash: Pass in flash structure to fill in probe

Instead of making all SPI drivers allocate space for a spi_flash
structure and fill it in, udpate the API to allow callers to pass in a
spi_flash structure that can be filled by the flash drivers as
required. This also cleans up the interface so that the callers can
maintain and free the space for spi_flash structure as required.

BUG=b:38330715

Change-Id: If6f1b403731466525c4690777d9b32ce778eb563
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19705
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/soc/intel/fsp_baytrail/nvm.c b/src/soc/intel/fsp_baytrail/nvm.c
index 6f2fdbbd6a..a4a7998a0f 100644
--- a/src/soc/intel/fsp_baytrail/nvm.c
+++ b/src/soc/intel/fsp_baytrail/nvm.c
@@ -21,25 +21,27 @@
 #include <spi-generic.h>
 #include <spi_flash.h>
 #include <soc/nvm.h>
+#include <stdint.h>
 
 /* This module assumes the flash is memory mapped just below 4GiB in the
  * address space for reading. Also this module assumes an area it erased
  * when all bytes read as all 0xff's. */
 
-static struct spi_flash *flash;
+static struct spi_flash flash;
+static bool spi_flash_init_done;
 
 static int nvm_init(void)
 {
-	if (flash != NULL)
+	if (spi_flash_init_done == true)
 		return 0;
 
 	spi_init();
-	flash = spi_flash_probe(0, 0);
-	if (!flash) {
+	if (spi_flash_probe(0, 0, &flash)) {
 		printk(BIOS_DEBUG, "Could not find SPI device\n");
 		return -1;
 	}
 
+	spi_flash_init_done = true;
 	return 0;
 }
 
@@ -67,7 +69,7 @@ int nvm_erase(void *start, size_t size)
 {
 	if (nvm_init() < 0)
 		return -1;
-	spi_flash_erase(flash, to_flash_offset(start), size);
+	spi_flash_erase(&flash, to_flash_offset(start), size);
 	return 0;
 }
 
@@ -76,6 +78,6 @@ int nvm_write(void *start, const void *data, size_t size)
 {
 	if (nvm_init() < 0)
 		return -1;
-	spi_flash_write(flash, to_flash_offset(start), size, data);
+	spi_flash_write(&flash, to_flash_offset(start), size, data);
 	return 0;
 }