spi25: Revise decision when to enter/exit 4BA mode

Instead of arbitrarily deciding whether to enter 4BA mode in the flash
chip's declaration, advertise that entering 4BA mode is supported and
only enter it if the SPI master supports 4-byte addresses. If not, exit
4BA mode (the chip might be in 4BA mode after reset). If we can't assure
the state of 4BA mode, we bail out to simplify the code (we'd have to
ensure that we don't run any instructions that can usually be switched
to 4BA mode otherwise).

Two new feature flags are introduced:

* FEATURE_4BA_ENTER:
  Can enter/exit 4BA mode with instructions 0xb7/0xe9 w/o WREN.
* FEATURE_4BA_ENTER_WREN
  Can enter/exit 4BA mode with instructions 0xb7/0xe9 after WREN.

FEATURE_4BA_SUPPORT is dropped, it's completely implicit now.

Also, draw the with/without WREN distinction into the enter/exit
functions to reduce code redundancy.

Change-Id: I877fe817f801fc54bd0ee2ce4e3ead324cbb3673
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/22422
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>

1 files changed, 12 insertions, 27 deletions

diff --git a/spi25.c b/spi25.c
index 787f62e39..00e0992cf 100644
--- a/spi25.c
+++ b/spi25.c
@@ -843,42 +843,27 @@ bailout:
 	return SPI_GENERIC_ERROR;
 }
 
-/* Enter 4-bytes addressing mode (without sending WREN before) */
-int spi_enter_4ba_b7(struct flashctx *flash)
+static int spi_enter_exit_4ba(struct flashctx *const flash, const bool enter)
 {
-	const unsigned char cmd = JEDEC_ENTER_4_BYTE_ADDR_MODE;
+	const unsigned char cmd = enter ? JEDEC_ENTER_4_BYTE_ADDR_MODE : JEDEC_EXIT_4_BYTE_ADDR_MODE;
+	int ret = 1;
 
-	const int ret = spi_send_command(flash, sizeof(cmd), 0, &cmd, NULL);
-	if (!ret)
-		flash->in_4ba_mode = true;
-	return ret;
-}
+	if (flash->chip->feature_bits & FEATURE_4BA_ENTER)
+		ret = spi_send_command(flash, sizeof(cmd), 0, &cmd, NULL);
+	else if (flash->chip->feature_bits & FEATURE_4BA_ENTER_WREN)
+		ret = spi_simple_write_cmd(flash, cmd, 0);
 
-/* Enter 4-bytes addressing mode with sending WREN before */
-int spi_enter_4ba_b7_we(struct flashctx *flash)
-{
-	const int ret = spi_simple_write_cmd(flash, JEDEC_ENTER_4_BYTE_ADDR_MODE, 0);
 	if (!ret)
-		flash->in_4ba_mode = true;
+		flash->in_4ba_mode = enter;
 	return ret;
 }
 
-/* Exit 4-bytes addressing mode (without sending WREN before) */
-int spi_exit_4ba_e9(struct flashctx *flash)
+int spi_enter_4ba(struct flashctx *const flash)
 {
-	const unsigned char cmd = JEDEC_EXIT_4_BYTE_ADDR_MODE;
-
-	const int ret = spi_send_command(flash, sizeof(cmd), 0, &cmd, NULL);
-	if (!ret)
-		flash->in_4ba_mode = false;
-	return ret;
+	return spi_enter_exit_4ba(flash, true);
 }
 
-/* Exit 4-bytes addressing mode with sending WREN before */
-int spi_exit_4ba_e9_we(struct flashctx *flash)
+int spi_exit_4ba(struct flashctx *flash)
 {
-	const int ret = spi_simple_write_cmd(flash, JEDEC_EXIT_4_BYTE_ADDR_MODE, 0);
-	if (!ret)
-		flash->in_4ba_mode = false;
-	return ret;
+	return spi_enter_exit_4ba(flash, false);
 }