| Message ID | 159889935648.21294.8095493980805969544.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:36 -0500 Babu Moger <babu.moger@amd.com> wrote: > This reverts commit 6121c7fbfd98dbc3af1b00b56ff2eef66df87828. > > 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> > --- > hw/i386/x86.c | 5 ----- > include/hw/i386/x86.h | 9 --------- > 2 files changed, 14 deletions(-) > > diff --git a/hw/i386/x86.c b/hw/i386/x86.c > index 3cc2318212..727c4a0f1d 100644 > --- a/hw/i386/x86.c > +++ b/hw/i386/x86.c > @@ -896,11 +896,6 @@ static void x86_machine_initfn(Object *obj) > x86ms->smm = ON_OFF_AUTO_AUTO; > x86ms->acpi = ON_OFF_AUTO_AUTO; > x86ms->smp_dies = 1; > - > - x86ms->apicid_from_cpu_idx = x86_apicid_from_cpu_idx; > - x86ms->topo_ids_from_apicid = x86_topo_ids_from_apicid; > - x86ms->apicid_from_topo_ids = x86_apicid_from_topo_ids; > - x86ms->apicid_pkg_offset = apicid_pkg_offset; > } > > static void x86_machine_class_init(ObjectClass *oc, void *data) > diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h > index b79f24e285..4d9a26326d 100644 > --- a/include/hw/i386/x86.h > +++ b/include/hw/i386/x86.h > @@ -63,15 +63,6 @@ typedef struct { > OnOffAuto smm; > OnOffAuto acpi; > > - /* Apic id specific handlers */ > - uint32_t (*apicid_from_cpu_idx)(X86CPUTopoInfo *topo_info, > - unsigned cpu_index); > - void (*topo_ids_from_apicid)(apic_id_t apicid, X86CPUTopoInfo *topo_info, > - X86CPUTopoIDs *topo_ids); > - apic_id_t (*apicid_from_topo_ids)(X86CPUTopoInfo *topo_info, > - const X86CPUTopoIDs *topo_ids); > - uint32_t (*apicid_pkg_offset)(X86CPUTopoInfo *topo_info); > - > /* > * Address space used by IOAPIC device. All IOAPIC interrupts > * will be translated to MSI messages in the address space. >
diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 3cc2318212..727c4a0f1d 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -896,11 +896,6 @@ static void x86_machine_initfn(Object *obj) x86ms->smm = ON_OFF_AUTO_AUTO; x86ms->acpi = ON_OFF_AUTO_AUTO; x86ms->smp_dies = 1; - - x86ms->apicid_from_cpu_idx = x86_apicid_from_cpu_idx; - x86ms->topo_ids_from_apicid = x86_topo_ids_from_apicid; - x86ms->apicid_from_topo_ids = x86_apicid_from_topo_ids; - x86ms->apicid_pkg_offset = apicid_pkg_offset; } static void x86_machine_class_init(ObjectClass *oc, void *data) diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index b79f24e285..4d9a26326d 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -63,15 +63,6 @@ typedef struct { OnOffAuto smm; OnOffAuto acpi; - /* Apic id specific handlers */ - uint32_t (*apicid_from_cpu_idx)(X86CPUTopoInfo *topo_info, - unsigned cpu_index); - void (*topo_ids_from_apicid)(apic_id_t apicid, X86CPUTopoInfo *topo_info, - X86CPUTopoIDs *topo_ids); - apic_id_t (*apicid_from_topo_ids)(X86CPUTopoInfo *topo_info, - const X86CPUTopoIDs *topo_ids); - uint32_t (*apicid_pkg_offset)(X86CPUTopoInfo *topo_info); - /* * Address space used by IOAPIC device. All IOAPIC interrupts * will be translated to MSI messages in the address space.
This reverts commit 6121c7fbfd98dbc3af1b00b56ff2eef66df87828. Remove the EPYC specific apicid decoding and use the generic default decoding. Signed-off-by: Babu Moger <babu.moger@amd.com> --- hw/i386/x86.c | 5 ----- include/hw/i386/x86.h | 9 --------- 2 files changed, 14 deletions(-)