From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756702AbdDMKMA (ORCPT ); Thu, 13 Apr 2017 06:12:00 -0400 Received: from mx2.suse.de ([195.135.220.15]:49912 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755989AbdDMKLr (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 05/11] x86/xen: use capabilities instead of fake cpuid values for acc Date: Thu, 13 Apr 2017 12:11:10 +0200 Message-Id: <20170413101116.723-6-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 acc feature (thermal monitoring) 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 acc instead. Signed-off-by: Juergen Gross --- arch/x86/xen/enlighten_pv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 37e174d9009b..53fe97bd720f 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -294,9 +294,6 @@ static void __init xen_init_cpuid_mask(void) unsigned int ax, bx, cx, dx; unsigned int xsave_mask; - cpuid_leaf1_edx_mask = - ~(1 << X86_FEATURE_ACC); /* thermal monitoring */ - if (!xen_initial_domain()) cpuid_leaf1_edx_mask &= ~((1 << X86_FEATURE_ACPI)); /* disable ACPI */ @@ -325,6 +322,7 @@ static void __init xen_init_capabilities(void) setup_clear_cpu_cap(X86_FEATURE_DCA); setup_clear_cpu_cap(X86_FEATURE_APERFMPERF); setup_clear_cpu_cap(X86_FEATURE_MTRR); + setup_clear_cpu_cap(X86_FEATURE_ACC); } static void xen_set_debugreg(int reg, unsigned long val) -- 2.12.0