From 2b96f421e6539ceae5c1d0dcd07ed4dfe8a6016a Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 14 Dec 2017 15:32:37 -0700 Subject: soc/intel/common/fast_spi: implement spi_flash_ctrlr_protect_region() In the fast spi support implement the callback for flash_protect(). This removes the need for having SOC_INTEL_COMMON_SPI_FLASH_PROTECT Kconfig option as well spi_flash_get_fpr_info() and separate spi_flash.[ch]. BUG=b:69614064 Change-Id: Iaf3b599a13a756262d3f36bae60de4f7fd00e7dc Signed-off-by: Aaron Durbn Reviewed-on: https://review.coreboot.org/22881 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik --- src/soc/intel/common/block/fast_spi/fast_spi.c | 1 - .../intel/common/block/fast_spi/fast_spi_flash.c | 66 ++++++++++++++++++---- 2 files changed, 56 insertions(+), 11 deletions(-) (limited to 'src/soc/intel/common/block') diff --git a/src/soc/intel/common/block/fast_spi/fast_spi.c b/src/soc/intel/common/block/fast_spi/fast_spi.c index 1d3a3c8b51..288e0c4389 100644 --- a/src/soc/intel/common/block/fast_spi/fast_spi.c +++ b/src/soc/intel/common/block/fast_spi/fast_spi.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include 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 6dac24e4e6..4579b19151 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 @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -318,15 +317,6 @@ static int fast_spi_flash_probe(const struct spi_slave *dev, return 0; } -int spi_flash_get_fpr_info(struct fpr_info *info) -{ - BOILERPLATE_CREATE_CTX(ctx); - - info->base = ctx->mmio_base + SPIBAR_FPR_BASE; - info->max = SPIBAR_FPR_MAX; - return 0; -} - /* * Minimal set of commands to read WPSR from FAST_SPI. * Returns 0 on success, < 0 on failure. @@ -362,8 +352,64 @@ static int fast_spi_flash_ctrlr_setup(const struct spi_slave *dev) return 0; } +#define SPI_FPR_SHIFT 12 +#define SPI_FPR_MASK 0x7fff +#define SPI_FPR_BASE_SHIFT 0 +#define SPI_FPR_LIMIT_SHIFT 16 +#define SPI_FPR_RPE (1 << 15) /* Read Protect */ +#define SPI_FPR_WPE (1 << 31) /* Write Protect */ +#define SPI_FPR(base, limit) \ + (((((limit) >> SPI_FPR_SHIFT) & SPI_FPR_MASK) << SPI_FPR_LIMIT_SHIFT) |\ + ((((base) >> SPI_FPR_SHIFT) & SPI_FPR_MASK) << SPI_FPR_BASE_SHIFT)) + +/* + * Protect range of SPI flash defined by [start, start+size-1] using Flash + * Protected Range (FPR) register if available. + */ +static int fast_spi_flash_protect(const struct spi_flash *flash, + const struct region *region) +{ + u32 start = region_offset(region); + u32 end = start + region_sz(region) - 1; + u32 reg; + int fpr; + uintptr_t fpr_base; + BOILERPLATE_CREATE_CTX(ctx); + + fpr_base = ctx->mmio_base + SPIBAR_FPR_BASE; + + /* Find first empty FPR */ + for (fpr = 0; fpr < SPIBAR_FPR_MAX; fpr++) { + reg = read32((void *)fpr_base); + if (reg == 0) + break; + fpr_base += sizeof(uint32_t); + } + + if (fpr >= SPIBAR_FPR_MAX) { + printk(BIOS_ERR, "ERROR: No SPI FPR free!\n"); + return -1; + } + + /* Set protected range base and limit */ + reg = SPI_FPR(start, end) | SPI_FPR_WPE; + + /* Set the FPR register and verify it is protected */ + write32((void *)fpr_base, reg); + reg = read32((void *)fpr_base); + if (!(reg & SPI_FPR_WPE)) { + printk(BIOS_ERR, "ERROR: Unable to set SPI FPR %d\n", fpr); + return -1; + } + + printk(BIOS_INFO, "%s: FPR %d is enabled for range 0x%08x-0x%08x\n", + __func__, fpr, start, end); + return 0; +} + const struct spi_ctrlr fast_spi_flash_ctrlr = { .setup = fast_spi_flash_ctrlr_setup, .max_xfer_size = SPI_CTRLR_DEFAULT_MAX_XFER_SIZE, .flash_probe = fast_spi_flash_probe, + .flash_protect = fast_spi_flash_protect, }; -- cgit v1.2.3