Commit 02fb601d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/cpu: Move phys_proc_id into topology info 



Rename it to pkg_id which is the terminology used in the kernel.

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230814085112.329006989@linutronix.de
parent b9655e70

Documentation/arch/x86/topology.rst

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ Package-related topology information in the kernel: 


    The physical ID of the die. This information is retrieved via CPUID.



  - cpuinfo_x86.phys_proc_id:

  - cpuinfo_x86.topo.pkg_id:



    The physical ID of the package. This information is retrieved via CPUID

    and deduced from the APIC IDs of the cores in the package.

arch/x86/include/asm/processor.h

+3 −2
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ struct cpuinfo_topology { 
	u32			apicid;

	// The initial APIC ID provided by CPUID

	u32			initial_apicid;



	// Physical package ID

	u32			pkg_id;

};



struct cpuinfo_x86 {
@@ -134,8 +137,6 @@ struct cpuinfo_x86 { 
	u16			x86_clflush_size;

	/* number of cores as seen by the OS: */

	u16			booted_cores;

	/* Physical processor id: */

	u16			phys_proc_id;

	/* Logical processor id: */

	u16			logical_proc_id;

	/* Core id: */

arch/x86/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 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_physical_package_id(cpu)	(cpu_data(cpu).phys_proc_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_die_id(cpu)			(cpu_data(cpu).cpu_die_id)

#define topology_core_id(cpu)			(cpu_data(cpu).cpu_core_id)

arch/x86/include/asm/x86_init.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ struct x86_init_ops { 
 * struct x86_cpuinit_ops - platform specific cpu hotplug setups

 * @setup_percpu_clockev:	set up the per cpu clock event device

 * @early_percpu_clock_init:	early init of the per cpu clock event device

 * @fixup_cpu_id:		fixup function for cpuinfo_x86::phys_proc_id

 * @fixup_cpu_id:		fixup function for cpuinfo_x86::topo.pkg_id

 * @parallel_bringup:		Parallel bringup control

 */

struct x86_cpuinit_ops {

arch/x86/kernel/apic/apic_numachip.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void fixup_cpu_id(struct cpuinfo_x86 *c, int node) 
		nodes = ((val >> 3) & 7) + 1;

	}



	c->phys_proc_id = node / nodes;

	c->topo.pkg_id = node / nodes;

}



static int __init numachip_system_init(void)