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

soc/intel/common/block/fast_spi: Refactor ROM caching implementation 

This patch removes different implementation to cache the SPI ROM between
early and later boot stage where SPI ROM caching doesn't need even
advanced implementation like `mtrr_use_temp_range()` as SPI ROM ranage
is always mapped to below 4GB hence, simple `set_var_mtrr()` function
can be sufficient without any additional complexity.

BUG=b:225766934
TEST=Calling into `fast_spi_cache_bios_region()` from ramstage is able
to update the temporary variable range MTRRs and showed ~44ms of boot
time savings as below:

Before:
  90:starting to load payload                    1,084,052 (14)
  15:starting LZMA decompress (ignore for x86)   1,084,121 (68)
  16:finished LZMA decompress (ignore for x86)   1,140,742 (56,620)

After:
  90:starting to load payload                    1,090,433 (14)
  15:starting LZMA decompress (ignore for x86)   1,090,650 (217)
  16:finished LZMA decompress (ignore for x86)   1,102,896 (12,245)

Signed-off-by: Subrata Banik <subratabanik@google.com>
Change-Id: I43973b45dc6d032cfcc920eeb36b37fe027e6e8e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63221
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Subrata Banik 2022-03-31 00:16:00 +05:30 committed by Felix Held
parent 1f09a2ac81
commit def18c4068
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/soc/intel/common/block/fast_spi/fast_spi.c
View File

@ -7,6 +7,7 @@
#include <assert.h> #include <assert.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h>
#include <commonlib/helpers.h> #include <commonlib/helpers.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <fast_spi_def.h> #include <fast_spi_def.h>
@ -196,6 +197,18 @@ void fast_spi_set_strap_msg_data(uint32_t soft_reset_data)
write32(spibar + SPIBAR_RESET_LOCK, ssl); write32(spibar + SPIBAR_RESET_LOCK, ssl);
} }
static void fast_spi_enable_cache_range(unsigned int base, unsigned int size)
{
const int type = MTRR_TYPE_WRPROT;
int mtrr = get_free_var_mtrr();
if (mtrr == -1) {
printk(BIOS_WARNING, "ROM caching failed due to no free MTRR available!\n");
return;
}
set_var_mtrr(mtrr, base, size, type);
}
/* /*
* Returns bios_start and fills in size of the BIOS region. * Returns bios_start and fills in size of the BIOS region.
*/ */
@ -240,19 +253,11 @@ static void fast_spi_cache_ext_bios_window(void)
{ {
size_t ext_bios_size; size_t ext_bios_size;
uintptr_t ext_bios_base; uintptr_t ext_bios_base;
const int type = MTRR_TYPE_WRPROT;
if (!fast_spi_ext_bios_cache_range(&ext_bios_base, &ext_bios_size)) if (!fast_spi_ext_bios_cache_range(&ext_bios_base, &ext_bios_size))
return; return;
if (ENV_PAYLOAD_LOADER) { fast_spi_enable_cache_range(ext_bios_base, ext_bios_size);
mtrr_use_temp_range(ext_bios_base, ext_bios_size, type);
} else {
int mtrr = get_free_var_mtrr();
if (mtrr == -1)
return;
set_var_mtrr(mtrr, ext_bios_base, ext_bios_size, type);
}
} }
void fast_spi_cache_ext_bios_postcar(struct postcar_frame *pcf) void fast_spi_cache_ext_bios_postcar(struct postcar_frame *pcf)
@ -271,7 +276,6 @@ void fast_spi_cache_bios_region(void)
{ {
size_t bios_size; size_t bios_size;
uint32_t alignment; uint32_t alignment;
const int type = MTRR_TYPE_WRPROT;
uintptr_t base; uintptr_t base;
/* Only the IFD BIOS region is memory mapped (at top of 4G) */ /* Only the IFD BIOS region is memory mapped (at top of 4G) */
@ -290,16 +294,7 @@ void fast_spi_cache_bios_region(void)
bios_size = ALIGN_UP(bios_size, alignment); bios_size = ALIGN_UP(bios_size, alignment);
base = 4ULL*GiB - bios_size; base = 4ULL*GiB - bios_size;
if (ENV_PAYLOAD_LOADER) { fast_spi_enable_cache_range(base, bios_size);
mtrr_use_temp_range(base, bios_size, type);
} else {
int mtrr = get_free_var_mtrr();
if (mtrr == -1)
return;
set_var_mtrr(mtrr, base, bios_size, type);
}
/* Check if caching is needed for extended bios region if supported */ /* Check if caching is needed for extended bios region if supported */
fast_spi_cache_ext_bios_window(); fast_spi_cache_ext_bios_window();