x86: MTRR workaround for system with stange var MTRRs

Impact: don't trim e820 according to wrong mtrr

Ozan reports that his server emits strange warning.
it turns out the BIOS sets the MTRRs incorrectly.

Ignore those strange ranges, and don't trim e820,
just emit one warning about BIOS

Reported-by: Ozan Çağlayan <ozan@pardus.org.tr>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <49BEE1E7.7020706@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 5c2e266f41d7..03cda01f57c7 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -574,7 +574,7 @@ struct mtrr_value {
         unsigned long   lsize;
 };
 
-static struct mtrr_value mtrr_state[MTRR_MAX_VAR_RANGES];
+static struct mtrr_value mtrr_value[MTRR_MAX_VAR_RANGES];
 
 static int mtrr_save(struct sys_device * sysdev, pm_message_t state)
 {
@@ -582,9 +582,9 @@ static int mtrr_save(struct sys_device * sysdev, pm_message_t state)
 
         for (i = 0; i < num_var_ranges; i++) {
                 mtrr_if->get(i,
-                             &mtrr_state[i].lbase,
-                             &mtrr_state[i].lsize,
-                             &mtrr_state[i].ltype);
+                             &mtrr_value[i].lbase,
+                             &mtrr_value[i].lsize,
+                             &mtrr_value[i].ltype);
         }
         return 0;
 }
@@ -594,11 +594,11 @@ static int mtrr_restore(struct sys_device * sysdev)
         int i;
 
         for (i = 0; i < num_var_ranges; i++) {
-                if (mtrr_state[i].lsize) 
+                if (mtrr_value[i].lsize)
                         set_mtrr(i,
-                                 mtrr_state[i].lbase,
-                                 mtrr_state[i].lsize,
-                                 mtrr_state[i].ltype);
+                                 mtrr_value[i].lbase,
+                                 mtrr_value[i].lsize,
+                                 mtrr_value[i].ltype);
         }
         return 0;
 }