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

x86/smpboot: Teach it about topo.amd_node_id 



When switching AMD over to the new topology parser then the match functions
need to look for AMD systems with the extended topology feature at the new
topo.amd_node_id member which is then holding the node id information.

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 <mhklinux@outlook.com>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Tested-by: default avatarWang Wendy <wendy.wang@intel.com>
Tested-by: default avatarK Prateek Nayak <kprateek.nayak@amd.com>
Link: https://lore.kernel.org/r/20240212153625.082979150@linutronix.de
parent f7fb3b2d

arch/x86/kernel/smpboot.c

+8 −4
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) 


		if (c->topo.pkg_id == o->topo.pkg_id &&

		    c->topo.die_id == o->topo.die_id &&

		    c->topo.amd_node_id == o->topo.amd_node_id &&

		    per_cpu_llc_id(cpu1) == per_cpu_llc_id(cpu2)) {

			if (c->topo.core_id == o->topo.core_id)

				return topology_sane(c, o, "smt");
@@ -509,10 +510,13 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) 


static bool match_die(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)

{

	if (c->topo.pkg_id == o->topo.pkg_id &&

	    c->topo.die_id == o->topo.die_id)

		return true;

	if (c->topo.pkg_id != o->topo.pkg_id || c->topo.die_id != o->topo.die_id)

		return false;



	if (cpu_feature_enabled(X86_FEATURE_TOPOEXT) && topology_amd_nodes_per_pkg() > 1)

		return c->topo.amd_node_id == o->topo.amd_node_id;



	return true;

}



static bool match_l2c(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)