[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/9] i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition
From: |
Eduardo Habkost |
Subject: |
[PULL 4/9] i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition |
Date: |
Thu, 2 Apr 2020 19:20:46 -0300 |
From: Babu Moger <address@hidden>
Add a boolean variable use_epyc_apic_id_encoding in X86CPUDefinition.
This will be set if this cpu model needs to use new EPYC based
apic id encoding.
Override the handlers with EPYC based handlers if use_epyc_apic_id_encoding
is set. This will be done in x86_cpus_init.
Signed-off-by: Babu Moger <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/i386/cpu.c | 16 ++++++++++++++++
target/i386/cpu.h | 1 +
2 files changed, 17 insertions(+)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index c3eba567ea..50cd257a7e 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1614,6 +1614,10 @@ 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.
@@ -1655,6 +1659,18 @@ 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 9af1b0c12e..8227479c94 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1897,6 +1897,7 @@ 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,
--
2.24.1
- [PULL 0/9] x86 queue for -rc2, Eduardo Habkost, 2020/04/02
- [PULL 2/9] target/i386: Cleanup and use the EPYC mode topology functions, Eduardo Habkost, 2020/04/02
- [PULL 1/9] hw/386: Add EPYC mode topology decoding functions, Eduardo Habkost, 2020/04/02
- [PULL 3/9] hw/i386: Introduce apicid functions inside X86MachineState, Eduardo Habkost, 2020/04/02
- [PULL 4/9] i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition,
Eduardo Habkost <=
- [PULL 5/9] hw/i386: Move arch_id decode inside x86_cpus_init, Eduardo Habkost, 2020/04/02
- [PULL 7/9] i386: Fix pkg_id offset for EPYC cpu models, Eduardo Habkost, 2020/04/02
- [PULL 8/9] target/i386: set the CPUID level to 0x14 on old machine-type, Eduardo Habkost, 2020/04/02
- [PULL 6/9] target/i386: Enable new apic id encoding for EPYC based cpus models, Eduardo Habkost, 2020/04/02
- [PULL 9/9] target/i386: Add ARCH_CAPABILITIES related bits into Icelake-Server CPU model, Eduardo Habkost, 2020/04/02
- Re: [PULL 0/9] x86 queue for -rc2, Peter Maydell, 2020/04/03