|
@@ -141,6 +141,7 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
|
|
address = (low & MASK_BLKPTR_LO) >> 21;
|
|
address = (low & MASK_BLKPTR_LO) >> 21;
|
|
if (!address)
|
|
if (!address)
|
|
break;
|
|
break;
|
|
|
|
+
|
|
address += MCG_XBLK_ADDR;
|
|
address += MCG_XBLK_ADDR;
|
|
} else
|
|
} else
|
|
++address;
|
|
++address;
|
|
@@ -148,12 +149,8 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
|
|
if (rdmsr_safe(address, &low, &high))
|
|
if (rdmsr_safe(address, &low, &high))
|
|
break;
|
|
break;
|
|
|
|
|
|
- if (!(high & MASK_VALID_HI)) {
|
|
|
|
- if (block)
|
|
|
|
- continue;
|
|
|
|
- else
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
|
|
+ if (!(high & MASK_VALID_HI))
|
|
|
|
+ continue;
|
|
|
|
|
|
if (!(high & MASK_CNTP_HI) ||
|
|
if (!(high & MASK_CNTP_HI) ||
|
|
(high & MASK_LOCKED_HI))
|
|
(high & MASK_LOCKED_HI))
|