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

sb/intel/common/spi.c: Port to i82801gx 

Offsets are a little different.

Change-Id: I39199f3279a8b76e290b6693adc50dc2ac0ccf23
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/21113
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2017-08-20 20:50:17 +02:00 committed by Nico Huber
parent 524d497355
commit c88e370f85
3 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/southbridge/intel/common/spi.c
View File

@ -294,6 +294,7 @@ void spi_init(void)
uint8_t bios_cntl; uint8_t bios_cntl;
device_t dev; device_t dev;
ich9_spi_regs *ich9_spi; ich9_spi_regs *ich9_spi;
ich7_spi_regs *ich7_spi;
uint16_t hsfs; uint16_t hsfs;
#ifdef __SMM__ #ifdef __SMM__
@ -305,26 +306,40 @@ void spi_init(void)
pci_read_config_dword(dev, 0xf0, &rcba); pci_read_config_dword(dev, 0xf0, &rcba);
/* Bits 31-14 are the base address, 13-1 are reserved, 0 is enable. */ /* Bits 31-14 are the base address, 13-1 are reserved, 0 is enable. */
rcrb = (uint8_t *)(rcba & 0xffffc000); rcrb = (uint8_t *)(rcba & 0xffffc000);
ich9_spi = (ich9_spi_regs *)(rcrb + 0x3800); if (IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82801GX)) {
cntlr.ich9_spi = ich9_spi; ich7_spi = (ich7_spi_regs *)(rcrb + 0x3020);
hsfs = readw_(&ich9_spi->hsfs); cntlr.opmenu = ich7_spi->opmenu;
ichspi_lock = hsfs & HSFS_FLOCKDN; cntlr.menubytes = sizeof(ich7_spi->opmenu);
cntlr.hsfs = hsfs; cntlr.optype = &ich7_spi->optype;
cntlr.opmenu = ich9_spi->opmenu; cntlr.addr = &ich7_spi->spia;
cntlr.menubytes = sizeof(ich9_spi->opmenu); cntlr.data = (uint8_t *)ich7_spi->spid;
cntlr.optype = &ich9_spi->optype; cntlr.databytes = sizeof(ich7_spi->spid);
cntlr.addr = &ich9_spi->faddr; cntlr.status = (uint8_t *)&ich7_spi->spis;
cntlr.data = (uint8_t *)ich9_spi->fdata; ichspi_lock = readw_(&ich7_spi->spis) & HSFS_FLOCKDN;
cntlr.databytes = sizeof(ich9_spi->fdata); cntlr.control = &ich7_spi->spic;
cntlr.status = &ich9_spi->ssfs; cntlr.bbar = &ich7_spi->bbar;
cntlr.control = (uint16_t *)ich9_spi->ssfc; cntlr.preop = &ich7_spi->preop;
cntlr.bbar = &ich9_spi->bbar; } else {
cntlr.preop = &ich9_spi->preop; ich9_spi = (ich9_spi_regs *)(rcrb + 0x3800);
cntlr.ich9_spi = ich9_spi;
hsfs = readw_(&ich9_spi->hsfs);
ichspi_lock = hsfs & HSFS_FLOCKDN;
cntlr.hsfs = hsfs;
cntlr.opmenu = ich9_spi->opmenu;
cntlr.menubytes = sizeof(ich9_spi->opmenu);
cntlr.optype = &ich9_spi->optype;
cntlr.addr = &ich9_spi->faddr;
cntlr.data = (uint8_t *)ich9_spi->fdata;
cntlr.databytes = sizeof(ich9_spi->fdata);
cntlr.status = &ich9_spi->ssfs;
cntlr.control = (uint16_t *)ich9_spi->ssfc;
cntlr.bbar = &ich9_spi->bbar;
cntlr.preop = &ich9_spi->preop;
if (cntlr.hsfs & HSFS_FDV) if (cntlr.hsfs & HSFS_FDV) {
{ writel_ (4, &ich9_spi->fdoc);
writel_ (4, &ich9_spi->fdoc); cntlr.flmap0 = readl_(&ich9_spi->fdod);
cntlr.flmap0 = readl_(&ich9_spi->fdod); }
} }
ich_set_bbar(0); ich_set_bbar(0);
@ -897,6 +912,9 @@ static int spi_flash_programmer_probe(const struct spi_slave *spi,
{ {
uint32_t flcomp; uint32_t flcomp;
if (IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82801GX))
return spi_flash_generic_probe(spi, flash);
/* Try generic probing first if spi_is_multichip returns 0. */ /* Try generic probing first if spi_is_multichip returns 0. */
if (!spi_is_multichip() && !spi_flash_generic_probe(spi, flash)) if (!spi_is_multichip() && !spi_flash_generic_probe(spi, flash))
return 0; return 0;

1
src/southbridge/intel/i82801gx/Kconfig
View File

@ -23,6 +23,7 @@ config SOUTHBRIDGE_INTEL_I82801GX
select USE_WATCHDOG_ON_BOOT select USE_WATCHDOG_ON_BOOT
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select COMMON_FADT select COMMON_FADT
select SPI_FLASH
select SOUTHBRIDGE_INTEL_COMMON_GPIO select SOUTHBRIDGE_INTEL_COMMON_GPIO
select SOUTHBRIDGE_INTEL_COMMON_SMBUS select SOUTHBRIDGE_INTEL_COMMON_SMBUS

1
src/southbridge/intel/i82801gx/Makefile.inc
View File

@ -27,6 +27,7 @@ ramstage-y += sata.c
ramstage-y += smbus.c ramstage-y += smbus.c
ramstage-y += usb.c ramstage-y += usb.c
ramstage-y += usb_ehci.c ramstage-y += usb_ehci.c
ramstage-y += ../common/spi.c
ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c