Skip to contentSkip to conversation

x86: Revert "Don't set up MTRRs in SPL"

PATCH New Andy Shevchenko 2 participants 3 messages Jun 18, 2019 – Jun 22, 2019 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: Revert "Don't set up MTRRs in SPL"

This breaks Intel Edison to work. It gets laggish and unable to boot kernel.

Reverts commit 665cb18ea64aabbeb03d27a4c92ddec1baccb87a for now till better solution will be proposed.

---
 arch/x86/lib/init_helpers.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/x86/lib/init_helpers.c +1 -4
index ac85278cdf..0481f453ca 100644
@@ -18,10 +18,7 @@ __weak ulong board_get_usable_ram_top(ulong total_size)
 
 int init_cache_f_r(void)
 {
-#if (CONFIG_IS_ENABLED(X86_32BIT_INIT) || \
-     (!defined(CONFIG_SPL_BUILD) && \
-      !CONFIG_IS_ENABLED(CONFIG_X86_RUN_64BIT))) && \
-    !defined(CONFIG_HAVE_FSP)
+#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP)
 	int ret;
 
 	ret = mtrr_commit(false);
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 x86: Revert "Don't set up MTRRs in SPL"

Quoted 11 lines · Andy Shevchenko

This breaks Intel Edison to work. It gets laggish and unable to boot kernel.

Reverts commit 665cb18ea64aabbeb03d27a4c92ddec1baccb87a for now till better solution will be proposed.

---
 arch/x86/lib/init_helpers.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
#2 lore raw

PATCH 1/1 x86: Revert "Don't set up MTRRs in SPL"

Quoted 9 lines · Bin Meng
Quoted 6 lines · Andy Shevchenko

This breaks Intel Edison to work. It gets laggish and unable to boot kernel.

Reverts commit 665cb18ea64aabbeb03d27a4c92ddec1baccb87a for now till better solution will be proposed.

Quoted 7 lines
Quoted 5 lines
---
 arch/x86/lib/init_helpers.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

applied to u-boot-x86, thanks!