diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2011-06-04 10:37:35 -0700 |
|---|---|---|
| committer | Marc Jones <marcj303@gmail.com> | 2011-06-20 19:08:05 +0200 |
| commit | d1cb0eecd130cb4259ce9fedb32ebcd9ada0d4b7 (patch) | |
| tree | 26d717ae20d6c61e6c07a5482b1a8811a2bee8c7 /src/southbridge | |
| parent | 46b033e8cb30000148104e45753a033ed6d919c1 (diff) | |
sb800: move spi prefetch and fast read mode to sb bootblock.
So we don't waste time on the first cbfs scan.
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
[adapt persimmon with the same change, and work around romcc bug
in bootblock code: it doesn't like MEMACCESS[idx] |= value;]
Change-Id: Ic4d0e53d3102be0de0bd18b1b8b29c500bd6d997
Reviewed-on: http://review.coreboot.org/9
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Marc Jones <marcj303@gmail.com>
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/amd/cimx_wrapper/sb800/bootblock.c | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/src/southbridge/amd/cimx_wrapper/sb800/bootblock.c b/src/southbridge/amd/cimx_wrapper/sb800/bootblock.c index 9d8a349c6e..aaec03cbea 100644 --- a/src/southbridge/amd/cimx_wrapper/sb800/bootblock.c +++ b/src/southbridge/amd/cimx_wrapper/sb800/bootblock.c @@ -20,9 +20,9 @@ #include <arch/io.h> #include <arch/romcc_io.h> -static void sb800_enable_rom(void) +static void enable_rom(void) { - u32 word; + u16 word; u32 dword; device_t dev; @@ -56,8 +56,39 @@ static void sb800_enable_rom(void) pci_io_write_config16(dev, 0x6c, word); } +static void enable_prefetch(void) +{ + u32 dword; + device_t dev = PCI_DEV(0, 0x14, 0x03); + + /* Enable PrefetchEnSPIFromHost */ + dword = pci_io_read_config32(dev, 0xb8); + pci_io_write_config32(dev, 0xb8, dword | (1 << 24)); +} + +static void enable_spi_fast_mode(void) +{ + u8 byte; + u32 dword; + device_t dev = PCI_DEV(0, 0x14, 0x03); + + // set temp MMIO base + volatile u32 *spi_base = (void *)0xa0000000; + u32 save = pci_io_read_config32(dev, 0xa0); + pci_io_write_config32(dev, 0xa0, (u32) spi_base | 2); + + // early enable of SPI 33 MHz fast mode read + byte = spi_base[3]; + spi_base[3] = (byte & ~(3 << 14)) | (1 << 14); + spi_base[0] = spi_base[0] | (1 << 18); // fast read enable + + pci_io_write_config32(dev, 0xa0, save); +} + static void bootblock_southbridge_init(void) { /* Setup the rom access for 2M */ - sb800_enable_rom(); + enable_rom(); + enable_prefetch(); + enable_spi_fast_mode(); } |