Mercurial > illumos > git > illumos-gate
changeset 20030:09730f3f5209
12967 default to apix over pcplusmp
Reviewed by: Patrick Mooney <pmooney@pfmooney.com>
Reviewed by: Paul Winder <paul@winder.uk.net>
Approved by: Joshua M. Clulow <josh@sysmgr.org>
| author | Robert Mustacchi <rm@fingolfin.org> |
|---|---|
| date | Thu, 16 Jul 2020 07:28:00 -0700 |
| parents | e324e6b94b1e |
| children | 2ac9da4f365b |
| files | usr/src/uts/i86pc/io/apix/apix.c |
| diffstat | 1 files changed, 4 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/i86pc/io/apix/apix.c Sat Sep 12 10:55:07 2020 -0700 +++ b/usr/src/uts/i86pc/io/apix/apix.c Thu Jul 16 07:28:00 2020 -0700 @@ -186,18 +186,6 @@ 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 */ lock_t apix_lock; @@ -272,22 +260,10 @@ 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);