|
@@ -1727,6 +1727,21 @@ static void __mcheck_cpu_init_early(struct cpuinfo_x86 *c)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+static void mce_centaur_feature_init(struct cpuinfo_x86 *c)
|
|
|
+{
|
|
|
+ struct mca_config *cfg = &mca_cfg;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * All newer Centaur CPUs support MCE broadcasting. Enable
|
|
|
+ * synchronization with a one second timeout.
|
|
|
+ */
|
|
|
+ if ((c->x86 == 6 && c->x86_model == 0xf && c->x86_stepping >= 0xe) ||
|
|
|
+ c->x86 > 6) {
|
|
|
+ if (cfg->monarch_timeout < 0)
|
|
|
+ cfg->monarch_timeout = USEC_PER_SEC;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
|
|
|
{
|
|
|
switch (c->x86_vendor) {
|
|
@@ -1739,6 +1754,9 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
|
|
|
mce_amd_feature_init(c);
|
|
|
break;
|
|
|
}
|
|
|
+ case X86_VENDOR_CENTAUR:
|
|
|
+ mce_centaur_feature_init(c);
|
|
|
+ break;
|
|
|
|
|
|
default:
|
|
|
break;
|