Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/50753 )
Change subject: soc/intel/common: Drop unused `fast_spi_flash_read_wpsr` function ......................................................................
soc/intel/common: Drop unused `fast_spi_flash_read_wpsr` function
Also remove one macro that was only used inside that function.
Change-Id: Id798e08375c5757aa99288ca4a7df923309f4d67 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/50753 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Michael Niewöhner foss@mniewoehner.de --- M src/soc/intel/common/block/fast_spi/fast_spi_def.h M src/soc/intel/common/block/fast_spi/fast_spi_flash.c M src/soc/intel/common/block/include/intelblocks/fast_spi.h 3 files changed, 0 insertions(+), 31 deletions(-)
Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved
diff --git a/src/soc/intel/common/block/fast_spi/fast_spi_def.h b/src/soc/intel/common/block/fast_spi/fast_spi_def.h index ce4eb2d..6ec12da 100644 --- a/src/soc/intel/common/block/fast_spi/fast_spi_def.h +++ b/src/soc/intel/common/block/fast_spi/fast_spi_def.h @@ -76,8 +76,6 @@ #define SPIBAR_HSFSTS_FDONE (1 << 0) #define SPIBAR_HSFSTS_W1C_BITS (0xff)
-#define WPSR_MASK_SRP0_BIT 0x80 - /* Bit definitions for FADDR (0x08) register */ #define SPIBAR_FADDR_MASK 0x7FFFFFF
diff --git a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c b/src/soc/intel/common/block/fast_spi/fast_spi_flash.c index da99490..59ad7b4 100644 --- a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c +++ b/src/soc/intel/common/block/fast_spi/fast_spi_flash.c @@ -302,30 +302,6 @@ return 0; }
-/* - * Minimal set of commands to read WPSR from FAST_SPI. - * Returns 0 on success, < 0 on failure. - */ -int fast_spi_flash_read_wpsr(u8 *sr) -{ - uint8_t rdsr; - int ret = 0; - - fast_spi_init(); - - /* sending NULL for spiflash struct parameter since we are not - * calling HWSEQ read_status() call via Probe. - */ - ret = fast_spi_flash_status(NULL, &rdsr); - if (ret) { - printk(BIOS_ERR, "SPI rdsr failed\n"); - return ret; - } - *sr = rdsr & WPSR_MASK_SRP0_BIT; - - return 0; -} - static int fast_spi_flash_ctrlr_setup(const struct spi_slave *dev) { if (dev->cs != 0) { diff --git a/src/soc/intel/common/block/include/intelblocks/fast_spi.h b/src/soc/intel/common/block/include/intelblocks/fast_spi.h index e742a27..3ba240b 100644 --- a/src/soc/intel/common/block/include/intelblocks/fast_spi.h +++ b/src/soc/intel/common/block/include/intelblocks/fast_spi.h @@ -10,11 +10,6 @@ */ void fast_spi_init(void); /* - * Minimal set of commands to read WPSR from SPI. - * Returns 0 on success, < 0 on failure. - */ -int fast_spi_flash_read_wpsr(u8 *sr); -/* * Set FAST_SPIBAR BIOS Control BILD bit. */ void fast_spi_set_bios_interface_lock_down(void);