From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWWi-0006L4-MR for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:53:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TBWWh-00011w-CB for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:53:40 -0400 Received: from hub021-nj-6.exch021.serverdata.net ([206.225.164.222]:48666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWWh-00011X-7i for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:53:39 -0400 Message-ID: <504F96C2.7050205@CloudSwitch.Com> Date: Tue, 11 Sep 2012 15:53:38 -0400 From: Don Slutz MIME-Version: 1.0 References: <1346961939-32338-1-git-send-email-ehabkost@redhat.com> <1346961939-32338-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1346961939-32338-5-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 4/5] i386: cpu: eliminate duplicate feature names List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: Igor Mammedov , qemu-devel@nongnu.org, Anthony Liguori , =?ISO-8859-1?Q?Andreas_F=E4rber?= On 09/06/12 16:05, Eduardo Habkost wrote: > Instead of having duplicate feature names on the ext2_feature array for > the AMD feature bit aliases, we keep the feature names only on the > feature_name[] array, and copy the corresponding bits to > cpuid_ext2_features in case the CPU vendor is AMD. > > This will: > > - Make sure we don't set the feature bit aliases on Intel CPUs; > - Make it easier to convert feature bits to CPU properties, as now we > have a single bit on the x86_def_t struct for each CPU feature. > > Signed-off-by: Eduardo Habkost > --- > target-i386/cpu.c | 31 +++++++++++++++++++++++-------- > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 682895b..4b65b33 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -61,15 +61,19 @@ static const char *ext_feature_name[] = { > "tsc-deadline", "aes", "xsave", "osxsave", > "avx", NULL, NULL, "hypervisor", > }; > +/* Feature names that are already defined on feature_name[] but are set on > + * CPUID[8000_0001].EDX on AMD CPUs don't have their names on > + * ext2_feature_name[]. They are copied automatically to cpuid_ext2_features > + * if and only if CPU vendor is AMD. > + */ > static const char *ext2_feature_name[] = { > - "fpu", "vme", "de", "pse", > - "tsc", "msr", "pae", "mce", > - "cx8" /* AMD CMPXCHG8B */, "apic", NULL, "syscall", > - "mtrr", "pge", "mca", "cmov", > - "pat", "pse36", NULL, NULL /* Linux mp */, > - "nx|xd", NULL, "mmxext", "mmx", > - "fxsr", "fxsr_opt|ffxsr", "pdpe1gb" /* AMD Page1GB */, "rdtscp", > - NULL, "lm|i64", "3dnowext", "3dnow", > + NULL /* fpu */, NULL /* vme */, NULL /* de */, NULL /* pse */, > + NULL /* tsc */, NULL /* msr */, NULL /* pae */, NULL /* mce */, > + NULL /* cx8 */ /* AMD CMPXCHG8B */, NULL /* apic */, NULL, "syscall", > + NULL /* mtrr */, NULL /* pge */, NULL /* mca */, NULL /* cmov */, > + NULL /* pat */, NULL /* pse36 */, NULL, NULL /* Linux mp */, > + "nx|xd", NULL, "mmxext", NULL /* mmx */, > + NULL /* fxsr */, "fxsr_opt|ffxsr", "pdpe1gb" /* AMD Page1GB */, "rdtscp", > }; > static const char *ext3_feature_name[] = { > "lahf_lm" /* AMD LahfSahf */, "cmp_legacy", "svm", "extapic" /* AMD ExtApicSpace */, > @@ -1374,6 +1378,17 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) > env->cpuid_xlevel2 = def->xlevel2; > object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000, > "tsc-frequency", &error); > + > + /* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on > + * CPUID[1].EDX. > + */ > + if (env->cpuid_vendor1 == CPUID_VENDOR_AMD_1 && > + env->cpuid_vendor2 == CPUID_VENDOR_AMD_2 && > + env->cpuid_vendor3 == CPUID_VENDOR_AMD_3) { > + env->cpuid_ext2_features &= ~CPUID_EXT2_AMD_ALIASES; > + env->cpuid_ext2_features |= (def->features & CPUID_EXT2_AMD_ALIASES); > + } > + > if (!kvm_enabled()) { > env->cpuid_features &= TCG_FEATURES; > env->cpuid_ext_features &= TCG_EXT_FEATURES; Reviewed-by: Don Slutz