From eee178623516e461188f137dc6e5e38875967e09 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Thu, 16 Jul 2020 07:28:00 -0700 Subject: 12967 default to apix over pcplusmp Reviewed by: Patrick Mooney Reviewed by: Paul Winder Approved by: Joshua M. Clulow --- usr/src/uts/i86pc/io/apix/apix.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) (limited to 'usr/src') diff --git a/usr/src/uts/i86pc/io/apix/apix.c b/usr/src/uts/i86pc/io/apix/apix.c index 18dee7499a..cedc49147e 100644 --- a/usr/src/uts/i86pc/io/apix/apix.c +++ b/usr/src/uts/i86pc/io/apix/apix.c @@ -185,18 +185,6 @@ static void *apix_hdlp; static int apix_is_enabled = 0; -/* - * Flag to indicate if APIX is to be enabled only for platforms - * with specific hw feature(s). - */ -int apix_hw_chk_enable = 1; - -/* - * Hw features that are checked for enabling APIX support. - */ -#define APIX_SUPPORT_X2APIC 0x00000001 -uint_t apix_supported_hw = APIX_SUPPORT_X2APIC; - /* * apix_lock is used for cpu selection and vector re-binding */ @@ -272,22 +260,10 @@ apix_probe() if (get_hwenv() & HW_XEN_HVM) return (PSM_FAILURE); - /* check for hw features if specified */ - if (apix_hw_chk_enable) { - /* check if x2APIC mode is supported */ - if ((apix_supported_hw & APIX_SUPPORT_X2APIC) == - APIX_SUPPORT_X2APIC) { - if (apic_local_mode() == LOCAL_X2APIC) { - /* x2APIC mode activated by BIOS, switch ops */ - apic_mode = LOCAL_X2APIC; - apic_change_ops(); - } else if (!apic_detect_x2apic()) { - /* x2APIC mode is not supported in the hw */ - apix_enable = 0; - } - } - if (apix_enable == 0) - return (PSM_FAILURE); + if (apic_local_mode() == LOCAL_X2APIC) { + /* x2APIC mode activated by BIOS, switch ops */ + apic_mode = LOCAL_X2APIC; + apic_change_ops(); } rval = apic_probe_common(apix_psm_info.p_mach_idstring); -- cgit v1.2.3