erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

soc/intel/braswell: Use common sb code for SPI lockdown configuration

Browse source 
This removes the weakly linked function to configure the SPI lockdown.

Change-Id: I1e7be41a9470b37ad954d3120a67fc4d93633113
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36007
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2019-10-13 23:26:36 +02:00 • committed by Patrick Georgi
commit 68b6eb78d2
6 changed files with 22 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/soc/intel/braswell/include/soc/spi.h
View file

@ -23,14 +23,6 @@
/* These registers live behind SPI_BASE_ADDRESS. */
#define HSFSTS 0x04
# define FLOCKDN (0x1 << 15)
#define PREOP 0x94
#define OPTYPE 0x96
# define SPI_OPTYPE_RD_NOADDR 0x00 /* Read, no address */
# define SPI_OPTYPE_WR_NOADDR 0x01 /* Write, no address */
# define SPI_OPTYPE_RD_ADDR 0x02 /* Read, address required */
# define SPI_OPTYPE_WR_ADDR 0x03 /* Write, address required */
#define OPMENU0 0x98
#define OPMENU1 0x9c
#define LVSCC 0xc4
# define VCL (0x1 << 23)
# define EO(x) (((x) & 0xff) << 8)
@ -53,17 +45,14 @@
# define BCR_WPD (0x1 << 0)
/*
* SPI lockdown configuration.
* SPI VSCC configuration.
*/
struct spi_config {
uint16_t preop;
uint16_t optype;
uint32_t opmenu[2];
struct vscc_config {
uint32_t lvscc;
uint32_t uvscc;
};
/* Return 0 on success < 0 on failure. */
int mainboard_get_spi_config(struct spi_config *cfg);
int mainboard_get_spi_vscc_config(struct vscc_config *cfg);
#endif /* _SOC_SPI_H_ */

22
src/soc/intel/braswell/southcluster.c
View file

@ -42,6 +42,7 @@
#include <soc/spi.h>
#include <spi-generic.h>
#include <stdint.h>
#include <southbridge/intel/common/spi.h>
static void sc_set_serial_irqs_mode(struct device *dev, enum serirq_mode mode)
{
@ -608,13 +609,6 @@ static const struct pci_driver southcluster __pci_driver = {
.device = LPC_DEVID,
};
int __weak mainboard_get_spi_config(struct spi_config *cfg)
{
printk(BIOS_SPEW, "%s/%s (0x%p)\n",
__FILE__, __func__, (void *)cfg);
return -1;
}
static void finalize_chipset(void *unused)
{
void *bcr = (void *)(SPI_BASE_ADDRESS + BCR);
@ -622,7 +616,7 @@ static void finalize_chipset(void *unused)
void *gen_pmcon2 = (void *)(PMC_BASE_ADDRESS + GEN_PMCON2);
void *etr = (void *)(PMC_BASE_ADDRESS + ETR);
uint8_t *spi = (uint8_t *)SPI_BASE_ADDRESS;
struct spi_config cfg;
struct vscc_config cfg;
printk(BIOS_SPEW, "%s/%s (0x%p)\n",
__FILE__, __func__, unused);
@ -639,14 +633,12 @@ static void finalize_chipset(void *unused)
/* Set the CF9 lock. */
write32(etr, read32(etr) | CF9LOCK);
if (mainboard_get_spi_config(&cfg) < 0) {
printk(BIOS_DEBUG, "No SPI lockdown configuration.\n");
spi_finalize_ops();
write16(spi + HSFSTS, read16(spi + HSFSTS) | FLOCKDN);
if (mainboard_get_spi_vscc_config(&cfg) < 0) {
printk(BIOS_DEBUG, "No SPI VSCC configuration.\n");
} else {
write16(spi + PREOP, cfg.preop);
write16(spi + OPTYPE, cfg.optype);
write32(spi + OPMENU0, cfg.opmenu[0]);
write32(spi + OPMENU1, cfg.opmenu[1]);
write16(spi + HSFSTS, read16(spi + HSFSTS) | FLOCKDN);
write32(spi + UVSCC, cfg.uvscc);
write32(spi + LVSCC, cfg.lvscc | VCL);
}