[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 05/10] Revert "hw/i386: Introduce apicid functions inside X86M
From: |
Babu Moger |
Subject: |
[PATCH v6 05/10] Revert "hw/i386: Introduce apicid functions inside X86MachineState" |
Date: |
Mon, 31 Aug 2020 13:42:36 -0500 |
User-agent: |
StGit/unknown-version |
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(-)
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.
- [PATCH v6 00/10] Remove EPYC mode apicid decode and use generic decode, Babu Moger, 2020/08/31
- [PATCH v6 00/10] Remove EPYC mode apicid decode and use generic decode, Babu Moger, 2020/08/31
- [PATCH v6 01/10] Revert "i386: Fix pkg_id offset for EPYC cpu models", Babu Moger, 2020/08/31
- [PATCH v6 02/10] Revert "target/i386: Enable new apic id encoding for EPYC based cpus models", Babu Moger, 2020/08/31
- [PATCH v6 03/10] Revert "hw/i386: Move arch_id decode inside x86_cpus_init", Babu Moger, 2020/08/31
- [PATCH v6 04/10] Revert "i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition", Babu Moger, 2020/08/31
- [PATCH v6 05/10] Revert "hw/i386: Introduce apicid functions inside X86MachineState",
Babu Moger <=
- [PATCH v6 06/10] Revert "target/i386: Cleanup and use the EPYC mode topology functions", Babu Moger, 2020/08/31
- [PATCH v6 07/10] Revert "hw/386: Add EPYC mode topology decoding functions", Babu Moger, 2020/08/31
- [PATCH v6 08/10] Revert "hw/i386: Update structures to save the number of nodes per package", Babu Moger, 2020/08/31
- [PATCH v6 09/10] i386: Simplify CPUID_8000_001E for AMD, Babu Moger, 2020/08/31
- [PATCH v6 10/10] i386: Simplify CPUID_8000_001E for AMD, Babu Moger, 2020/08/31