[U-Boot] [PATCH v1] 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.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com --- arch/x86/lib/init_helpers.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index ac85278cdf..0481f453ca 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -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);

On Wed, Jun 19, 2019 at 12:06 AM Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
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.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
arch/x86/lib/init_helpers.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
Acked-by: Bin Meng bmeng.cn@gmail.com

On Wed, Jun 19, 2019 at 12:12 AM Bin Meng bmeng.cn@gmail.com wrote:
On Wed, Jun 19, 2019 at 12:06 AM Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
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.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
arch/x86/lib/init_helpers.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
Acked-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
participants (2)
-
Andy Shevchenko
-
Bin Meng