From patchwork Sat Jul 15 00:31:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9841871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7D83260212 for ; Sat, 15 Jul 2017 00:54:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BC3B286D2 for ; Sat, 15 Jul 2017 00:54:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D461286DE; Sat, 15 Jul 2017 00:54:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E3A4B286D2 for ; Sat, 15 Jul 2017 00:54:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dWBKx-0001vT-1o; Sat, 15 Jul 2017 00:53:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dWBKw-0001vL-0Q for xen-devel@lists.xenproject.org; Sat, 15 Jul 2017 00:53:34 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id FF/98-02181-4C569695; Sat, 15 Jul 2017 00:45:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsVywNxEW/dwama kwb89mhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bRHeYFi/krHneuYG5g3MLTxcjJISRQIfHo 4lpWEFtCgFfiyLIZULa/xKT5v9m7GLmAahoYJbY8W8AOkmATUJd4/LWHCcQWEVCSuLdqMhNIE bPAfCaJ1+cfMIMkhAWCJK68+8ECYrMIqEqsbDkKZvMKuEvcWd/HArFBTuLksclg2zgFPCSm7m sDWsABtM1domV2+QRG3gWMDKsYNYpTi8pSi3SNDfSSijLTM0pyEzNzdA0NjPVyU4uLE9NTcxK TivWS83M3MQKDoZ6BgXEHY+cJv0OMkhxMSqK8725nRArxJeWnVGYkFmfEF5XmpBYfYpTh4FCS 4J2akhkpJFiUmp5akZaZAwxLmLQEB4+SCO8skDRvcUFibnFmOkTqFKMux6sJ/78xCbHk5eelS onzaoIUCYAUZZTmwY2AxcglRlkpYV5GBgYGIZ6C1KLczBJU+VeM4hyMSsK880Gm8GTmlcBteg V0BBPQEW1ZGSBHlCQipKQaGBdddg9SeSicuWvL7IWrWjb911sw4diUbfz1IfO5T8421N+Ufs2 vgkntm8POnuiipOet+655qCtV7mJ69zVnzRy1rTsLNJXX/1jXt8VdpkrigKg926MI7gLvdZmb ZHb1yl6Lt3Luj2X01LWQPrSXy6FZ8c2R8y/3xIXxL7n+4qfh5WvtfHWXdyqxFGckGmoxFxUnA gAISyU0jAIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1500079549!66978060!3 X-Originating-IP: [192.55.52.43] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21536 invoked from network); 15 Jul 2017 00:45:55 -0000 Received: from mga05.intel.com (HELO mga05.intel.com) (192.55.52.43) by server-6.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 15 Jul 2017 00:45:55 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP; 14 Jul 2017 17:45:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,360,1496127600"; d="scan'208";a="111534749" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by orsmga002.jf.intel.com with ESMTP; 14 Jul 2017 17:45:52 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sat, 15 Jul 2017 08:31:35 +0800 Message-Id: <1500078716-5928-3-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500078716-5928-1-git-send-email-yi.y.sun@linux.intel.com> References: <1500078716-5928-1-git-send-email-yi.y.sun@linux.intel.com> Cc: kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, Yi Sun , mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v14 02/23] x86: move cpuid_count_leaf from cpuid.c to processor.h. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch moves 'cpuid_count_leaf' from cpuid.c to processor.h to make it available to external codes. Signed-off-by: Yi Sun Acked-by: Jan Beulich --- v9: - create this patch alone to move 'cpuid_count_leaf'. (suggested by Wei Liu) v6: - use 'struct cpuid_leaf' in psr.c. So we have to access 'cpuid_count_leaf' which has to be moved to processor.h. (suggested by Andrew Cooper) --- xen/arch/x86/cpuid.c | 6 ------ xen/include/asm-x86/processor.h | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index d359e09..f1a6e9f 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -35,12 +35,6 @@ static void cpuid_leaf(uint32_t leaf, struct cpuid_leaf *data) cpuid(leaf, &data->a, &data->b, &data->c, &data->d); } -static void cpuid_count_leaf(uint32_t leaf, uint32_t subleaf, - struct cpuid_leaf *data) -{ - cpuid_count(leaf, subleaf, &data->a, &data->b, &data->c, &data->d); -} - static void sanitise_featureset(uint32_t *fs) { /* for_each_set_bit() uses unsigned longs. Extend with zeroes. */ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 5bf56b4..4bef698 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -13,6 +13,7 @@ #include #include #include +#include #endif #include @@ -264,6 +265,12 @@ static always_inline unsigned int cpuid_count_ebx( return ebx; } +static always_inline void cpuid_count_leaf(uint32_t leaf, uint32_t subleaf, + struct cpuid_leaf *data) +{ + cpuid_count(leaf, subleaf, &data->a, &data->b, &data->c, &data->d); +} + static inline unsigned long read_cr0(void) { unsigned long cr0;