leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: Use mtrr_commit() with FSP2

Browse Source 
With FSP2 we use MTRRs in U-Boot proper even though the 32-bit init
happens in TPL. Enable this, using a variable to try to make the
conditions more palatable.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass
2019-09-25 08:56:49 -06:00
committed by Bin Meng
parent b377ebbd5b
commit cc2d27dcdc
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/lib/init_helpers.c
View File

@@ -12,15 +12,23 @@ DECLARE_GLOBAL_DATA_PTR;
int init_cache_f_r(void) int init_cache_f_r(void)
{ {
#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) && \ bool do_mtrr = CONFIG_IS_ENABLED(X86_32BIT_INIT) ||
!defined(CONFIG_SYS_SLIMBOOTLOADER) IS_ENABLED(CONFIG_FSP_VERSION2);
int ret; int ret;
ret = mtrr_commit(false); do_mtrr &= !IS_ENABLED(CONFIG_FSP_VERSION1) &&
/* If MTRR MSR is not implemented by the processor, just ignore it */ !IS_ENABLED(CONFIG_SYS_SLIMBOOTLOADER);
if (ret && ret != -ENOSYS)
return ret; if (do_mtrr) {
#endif ret = mtrr_commit(false);
/*
* If MTRR MSR is not implemented by the processor, just ignore
* it
*/
if (ret && ret != -ENOSYS)
return ret;
}
/* Initialise the CPU cache(s) */ /* Initialise the CPU cache(s) */
return init_cache(); return init_cache();
} }