Commit e3c0c5d5 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/cpu: Move cu_id into topology info 



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.628405546@linutronix.de
parent e9525633

arch/x86/include/asm/processor.h

+3 −1
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ struct cpuinfo_topology { 
	// Physical die ID on AMD, Relative on Intel

	u32			die_id;



	// Compute unit ID - AMD specific

	u32			cu_id;



	// Core ID relative to the package

	u32			core_id;

};
@@ -110,7 +113,6 @@ struct cpuinfo_x86 { 
	__u8			x86_phys_bits;

	/* CPUID returned core id bits: */

	__u8			x86_coreid_bits;

	__u8			cu_id;

	/* Max extended CPUID function supported: */

	__u32			extended_cpuid_level;

	/* Maximum supported CPUID level, -1=no CPUID: */

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static void amd_get_topology(struct cpuinfo_x86 *c) 
		c->topo.die_id  = ecx & 0xff;



		if (c->x86 == 0x15)

			c->cu_id = ebx & 0xff;

			c->topo.cu_id = ebx & 0xff;



		if (c->x86 >= 0x17) {

			c->topo.core_id = ebx & 0xff;

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -1829,7 +1829,7 @@ static void identify_cpu(struct cpuinfo_x86 *c) 
	c->x86_model_id[0] = '\0';  /* Unset */

	c->x86_max_cores = 1;

	c->x86_coreid_bits = 0;

	c->cu_id = 0xff;

	c->topo.cu_id = 0xff;

#ifdef CONFIG_X86_64

	c->x86_clflush_size = 64;

	c->x86_phys_bits = 36;

arch/x86/kernel/smpboot.c

+3 −3
Original line number Diff line number Diff line
@@ -482,9 +482,9 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) 
			if (c->topo.core_id == o->topo.core_id)

				return topology_sane(c, o, "smt");



			if ((c->cu_id != 0xff) &&

			    (o->cu_id != 0xff) &&

			    (c->cu_id == o->cu_id))

			if ((c->topo.cu_id != 0xff) &&

			    (o->topo.cu_id != 0xff) &&

			    (c->topo.cu_id == o->topo.cu_id))

				return topology_sane(c, o, "smt");

		}