mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-27 14:14:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

spi: ich: Add TPL support

Browse Source 
In TPL we want to reduce code size and support running with CONFIG_PCI
disabled. Add special code to handle this using a fixed BAR programmed
into the SPI on boot. Also cache the SPI flash to speed up boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2019-12-06 21:42:48 -07:00 committed by Bin Meng
parent 92842147c3
commit 636555a4c4
1 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/spi/ich.c
View File

@ -19,8 +19,11 @@
#include <spi.h>
#include <spi_flash.h>
#include <spi-mem.h>
#include <spl.h>
#include <asm/fast_spi.h>
#include <asm/io.h>
#include <asm/mtrr.h>
#include <linux/sizes.h>
#include "ich.h"
@ -115,6 +118,8 @@ static bool ich9_can_do_33mhz(struct udevice *dev)
struct ich_spi_priv *priv = dev_get_priv(dev);
u32 fdod, speed;
if (!CONFIG_IS_ENABLED(PCI))
return false;
/* Observe SPI Descriptor Component Section 0 */
dm_pci_write_config32(priv->pch, 0xb0, 0x1000);
@ -706,6 +711,15 @@ static int ich_init_controller(struct udevice *dev,
struct ich_spi_platdata *plat,
struct ich_spi_priv *ctlr)
{
if (spl_phase() == PHASE_TPL) {
struct ich_spi_platdata *plat = dev_get_platdata(dev);
int ret;
ret = fast_spi_early_init(plat->bdf, plat->mmio_base);
if (ret)
return ret;
}
ctlr->base = (void *)plat->mmio_base;
if (plat->ich_version == ICHV_7) {
struct ich7_spi_regs *ich7_spi = ctlr->base;
@ -754,6 +768,26 @@ static int ich_init_controller(struct udevice *dev,
return 0;
}
static int ich_cache_bios_region(struct udevice *dev)
{
ulong map_base;
uint map_size;
uint offset;
ulong base;
int ret;
ret = ich_get_mmap_bus(dev, &map_base, &map_size, &offset);
if (ret)
return ret;
/* Don't use WRBACK since we are not supposed to write to SPI flash */
base = SZ_4G - map_size;
mtrr_set_next_var(MTRR_TYPE_WRPROT, base, map_size);
log_debug("BIOS cache base=%lx, size=%x\n", base, (uint)map_size);
return 0;
}
static int ich_spi_probe(struct udevice *dev)
{
struct ich_spi_platdata *plat = dev_get_platdata(dev);
@ -764,10 +798,16 @@ static int ich_spi_probe(struct udevice *dev)
if (ret)
return ret;
ret = ich_protect_lockdown(dev);
if (ret)
return ret;
if (spl_phase() == PHASE_TPL) {
/* Cache the BIOS to speed things up */
ret = ich_cache_bios_region(dev);
if (ret)
return ret;
} else {
ret = ich_protect_lockdown(dev);
if (ret)
return ret;
}
priv->cur_speed = priv->max_speed;
return 0;