Ticket #553: generic_x86.cpp.diff

generic_x86.cpp

@@ -28 +28 @@
 #define IA32_MTRR_ENABLE_FIXED          (1UL << 10)
 #define IA32_MTRR_VALID_RANGE           (1UL << 11)
 
-
 struct mtrr_capabilities {
     mtrr_capabilities(uint64 value) { *(uint64 *)this = value; }
 
@@ -48 +47 @@
 {
     cpuid_info cpuInfo;
     if (get_current_cpuid(&cpuInfo, 1) != B_OK
-        || (cpuInfo.eax_1.features & IA32_FEATURE_MTRR) == 0)
+        || (cpuInfo.eax_1.features & IA32_FEATURE_MTRR) == 0
+        || (cpuInfo.eax_1.features & IA32_FEATURE_MSR) == 0)
         return 0;
 
     mtrr_capabilities capabilities(x86_read_msr(IA32_MSR_MTRR_CAPABILITIES));
@@ -160 +160 @@
 void
 generic_dump_mtrrs(uint32 count)
 {
+
+    cpuid_info cpuInfo;
+    if (get_current_cpuid(&cpuInfo, 1) != B_OK
+        || (cpuInfo.eax_1.features & IA32_FEATURE_MTRR) == 0
+        || (cpuInfo.eax_1.features & IA32_FEATURE_MSR) == 0)
+        return;
+
     if (x86_read_msr(IA32_MSR_MTRR_DEFAULT_TYPE) & IA32_MTRR_ENABLE) {
         TRACE(("MTRR enabled\n"));
     } else {