From nobody Wed Nov 19 04:31:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1614305461; cv=none; d=zohomail.com; s=zohoarc; b=WS5AaJJMB3WqT5+3aCtPgfVobP/AgMRLFOqGlDMMZ/Nlg+tloCpj+VWMIfG79Kem8QctGFYXmvlyCss4FJ8J3c5l3d7UOYmB7mWNvyfVo+RHzWhDsVgQEctVUZTsfypKd8dqqDielyZrK0Py0k4YoqDeekfiBUd6V69No85/4qc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614305461; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=wnZr9dehy8KBl022we1BfN1EVLchy3OF983i88k9Y+g=; b=VRN3slWD1XRJz8IrxbvulsWWtOFFoqfWM0xCL2CznSzrs/Uz2e7te7OJfNIbSG6UrF/2V4vDj30Oqkf2sN3uaAPR2WZ0Y3HUTIti9Gd5pbqTrYnahfGckT6WCHnBIZasikeGCx8VyslY6wn/4Z6Yb/XwZ2D7N5z5q+yo/lNG+2c= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614305461308388.48473727709245; Thu, 25 Feb 2021 18:11:01 -0800 (PST) Received: from localhost ([::1]:45954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFSam-0007PD-8q for importer@patchew.org; Thu, 25 Feb 2021 21:10:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFSZU-0005rz-3M for qemu-devel@nongnu.org; Thu, 25 Feb 2021 21:09:36 -0500 Received: from mga14.intel.com ([192.55.52.115]:7375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFSZR-0002ce-F6 for qemu-devel@nongnu.org; Thu, 25 Feb 2021 21:09:35 -0500 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Feb 2021 18:09:28 -0800 Received: from unknown (HELO local-michael-cet-test.sh.intel.com) ([10.239.159.166]) by orsmga008.jf.intel.com with ESMTP; 25 Feb 2021 18:09:26 -0800 IronPort-SDR: dYYgzz86QH6tpuN1wOyhRmDXNNMKoFZmVWvI0KcHnKjxiWHP7HJHae8/FA5j3QhPbSIJgUP3Dk Fxijc+8TOHRQ== X-IronPort-AV: E=McAfee;i="6000,8403,9906"; a="185057277" X-IronPort-AV: E=Sophos;i="5.81,207,1610438400"; d="scan'208";a="185057277" IronPort-SDR: bjxgzeF6JzUJvY+97ND+UZZ8321fSgbVuxHpTasxMTYoKWPQrp3t/mcZWYUPaCKZYopX/0jmow tZDhYwDD6zgQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,207,1610438400"; d="scan'208";a="404679946" From: Yang Weijiang To: pbonzini@redhat.com, richard.henderson@linaro.org, ehabkost@redhat.com, mtosatti@redhat.com, sean.j.christopherson@intel.com, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [PATCH v7 1/6] target/i386: Change XSAVE related feature-word names Date: Fri, 26 Feb 2021 10:20:53 +0800 Message-Id: <20210226022058.24562-2-weijiang.yang@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20210226022058.24562-1-weijiang.yang@intel.com> References: <20210226022058.24562-1-weijiang.yang@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.115; envelope-from=weijiang.yang@intel.com; helo=mga14.intel.com X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Weijiang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Rename XSAVE related feature-words for introducing XSAVES related feature-words. Signed-off-by: Yang Weijiang --- target/i386/cpu.c | 24 ++++++++++++------------ target/i386/cpu.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 5a8c96072e..89edab4240 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1073,7 +1073,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORD= S] =3D { .cpuid =3D { .eax =3D 6, .reg =3D R_EAX, }, .tcg_features =3D TCG_6_EAX_FEATURES, }, - [FEAT_XSAVE_COMP_LO] =3D { + [FEAT_XSAVE_XCR0_LO] =3D { .type =3D CPUID_FEATURE_WORD, .cpuid =3D { .eax =3D 0xD, @@ -1086,7 +1086,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORD= S] =3D { XSTATE_OPMASK_MASK | XSTATE_ZMM_Hi256_MASK | XSTATE_Hi16_ZMM_M= ASK | XSTATE_PKRU_MASK, }, - [FEAT_XSAVE_COMP_HI] =3D { + [FEAT_XSAVE_XCR0_HI] =3D { .type =3D CPUID_FEATURE_WORD, .cpuid =3D { .eax =3D 0xD, @@ -1491,8 +1491,8 @@ static inline bool accel_uses_host_cpuid(void) =20 static inline uint64_t x86_cpu_xsave_components(X86CPU *cpu) { - return ((uint64_t)cpu->env.features[FEAT_XSAVE_COMP_HI]) << 32 | - cpu->env.features[FEAT_XSAVE_COMP_LO]; + return ((uint64_t)cpu->env.features[FEAT_XSAVE_XCR0_HI]) << 32 | + cpu->env.features[FEAT_XSAVE_XCR0_LO]; } =20 const char *get_register_name_32(unsigned int reg) @@ -4663,8 +4663,8 @@ static const char *x86_cpu_feature_name(FeatureWord w= , int bitnr) /* XSAVE components are automatically enabled by other features, * so return the original feature name instead */ - if (w =3D=3D FEAT_XSAVE_COMP_LO || w =3D=3D FEAT_XSAVE_COMP_HI) { - int comp =3D (w =3D=3D FEAT_XSAVE_COMP_HI) ? bitnr + 32 : bitnr; + if (w =3D=3D FEAT_XSAVE_XCR0_LO || w =3D=3D FEAT_XSAVE_XCR0_HI) { + int comp =3D (w =3D=3D FEAT_XSAVE_XCR0_HI) ? bitnr + 32 : bitnr; =20 if (comp < ARRAY_SIZE(x86_ext_save_areas) && x86_ext_save_areas[comp].bits) { @@ -5717,8 +5717,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, = uint32_t count, =20 if (count =3D=3D 0) { *ecx =3D xsave_area_size(x86_cpu_xsave_components(cpu)); - *eax =3D env->features[FEAT_XSAVE_COMP_LO]; - *edx =3D env->features[FEAT_XSAVE_COMP_HI]; + *eax =3D env->features[FEAT_XSAVE_XCR0_LO]; + *edx =3D env->features[FEAT_XSAVE_XCR0_HI]; /* * The initial value of xcr0 and ebx =3D=3D 0, On host without= kvm * commit 412a3c41(e.g., CentOS 6), the ebx's value always =3D= =3D 0 @@ -6282,8 +6282,8 @@ static void x86_cpu_enable_xsave_components(X86CPU *c= pu) uint64_t mask; =20 if (!(env->features[FEAT_1_ECX] & CPUID_EXT_XSAVE)) { - env->features[FEAT_XSAVE_COMP_LO] =3D 0; - env->features[FEAT_XSAVE_COMP_HI] =3D 0; + env->features[FEAT_XSAVE_XCR0_LO] =3D 0; + env->features[FEAT_XSAVE_XCR0_HI] =3D 0; return; } =20 @@ -6295,8 +6295,8 @@ static void x86_cpu_enable_xsave_components(X86CPU *c= pu) } } =20 - env->features[FEAT_XSAVE_COMP_LO] =3D mask; - env->features[FEAT_XSAVE_COMP_HI] =3D mask >> 32; + env->features[FEAT_XSAVE_XCR0_LO] =3D mask; + env->features[FEAT_XSAVE_XCR0_HI] =3D mask >> 32; } =20 /***** Steps involved on loading and filtering CPUID data diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 88e8586f8f..52f31335c4 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -527,8 +527,8 @@ typedef enum FeatureWord { FEAT_SVM, /* CPUID[8000_000A].EDX */ FEAT_XSAVE, /* CPUID[EAX=3D0xd,ECX=3D1].EAX */ FEAT_6_EAX, /* CPUID[6].EAX */ - FEAT_XSAVE_COMP_LO, /* CPUID[EAX=3D0xd,ECX=3D0].EAX */ - FEAT_XSAVE_COMP_HI, /* CPUID[EAX=3D0xd,ECX=3D0].EDX */ + FEAT_XSAVE_XCR0_LO, /* CPUID[EAX=3D0xd,ECX=3D0].EAX */ + FEAT_XSAVE_XCR0_HI, /* CPUID[EAX=3D0xd,ECX=3D0].EDX */ FEAT_ARCH_CAPABILITIES, FEAT_CORE_CAPABILITY, FEAT_PERF_CAPABILITIES, --=20 2.26.2