[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/20] Revert "hw/386: Add EPYC mode topology decoding functions"
From: |
Eduardo Habkost |
Subject: |
[PULL 16/20] Revert "hw/386: Add EPYC mode topology decoding functions" |
Date: |
Wed, 2 Sep 2020 07:53:19 -0400 |
From: Babu Moger <babu.moger@amd.com>
This reverts commit 7568b205555a6405042f62c64af3268f4330aed5.
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>
Message-Id: <159889936871.21294.1454526726636639780.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/i386/topology.h | 100 -------------------------------------
1 file changed, 100 deletions(-)
diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
index 07239f95f4..b9593b9905 100644
--- a/include/hw/i386/topology.h
+++ b/include/hw/i386/topology.h
@@ -47,7 +47,6 @@ typedef uint32_t apic_id_t;
typedef struct X86CPUTopoIDs {
unsigned pkg_id;
- unsigned node_id;
unsigned die_id;
unsigned core_id;
unsigned smt_id;
@@ -89,11 +88,6 @@ static inline unsigned apicid_die_width(X86CPUTopoInfo
*topo_info)
return apicid_bitwidth_for_count(topo_info->dies_per_pkg);
}
-/* Bit width of the node_id field per socket */
-static inline unsigned apicid_node_width_epyc(X86CPUTopoInfo *topo_info)
-{
- return apicid_bitwidth_for_count(MAX(topo_info->nodes_per_pkg, 1));
-}
/* Bit offset of the Core_ID field
*/
static inline unsigned apicid_core_offset(X86CPUTopoInfo *topo_info)
@@ -114,100 +108,6 @@ static inline unsigned apicid_pkg_offset(X86CPUTopoInfo
*topo_info)
return apicid_die_offset(topo_info) + apicid_die_width(topo_info);
}
-#define NODE_ID_OFFSET 3 /* Minimum node_id offset if numa configured */
-
-/*
- * Bit offset of the node_id field
- *
- * Make sure nodes_per_pkg > 0 if numa configured else zero.
- */
-static inline unsigned apicid_node_offset_epyc(X86CPUTopoInfo *topo_info)
-{
- unsigned offset = apicid_die_offset(topo_info) +
- apicid_die_width(topo_info);
-
- if (topo_info->nodes_per_pkg) {
- return MAX(NODE_ID_OFFSET, offset);
- } else {
- return offset;
- }
-}
-
-/* Bit offset of the Pkg_ID (socket ID) field */
-static inline unsigned apicid_pkg_offset_epyc(X86CPUTopoInfo *topo_info)
-{
- return apicid_node_offset_epyc(topo_info) +
- apicid_node_width_epyc(topo_info);
-}
-
-/*
- * Make APIC ID for the CPU based on Pkg_ID, Core_ID, SMT_ID
- *
- * The caller must make sure core_id < nr_cores and smt_id < nr_threads.
- */
-static inline apic_id_t
-x86_apicid_from_topo_ids_epyc(X86CPUTopoInfo *topo_info,
- const X86CPUTopoIDs *topo_ids)
-{
- return (topo_ids->pkg_id << apicid_pkg_offset_epyc(topo_info)) |
- (topo_ids->node_id << apicid_node_offset_epyc(topo_info)) |
- (topo_ids->die_id << apicid_die_offset(topo_info)) |
- (topo_ids->core_id << apicid_core_offset(topo_info)) |
- topo_ids->smt_id;
-}
-
-static inline void x86_topo_ids_from_idx_epyc(X86CPUTopoInfo *topo_info,
- unsigned cpu_index,
- X86CPUTopoIDs *topo_ids)
-{
- unsigned nr_nodes = MAX(topo_info->nodes_per_pkg, 1);
- unsigned nr_dies = topo_info->dies_per_pkg;
- unsigned nr_cores = topo_info->cores_per_die;
- unsigned nr_threads = topo_info->threads_per_core;
- unsigned cores_per_node = DIV_ROUND_UP((nr_dies * nr_cores * nr_threads),
- nr_nodes);
-
- topo_ids->pkg_id = cpu_index / (nr_dies * nr_cores * nr_threads);
- topo_ids->node_id = (cpu_index / cores_per_node) % nr_nodes;
- topo_ids->die_id = cpu_index / (nr_cores * nr_threads) % nr_dies;
- topo_ids->core_id = cpu_index / nr_threads % nr_cores;
- topo_ids->smt_id = cpu_index % nr_threads;
-}
-
-/*
- * Calculate thread/core/package IDs for a specific topology,
- * based on APIC ID
- */
-static inline void x86_topo_ids_from_apicid_epyc(apic_id_t apicid,
- X86CPUTopoInfo *topo_info,
- X86CPUTopoIDs *topo_ids)
-{
- topo_ids->smt_id = apicid &
- ~(0xFFFFFFFFUL << apicid_smt_width(topo_info));
- topo_ids->core_id =
- (apicid >> apicid_core_offset(topo_info)) &
- ~(0xFFFFFFFFUL << apicid_core_width(topo_info));
- topo_ids->die_id =
- (apicid >> apicid_die_offset(topo_info)) &
- ~(0xFFFFFFFFUL << apicid_die_width(topo_info));
- topo_ids->node_id =
- (apicid >> apicid_node_offset_epyc(topo_info)) &
- ~(0xFFFFFFFFUL << apicid_node_width_epyc(topo_info));
- topo_ids->pkg_id = apicid >> apicid_pkg_offset_epyc(topo_info);
-}
-
-/*
- * Make APIC ID for the CPU 'cpu_index'
- *
- * 'cpu_index' is a sequential, contiguous ID for the CPU.
- */
-static inline apic_id_t x86_apicid_from_cpu_idx_epyc(X86CPUTopoInfo *topo_info,
- unsigned cpu_index)
-{
- X86CPUTopoIDs topo_ids;
- x86_topo_ids_from_idx_epyc(topo_info, cpu_index, &topo_ids);
- return x86_apicid_from_topo_ids_epyc(topo_info, &topo_ids);
-}
/* Make APIC ID for the CPU based on Pkg_ID, Core_ID, SMT_ID
*
* The caller must make sure core_id < nr_cores and smt_id < nr_threads.
--
2.26.2
- [PULL 04/20] rdma: Rename INTERFACE_RDMA_PROVIDER_CLASS macro, (continued)
- [PULL 04/20] rdma: Rename INTERFACE_RDMA_PROVIDER_CLASS macro, Eduardo Habkost, 2020/09/02
- [PULL 07/20] rx: Move typedef RXCPU to cpu-qom.h, Eduardo Habkost, 2020/09/02
- [PULL 06/20] rx: Rename QOM type check macros, Eduardo Habkost, 2020/09/02
- [PULL 08/20] hda-audio: Set instance_size at base class, Eduardo Habkost, 2020/09/02
- [PULL 09/20] tls-cipher-suites: Correct instance_size, Eduardo Habkost, 2020/09/02
- [PULL 11/20] Revert "target/i386: Enable new apic id encoding for EPYC based cpus models", Eduardo Habkost, 2020/09/02
- [PULL 12/20] Revert "hw/i386: Move arch_id decode inside x86_cpus_init", Eduardo Habkost, 2020/09/02
- [PULL 10/20] Revert "i386: Fix pkg_id offset for EPYC cpu models", Eduardo Habkost, 2020/09/02
- [PULL 14/20] Revert "hw/i386: Introduce apicid functions inside X86MachineState", Eduardo Habkost, 2020/09/02
- [PULL 13/20] Revert "i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition", Eduardo Habkost, 2020/09/02
- [PULL 16/20] Revert "hw/386: Add EPYC mode topology decoding functions",
Eduardo Habkost <=
- [PULL 17/20] Revert "hw/i386: Update structures to save the number of nodes per package", Eduardo Habkost, 2020/09/02
- [PULL 15/20] Revert "target/i386: Cleanup and use the EPYC mode topology functions", Eduardo Habkost, 2020/09/02
- [PULL 18/20] virtio: add Virtio*BusClass sizes, Eduardo Habkost, 2020/09/02
- [PULL 19/20] target/i386/cpu: Fix memleak in x86_cpu_class_check_missing_features, Eduardo Habkost, 2020/09/02
- [PULL 20/20] target/i386/sev: Plug memleak in sev_read_file_base64, Eduardo Habkost, 2020/09/02
- Re: [PULL 00/20] x86 and machine queue, 2020-09-02, Peter Maydell, 2020/09/02