Commit db970bd2 authored by Yazen Ghannam's avatar Yazen Ghannam Committed by Borislav Petkov
Browse files

x86/CPU/AMD: Remove amd_get_nb_id() 



The Last Level Cache ID is returned by amd_get_nb_id(). In practice,
this value is the same as the AMD NodeId for callers of this function.
The NodeId is saved in struct cpuinfo_x86.cpu_die_id.

Replace calls to amd_get_nb_id() with the logical CPU's cpu_die_id and
remove the function.

Signed-off-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201109210659.754018-3-Yazen.Ghannam@amd.com
parent 028c221e

arch/x86/events/amd/core.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static void amd_pmu_cpu_starting(int cpu) 
	if (!x86_pmu.amd_nb_constraints)

		return;



	nb_id = amd_get_nb_id(cpu);

	nb_id = topology_die_id(cpu);

	WARN_ON_ONCE(nb_id == BAD_APICID);



	for_each_online_cpu(i) {

arch/x86/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -813,10 +813,8 @@ extern int set_tsc_mode(unsigned int val); 
DECLARE_PER_CPU(u64, msr_misc_features_shadow);



#ifdef CONFIG_CPU_SUP_AMD

extern u16 amd_get_nb_id(int cpu);

extern u32 amd_get_nodes_per_socket(void);

#else

static inline u16 amd_get_nb_id(int cpu)		{ return 0; }

static inline u32 amd_get_nodes_per_socket(void)	{ return 0; }

#endif

arch/x86/kernel/amd_nb.c

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ struct resource *amd_get_mmconfig_range(struct resource *res) 


int amd_get_subcaches(int cpu)

{

	struct pci_dev *link = node_to_amd_nb(amd_get_nb_id(cpu))->link;

	struct pci_dev *link = node_to_amd_nb(topology_die_id(cpu))->link;

	unsigned int mask;



	if (!amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
@@ -398,7 +398,7 @@ int amd_get_subcaches(int cpu) 
int amd_set_subcaches(int cpu, unsigned long mask)

{

	static unsigned int reset, ban;

	struct amd_northbridge *nb = node_to_amd_nb(amd_get_nb_id(cpu));

	struct amd_northbridge *nb = node_to_amd_nb(topology_die_id(cpu));

	unsigned int reg;

	int cuid;

arch/x86/kernel/cpu/amd.c

+0 −6
Original line number Diff line number Diff line
@@ -424,12 +424,6 @@ static void amd_detect_ppin(struct cpuinfo_x86 *c) 
	clear_cpu_cap(c, X86_FEATURE_AMD_PPIN);

}



u16 amd_get_nb_id(int cpu)

{

	return per_cpu(cpu_llc_id, cpu);

}

EXPORT_SYMBOL_GPL(amd_get_nb_id);



u32 amd_get_nodes_per_socket(void)

{

	return nodes_per_socket;

arch/x86/kernel/cpu/cacheinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ static void amd_init_l3_cache(struct _cpuid4_info_regs *this_leaf, int index) 
	if (index < 3)

		return;



	node = amd_get_nb_id(smp_processor_id());

	node = topology_die_id(smp_processor_id());

	this_leaf->nb = node_to_amd_nb(node);

	if (this_leaf->nb && !this_leaf->nb->l3_cache.indices)

		amd_calc_l3_indices(this_leaf->nb);