diff options
| -rw-r--r-- | src/soc/intel/common/block/fast_spi/fast_spi.c | 17 | ||||
| -rw-r--r-- | src/soc/intel/common/block/fast_spi/fast_spi_def.h | 7 | ||||
| -rw-r--r-- | src/soc/intel/common/block/include/intelblocks/fast_spi.h | 4 |
3 files changed, 28 insertions, 0 deletions
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 4ff1e9ba70..7e8a1a2844 100644 --- a/src/soc/intel/common/block/fast_spi/fast_spi.c +++ b/src/soc/intel/common/block/fast_spi/fast_spi.c @@ -171,6 +171,23 @@ void fast_spi_pr_dlock(void) } /* + * Set FAST_SPIBAR + VSCC0 (0xC4) register VCL (bit 30). + */ +void fast_spi_vscc0_lock(void) +{ + void *spibar = fast_spi_get_bar(); + + /* + * SPI Flash Programming Guide Section 5.5.2 describes Vendor Component Lock (VCL). + * It is recommended to set the VCL bit. VCL applies to both VSCC0 and VSCC1. + * Without this bit being set, it is possible to modify Host/GbE VSCC register(s), + * which might results in undesired host and integrated GbE Serial Flash + * functionality. + */ + setbits32(spibar + SPIBAR_SFDP0_VSCC0, SPIBAR_VSCC0_VCL); +} + +/* * Set FAST_SPIBAR Soft Reset Data Register value. */ void fast_spi_set_strap_msg_data(uint32_t soft_reset_data) 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 f28865d9b3..0be3dcd255 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 @@ -131,6 +131,13 @@ (SPI_OPTYPE_1 << 2) | (SPI_OPTYPE_0)) #define SPI_OPPREFIX ((0x50 << 8) | 0x06) /* EWSR and WREN */ +/* + * Register Offset of BIOS Vendor Specific Component Capabilities (VSCC) + * for Component 0 Register + */ +#define SPIBAR_SFDP0_VSCC0 0xc4 +#define SPIBAR_VSCC0_VCL (1 << 30) + /* Bit definitions for PTINX (0xcc) register */ #define SPIBAR_PTINX_COMP_0 (0 << 14) #define SPIBAR_PTINX_COMP_1 (1 << 14) 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 1e96603438..90f1cb224e 100644 --- a/src/soc/intel/common/block/include/intelblocks/fast_spi.h +++ b/src/soc/intel/common/block/include/intelblocks/fast_spi.h @@ -43,6 +43,10 @@ void fast_spi_lock_bar(void); */ void fast_spi_pr_dlock(void); /* + * Set FAST_SPIBAR + VSCC0 (0xC4) register VCL (bit 30). + */ +void fast_spi_vscc0_lock(void); +/* * Set FAST_SPIBAR Soft Reset Data Register value. */ void fast_spi_set_strap_msg_data(uint32_t soft_reset_data); |