These old non-64 bit CPU models are not supported by Xen anymore so the checks are no longer needed.
Signed-off-by: Kevin Lampis <[email protected]> --- Changes in v2: - New patch based on review comments --- xen/arch/x86/acpi/cpu_idle.c | 2 +- xen/arch/x86/cpu/mcheck/mce.c | 8 +------- xen/arch/x86/cpu/mtrr/generic.c | 3 +-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 6622965ace..640935c40c 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1059,7 +1059,7 @@ static void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flag * is not required while entering C3 type state on * P4, Core and beyond CPUs */ - if ( c->vendor == X86_VENDOR_INTEL && c->vfm >= INTEL_CORE_YONAH ) + if ( c->vendor == X86_VENDOR_INTEL ) flags->bm_control = 0; } diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 8a41116aa4..9f45ca5be1 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -777,13 +777,7 @@ void mcheck_init(struct cpuinfo_x86 *c, bool bsp) #ifdef CONFIG_INTEL case X86_VENDOR_INTEL: - switch ( c->family ) - { - case 6: - case 15: - inited = intel_mcheck_init(c, bsp); - break; - } + inited = intel_mcheck_init(c, bsp); break; #endif diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index 190be7f1b4..23c279eb9a 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -218,8 +218,7 @@ static void __init print_mtrr_state(const char *level) printk("%s %u disabled\n", level, i); } - if ((boot_cpu_data.vendor == X86_VENDOR_AMD && - boot_cpu_data.family >= 0xf) || + if (boot_cpu_data.vendor == X86_VENDOR_AMD || boot_cpu_data.vendor == X86_VENDOR_HYGON) { uint64_t syscfg, tom2; -- 2.51.1
