diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2019-10-13 22:54:53 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2019-11-10 22:41:43 +0000 |
| commit | 3c1e986119cdfece27e5bf953576fa01882bb773 (patch) | |
| tree | ff80d91de5c57c47ed7ab8db7ec7fd9194d47d23 /src/soc/intel/broadwell/finalize.c | |
| parent | 5efee3a2c28aa7e53074288733632fa06ac66046 (diff) | |
soc/intel/broadwell: Use common sb code for SPI lockdown configuration
Change-Id: I5a8239f4e9e1f9728074ff5452c95d3138965d82
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36005
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/soc/intel/broadwell/finalize.c')
| -rw-r--r-- | src/soc/intel/broadwell/finalize.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c index 10ba1d7c15..1c5fdb8885 100644 --- a/src/soc/intel/broadwell/finalize.c +++ b/src/soc/intel/broadwell/finalize.c @@ -27,6 +27,7 @@ #include <soc/rcba.h> #include <soc/spi.h> #include <soc/systemagent.h> +#include <southbridge/intel/common/spi.h> const struct reg_script system_agent_finalize_script[] = { REG_PCI_OR16(0x50, 1 << 0), /* GGC */ @@ -57,16 +58,6 @@ const struct reg_script system_agent_finalize_script[] = { const struct reg_script pch_finalize_script[] = { #if !CONFIG(SPI_CONSOLE) - /* Set SPI opcode menu */ - REG_MMIO_WRITE16(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_PREOP, - SPI_OPPREFIX), - REG_MMIO_WRITE16(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_OPTYPE, - SPI_OPTYPE), - REG_MMIO_WRITE32(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + - SPIBAR_OPMENU_LOWER, SPI_OPMENU_LOWER), - REG_MMIO_WRITE32(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + - SPIBAR_OPMENU_UPPER, SPI_OPMENU_UPPER), - /* Lock SPIBAR */ REG_MMIO_OR32(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_HSFS, SPIBAR_HSFS_FLOCKDN), @@ -101,6 +92,8 @@ static void broadwell_finalize(void *unused) printk(BIOS_DEBUG, "Finalizing chipset.\n"); reg_script_run_on_dev(sa_dev, system_agent_finalize_script); + + spi_finalize_ops(); reg_script_run_on_dev(PCH_DEV_LPC, pch_finalize_script); /* Lock */ |