From cc20a9b08e849437a58402f4a64d63d3710684af Mon Sep 17 00:00:00 2001 From: Ed Swierk Date: Mon, 3 Jul 2017 13:17:18 -0700 Subject: 4BA: Allow disabling 4-byte address mode for SPI flash This allows us to support flash chips in any of the following configurations, regardless of whether the chip powers up in 3-byte or 4-byte address mode. - standard commands with extended address register (*_4ba_ereg) or direct commands (*_4ba_direct) in 3-byte address mode (.set_4ba = spi_exit_4ba_*) - standard commands (*_4ba) or direct commands (*_4ba_direct) in 4-byte address mode (.set_4ba = spi_enter_4ba_*) - direct commands (*_4ba_direct) in either address mode (.set_4ba = NULL) Change-Id: I0b25309d731426940fc50956b744b681ab599e87 Signed-off-by: Ed Swierk Reviewed-on: https://review.coreboot.org/20510 Reviewed-by: David Hendricks Tested-by: build bot (Jenkins) --- flash.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'flash.h') diff --git a/flash.h b/flash.h index 52f0d49f..dfda9d25 100644 --- a/flash.h +++ b/flash.h @@ -119,14 +119,7 @@ enum write_granularity { #define FEATURE_WRSR_EITHER (FEATURE_WRSR_EWSR | FEATURE_WRSR_WREN) #define FEATURE_OTP (1 << 8) #define FEATURE_QPI (1 << 9) -/* Feature bits used for 4-bytes addressing mode */ -#define FEATURE_4BA_SUPPORT (1 << 10) -#define FEATURE_4BA_ONLY (1 << 11) -#define FEATURE_4BA_EXTENDED_ADDR_REG (1 << 12) -#define FEATURE_4BA_DIRECT_READ (1 << 13) -#define FEATURE_4BA_DIRECT_WRITE (1 << 14) -#define FEATURE_4BA_ALL_ERASERS_DIRECT (1 << 15) -#define FEATURE_4BA_ALL_DIRECT (FEATURE_4BA_DIRECT_READ | FEATURE_4BA_DIRECT_WRITE | FEATURE_4BA_ALL_ERASERS_DIRECT) +#define FEATURE_4BA_SUPPORT (1 << 10) enum test_state { OK = 0, @@ -174,7 +167,7 @@ struct flashchip { /* set of function pointers to use in 4-bytes addressing mode */ struct four_bytes_addr_funcs_set { - int (*enter_4ba) (struct flashctx *flash); + int (*set_4ba) (struct flashctx *flash); int (*read_nbyte) (struct flashctx *flash, unsigned int addr, uint8_t *bytes, unsigned int len); int (*program_byte) (struct flashctx *flash, unsigned int addr, const uint8_t databyte); int (*program_nbyte) (struct flashctx *flash, unsigned int addr, const uint8_t *bytes, unsigned int len); -- cgit v1.2.3