@@ -67,7 +67,7 @@ AMD nomenclature for package is 'Node'.
Modern systems use this value for the socket. There may be multiple
packages within a socket. This value may differ from topo.die_id.
- - cpuinfo_x86.logical_proc_id:
+ - cpuinfo_x86.topo.logical_pkg_id:
The logical ID of the package. As we do not trust BIOSes to enumerate the
packages in a consistent way, we introduced the concept of logical package
@@ -74,7 +74,7 @@ int uncore_device_to_die(struct pci_dev
struct cpuinfo_x86 *c = &cpu_data(cpu);
if (c->initialized && cpu_to_node(cpu) == node)
- return c->logical_die_id;
+ return c->topo.logical_die_id;
}
return -1;
@@ -94,6 +94,10 @@ struct cpuinfo_topology {
// Core ID relative to the package
u32 core_id;
+
+ // Logical ID mappings
+ u32 logical_pkg_id;
+ u32 logical_die_id;
};
struct cpuinfo_x86 {
@@ -144,10 +148,6 @@ struct cpuinfo_x86 {
u16 x86_clflush_size;
/* number of cores as seen by the OS: */
u16 booted_cores;
- /* Logical processor id: */
- u16 logical_proc_id;
- /* Core id: */
- u16 logical_die_id;
/* Index into per_cpu list: */
u16 cpu_index;
/* Is SMT active on this core? */
@@ -105,9 +105,9 @@ static inline void setup_node_to_cpumask
extern const struct cpumask *cpu_coregroup_mask(int cpu);
extern const struct cpumask *cpu_clustergroup_mask(int cpu);
-#define topology_logical_package_id(cpu) (cpu_data(cpu).logical_proc_id)
+#define topology_logical_package_id(cpu) (cpu_data(cpu).topo.logical_pkg_id)
#define topology_physical_package_id(cpu) (cpu_data(cpu).topo.pkg_id)
-#define topology_logical_die_id(cpu) (cpu_data(cpu).logical_die_id)
+#define topology_logical_die_id(cpu) (cpu_data(cpu).topo.logical_die_id)
#define topology_die_id(cpu) (cpu_data(cpu).topo.die_id)
#define topology_core_id(cpu) (cpu_data(cpu).topo.core_id)
#define topology_ppin(cpu) (cpu_data(cpu).ppin)
@@ -1770,7 +1770,7 @@ static void validate_apic_and_package_id
BUG_ON(topology_update_package_map(c->topo.pkg_id, cpu));
BUG_ON(topology_update_die_map(c->topo.die_id, cpu));
#else
- c->logical_proc_id = 0;
+ c->topo.logical_pkg_id = 0;
#endif
}
@@ -348,7 +348,7 @@ int topology_phys_to_logical_pkg(unsigne
struct cpuinfo_x86 *c = &cpu_data(cpu);
if (c->initialized && c->topo.pkg_id == phys_pkg)
- return c->logical_proc_id;
+ return c->topo.logical_pkg_id;
}
return -1;
}
@@ -370,7 +370,7 @@ static int topology_phys_to_logical_die(
if (c->initialized && c->topo.die_id == die_id &&
c->topo.pkg_id == proc_id)
- return c->logical_die_id;
+ return c->topo.logical_die_id;
}
return -1;
}
@@ -395,7 +395,7 @@ int topology_update_package_map(unsigned
cpu, pkg, new);
}
found:
- cpu_data(cpu).logical_proc_id = new;
+ cpu_data(cpu).topo.logical_pkg_id = new;
return 0;
}
/**
@@ -418,7 +418,7 @@ int topology_update_die_map(unsigned int
cpu, die, new);
}
found:
- cpu_data(cpu).logical_die_id = new;
+ cpu_data(cpu).topo.logical_die_id = new;
return 0;
}
Yet another topology related data pair. Rename logical_proc_id to logical_pkg_id so it fits the common naming conventions. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- Documentation/arch/x86/topology.rst | 2 +- arch/x86/events/intel/uncore.c | 2 +- arch/x86/include/asm/processor.h | 8 ++++---- arch/x86/include/asm/topology.h | 4 ++-- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/smpboot.c | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-)