| Message ID | 159889935015.21294.1425332462852607813.stgit@naples-babu.amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove EPYC mode apicid decode and use generic decode | expand |
On Mon, 31 Aug 2020 13:42:30 -0500 Babu Moger <babu.moger@amd.com> wrote: > This reverts commit 0c1538cb1a26287c072645f4759b9872b1596d79. > > Remove the EPYC specific apicid decoding and use the generic > default decoding. > > Signed-off-by: Babu Moger <babu.moger@amd.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > target/i386/cpu.c | 16 ---------------- > target/i386/cpu.h | 1 - > 2 files changed, 17 deletions(-) > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index c9c1e681c2..b72b4b08ac 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -1638,10 +1638,6 @@ typedef struct X86CPUDefinition { > FeatureWordArray features; > const char *model_id; > CPUCaches *cache_info; > - > - /* Use AMD EPYC encoding for apic id */ > - bool use_epyc_apic_id_encoding; > - > /* > * Definitions for alternative versions of CPU model. > * List is terminated by item with version == 0. > @@ -1683,18 +1679,6 @@ static const X86CPUVersionDefinition *x86_cpu_def_get_versions(X86CPUDefinition > return def->versions ?: default_version_list; > } > > -bool cpu_x86_use_epyc_apic_id_encoding(const char *cpu_type) > -{ > - X86CPUClass *xcc = X86_CPU_CLASS(object_class_by_name(cpu_type)); > - > - assert(xcc); > - if (xcc->model && xcc->model->cpudef) { > - return xcc->model->cpudef->use_epyc_apic_id_encoding; > - } else { > - return false; > - } > -} > - > static CPUCaches epyc_cache_info = { > .l1d_cache = &(CPUCacheInfo) { > .type = DATA_CACHE, > diff --git a/target/i386/cpu.h b/target/i386/cpu.h > index d5ad42d694..5ff8ad8427 100644 > --- a/target/i386/cpu.h > +++ b/target/i386/cpu.h > @@ -1918,7 +1918,6 @@ void cpu_clear_apic_feature(CPUX86State *env); > void host_cpuid(uint32_t function, uint32_t count, > uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); > void host_vendor_fms(char *vendor, int *family, int *model, int *stepping); > -bool cpu_x86_use_epyc_apic_id_encoding(const char *cpu_type); > > /* helper.c */ > bool x86_cpu_tlb_fill(CPUState *cs, vaddr address, int size, >
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c9c1e681c2..b72b4b08ac 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1638,10 +1638,6 @@ typedef struct X86CPUDefinition { FeatureWordArray features; const char *model_id; CPUCaches *cache_info; - - /* Use AMD EPYC encoding for apic id */ - bool use_epyc_apic_id_encoding; - /* * Definitions for alternative versions of CPU model. * List is terminated by item with version == 0. @@ -1683,18 +1679,6 @@ static const X86CPUVersionDefinition *x86_cpu_def_get_versions(X86CPUDefinition return def->versions ?: default_version_list; } -bool cpu_x86_use_epyc_apic_id_encoding(const char *cpu_type) -{ - X86CPUClass *xcc = X86_CPU_CLASS(object_class_by_name(cpu_type)); - - assert(xcc); - if (xcc->model && xcc->model->cpudef) { - return xcc->model->cpudef->use_epyc_apic_id_encoding; - } else { - return false; - } -} - static CPUCaches epyc_cache_info = { .l1d_cache = &(CPUCacheInfo) { .type = DATA_CACHE, diff --git a/target/i386/cpu.h b/target/i386/cpu.h index d5ad42d694..5ff8ad8427 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1918,7 +1918,6 @@ void cpu_clear_apic_feature(CPUX86State *env); void host_cpuid(uint32_t function, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); void host_vendor_fms(char *vendor, int *family, int *model, int *stepping); -bool cpu_x86_use_epyc_apic_id_encoding(const char *cpu_type); /* helper.c */ bool x86_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
This reverts commit 0c1538cb1a26287c072645f4759b9872b1596d79. Remove the EPYC specific apicid decoding and use the generic default decoding. Signed-off-by: Babu Moger <babu.moger@amd.com> --- target/i386/cpu.c | 16 ---------------- target/i386/cpu.h | 1 - 2 files changed, 17 deletions(-)