| Message ID | 20250304052450.465445-2-xiaoyao.li@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i386: Adjust CPUID_EXT_PDCM based on enable_pmu at realization | expand |
On Tue, Mar 04, 2025 at 12:24:49AM -0500, Xiaoyao Li wrote: > Date: Tue, 4 Mar 2025 00:24:49 -0500 > From: Xiaoyao Li <xiaoyao.li@intel.com> > Subject: [PATCH 1/2] i386/cpu: Move adjustment of CPUID_EXT_PDCM before > feature_dependencies[] check > X-Mailer: git-send-email 2.34.1 > > There is one entry relates to CPUID_EXT_PDCM in feature_dependencies[]. > So it needs to get correct value of CPUID_EXT_PDCM before using > feature_dependencies[] to apply dependencies. > > Besides, it also ensures CPUID_EXT_PDCM value is tracked in > env->features[FEAT_1_ECX]. > > Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> > --- > target/i386/cpu.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 72ab147e851a..2bf6495140a0 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6693,9 +6693,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, if (threads_per_pkg > 1) { *ebx |= threads_per_pkg << 16; } - if (!cpu->enable_pmu) { - *ecx &= ~CPUID_EXT_PDCM; - } break; case 2: /* cache info: needed for Pentium Pro compatibility */ @@ -7684,6 +7681,10 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp) } } + if (!cpu->enable_pmu) { + env->features[FEAT_1_ECX] &= ~CPUID_EXT_PDCM; + } + for (i = 0; i < ARRAY_SIZE(feature_dependencies); i++) { FeatureDep *d = &feature_dependencies[i]; if (!(env->features[d->from.index] & d->from.mask)) {
There is one entry relates to CPUID_EXT_PDCM in feature_dependencies[]. So it needs to get correct value of CPUID_EXT_PDCM before using feature_dependencies[] to apply dependencies. Besides, it also ensures CPUID_EXT_PDCM value is tracked in env->features[FEAT_1_ECX]. Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> --- target/i386/cpu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)