diff options
| author | Stefan Tauner <stefan.tauner@gmx.at> | 2018-08-26 13:53:16 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-11-26 09:42:12 +0000 |
| commit | 327205dc2a7ac1dcd0c19080939c8030b0b9b16c (patch) | |
| tree | afcd2794afeda7a075e5a959b7219a61e25488ca | |
| parent | 630a418feac478410d2f23f06cbf85000decc4d2 (diff) | |
| download | coreboot-327205dc2a7ac1dcd0c19080939c8030b0b9b16c.tar.xz | |
sb/intel/spi: read FLCOMP descriptor early and cache it
Change-Id: I4e5fe3ff083f2d0db1cfde16550b57537d5f7262
Signed-off-by: Stefan Tauner <stefan.tauner@gmx.at>
Reviewed-on: https://review.coreboot.org/c/28349
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/southbridge/intel/common/spi.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c index 96b580e52f..9e6109e37b 100644 --- a/src/southbridge/intel/common/spi.c +++ b/src/southbridge/intel/common/spi.c @@ -121,6 +121,7 @@ typedef struct ich9_spi_regs { typedef struct ich_spi_controller { int locked; uint32_t flmap0; + uint32_t flcomp; uint32_t hsfs; ich9_spi_regs *ich9_spi; @@ -346,6 +347,8 @@ void spi_init(void) if (cntlr->hsfs & HSFS_FDV) { writel_ (4, &ich9_spi->fdoc); cntlr->flmap0 = readl_(&ich9_spi->fdod); + writel_ (0x1000, &ich9_spi->fdoc); + cntlr->flcomp = readl_(&ich9_spi->fdod); } } @@ -930,7 +933,6 @@ static int spi_flash_programmer_probe(const struct spi_slave *spi, struct spi_flash *flash) { ich_spi_controller *cntlr = car_get_var_ptr(&g_cntlr); - uint32_t flcomp; if (IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82801GX)) return spi_flash_generic_probe(spi, flash); @@ -959,15 +961,12 @@ static int spi_flash_programmer_probe(const struct spi_slave *spi, break; } - writel_ (0x1000, &cntlr->ich9_spi->fdoc); - flcomp = readl_(&cntlr->ich9_spi->fdod); - - flash->size = 1 << (19 + (flcomp & 7)); + flash->size = 1 << (19 + (cntlr->flcomp & 7)); flash->ops = &spi_flash_ops; if ((cntlr->hsfs & HSFS_FDV) && ((cntlr->flmap0 >> 8) & 3)) - flash->size += 1 << (19 + ((flcomp >> 3) & 7)); + flash->size += 1 << (19 + ((cntlr->flcomp >> 3) & 7)); printk (BIOS_DEBUG, "flash size 0x%x bytes\n", flash->size); return 0; |