diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2020-11-09 15:55:49 +0800 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2020-11-10 09:25:25 +0800 |
| commit | f72d3d6b04d21a7b2ba7ba9ee551dd6f1a9b93e4 (patch) | |
| tree | 15dffb088072f3ca2cb70df35b0a8dfacd9cf56c | |
| parent | 1ae955e3a58f46918ef99b0b6c562967ba1bf39e (diff) | |
x86: Avoid using hardcoded number of variable range MTRRs in mtrr_commit()
Since commit 29d2d64ed55f ("x86: Add support for more than 8 MTRRs"),
the maximum number of variable range MTRRs was increased from 8 to 10.
On the BayTrail platform there are only 8 variable range MTRRs. In
mtrr_commit() it still uses MTRR_MAX_COUNT which caused a #GP during
VESA video driver probe. It should have been updated to use dynamically
probed number.
This fixes the boot failure seen on Intel Minnow Max board.
Fixes: 29d2d64ed55f ("x86: Add support for more than 8 MTRRs")
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/cpu/mtrr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c index 5180eb06fc..6f095c53a5 100644 --- a/arch/x86/cpu/mtrr.c +++ b/arch/x86/cpu/mtrr.c @@ -158,7 +158,7 @@ int mtrr_commit(bool do_caches) /* Clear the ones that are unused */ debug("clear\n"); - for (; i < MTRR_MAX_COUNT; i++) + for (; i < mtrr_get_var_count(); i++) wrmsrl(MTRR_PHYS_MASK_MSR(i), 0); debug("close\n"); mtrr_close(&state, do_caches); |