From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756693AbdDMKL4 (ORCPT ); Thu, 13 Apr 2017 06:11:56 -0400 Received: from mx2.suse.de ([195.135.220.15]:49916 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756644AbdDMKLr (ORCPT ); Thu, 13 Apr 2017 06:11:47 -0400 From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Cc: boris.ostrovsky@oracle.com, Juergen Gross Subject: [PATCH v2 08/11] x86/xen: use capabilities instead of fake cpuid values for x2apic Date: Thu, 13 Apr 2017 12:11:13 +0200 Message-Id: <20170413101116.723-9-jgross@suse.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170413101116.723-1-jgross@suse.com> References: <20170413101116.723-1-jgross@suse.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the x2apic feature is indicated as not being present by special casing the related cpuid leaf. Instead of delivering fake cpuid values clear the cpu capability bit for x2apic instead. Signed-off-by: Juergen Gross --- arch/x86/xen/enlighten_pv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index d43382284ada..38dec28a8e6d 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -286,8 +286,6 @@ static void __init xen_init_cpuid_mask(void) unsigned int ax, bx, cx, dx; unsigned int xsave_mask; - cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_X2APIC % 32)); - ax = 1; cx = 0; cpuid(1, &ax, &bx, &cx, &dx); @@ -309,6 +307,7 @@ static void __init xen_init_capabilities(void) setup_clear_cpu_cap(X86_FEATURE_APERFMPERF); setup_clear_cpu_cap(X86_FEATURE_MTRR); setup_clear_cpu_cap(X86_FEATURE_ACC); + setup_clear_cpu_cap(X86_FEATURE_X2APIC); if (!xen_initial_domain()) setup_clear_cpu_cap(X86_FEATURE_ACPI); -- 2.12.0