GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/common/fast_spi: Add Lockdown of extended BIOS region 

This change adds support to Lock down the configuration of
extended BIOS region. This is done as part of
fast_spi_lockdown_cfg() so that it is consistent with the
other lockdown.

Change includes:
1. New helper function fast_spi_lock_ext_bios_cfg() added that
will basically set EXT_BIOS_LOCK.

BUG=b:171534504

Signed-off-by: Srinidhi N Kaushik <srinidhi.n.kaushik@intel.com>
Change-Id: I730fc12a9c5ca8bb4a1f946cad45944dda8e0518
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48068
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Srinidhi N Kaushik 2020-11-25 21:57:37 -08:00 committed by Furquan Shaikh
parent 4eb489fb0f
commit 28e1d0ea55
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/soc/intel/common/block/fast_spi/fast_spi.c
View File

@ -63,19 +63,19 @@ void fast_spi_init(void)
/* /*
* Set FAST_SPIBAR BIOS Control register based on input bit field. * Set FAST_SPIBAR BIOS Control register based on input bit field.
*/ */
static void fast_spi_set_bios_control_reg(uint8_t bios_cntl_bit) static void fast_spi_set_bios_control_reg(uint32_t bios_cntl_bit)
{ {
#if defined(__SIMPLE_DEVICE__) #if defined(__SIMPLE_DEVICE__)
pci_devfn_t dev = PCH_DEV_SPI; pci_devfn_t dev = PCH_DEV_SPI;
#else #else
struct device *dev = PCH_DEV_SPI; struct device *dev = PCH_DEV_SPI;
#endif #endif
uint8_t bc_cntl; uint32_t bc_cntl;
assert((bios_cntl_bit & (bios_cntl_bit - 1)) == 0); assert((bios_cntl_bit & (bios_cntl_bit - 1)) == 0);
bc_cntl = pci_read_config8(dev, SPIBAR_BIOS_CONTROL); bc_cntl = pci_read_config32(dev, SPIBAR_BIOS_CONTROL);
bc_cntl |= bios_cntl_bit; bc_cntl |= bios_cntl_bit;
pci_write_config8(dev, SPIBAR_BIOS_CONTROL, bc_cntl); pci_write_config32(dev, SPIBAR_BIOS_CONTROL, bc_cntl);
} }
/* /*
@ -106,6 +106,19 @@ void fast_spi_set_lock_enable(void)
fast_spi_read_post_write(SPIBAR_BIOS_CONTROL); fast_spi_read_post_write(SPIBAR_BIOS_CONTROL);
} }
/*
* Set FAST_SPIBAR BIOS Control EXT BIOS LE bit.
*/
void fast_spi_set_ext_bios_lock_enable(void)
{
if (!CONFIG(FAST_SPI_SUPPORTS_EXT_BIOS_WINDOW))
return;
fast_spi_set_bios_control_reg(SPIBAR_BIOS_CONTROL_EXT_BIOS_LOCK_ENABLE);
fast_spi_read_post_write(SPIBAR_BIOS_CONTROL);
}
/* /*
* Set FAST_SPIBAR BIOS Control EISS bit. * Set FAST_SPIBAR BIOS Control EISS bit.
*/ */

1
src/soc/intel/common/block/fast_spi/fast_spi_def.h
View File

@ -14,6 +14,7 @@
/* Bit definitions for BIOS_CONTROL */ /* Bit definitions for BIOS_CONTROL */
#define SPIBAR_BIOS_CONTROL_WPD (1 << 0) #define SPIBAR_BIOS_CONTROL_WPD (1 << 0)
#define SPIBAR_BIOS_CONTROL_LOCK_ENABLE (1 << 1) #define SPIBAR_BIOS_CONTROL_LOCK_ENABLE (1 << 1)
#define SPIBAR_BIOS_CONTROL_EXT_BIOS_LOCK_ENABLE (1 << 28)
#define SPIBAR_BIOS_CONTROL_CACHE_DISABLE (1 << 2) #define SPIBAR_BIOS_CONTROL_CACHE_DISABLE (1 << 2)
#define SPIBAR_BIOS_CONTROL_PREFETCH_ENABLE (1 << 3) #define SPIBAR_BIOS_CONTROL_PREFETCH_ENABLE (1 << 3)
#define SPIBAR_BIOS_CONTROL_EISS (1 << 5) #define SPIBAR_BIOS_CONTROL_EISS (1 << 5)

4
src/soc/intel/common/block/include/intelblocks/fast_spi.h
View File

@ -22,6 +22,10 @@ void fast_spi_set_bios_interface_lock_down(void);
* Set FAST_SPIBAR BIOS Control LE bit. * Set FAST_SPIBAR BIOS Control LE bit.
*/ */
void fast_spi_set_lock_enable(void); void fast_spi_set_lock_enable(void);
/*
* Set FAST_SPIBAR BIOS Control Ext Bios LE bit.
*/
void fast_spi_set_ext_bios_lock_enable(void);
/* /*
* Set FAST_SPIBAR BIOS Control EISS bit. * Set FAST_SPIBAR BIOS Control EISS bit.
*/ */

3
src/soc/intel/common/pch/lockdown/lockdown.c
View File

@ -63,6 +63,9 @@ static void fast_spi_lockdown_cfg(int chipset_lockdown)
/* BIOS Lock */ /* BIOS Lock */
fast_spi_set_lock_enable(); fast_spi_set_lock_enable();
/* EXT BIOS Lock */
fast_spi_set_ext_bios_lock_enable();
} }
} }