Commit 0d712978 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cpu_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cpuid updates from Borislav Petkov:
 "Only AMD-specific changes this time:

   - Save the AMD physical die ID into cpuinfo_x86.cpu_die_id and
     convert all code to use it (Yazen Ghannam)

   - Remove a dead and unused TSEG region remapping workaround on AMD
     (Arvind Sankar)"

* tag 'x86_cpu_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/amd: Remove dead code for TSEG region remapping
  x86/topology: Set cpu_die_id only if DIE_TYPE found
  EDAC/mce_amd: Use struct cpuinfo_x86.cpu_die_id for AMD NodeId
  x86/CPU/AMD: Remove amd_get_nb_id()
  x86/CPU/AMD: Save AMD NodeId as cpu_die_id
parents 5583ff67 262bd572

Documentation/x86/topology.rst

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ Package 
Packages contain a number of cores plus shared resources, e.g. DRAM

controller, shared caches etc.



Modern systems may also use the term 'Die' for package.



AMD nomenclature for package is 'Node'.



Package-related topology information in the kernel:
@@ -53,11 +55,18 @@ Package-related topology information in the kernel: 


    The number of dies in a package. This information is retrieved via CPUID.



  - cpuinfo_x86.cpu_die_id:



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



  - cpuinfo_x86.phys_proc_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.



    Modern systems use this value for the socket. There may be multiple

    packages within a socket. This value may differ from cpu_die_id.



  - cpuinfo_x86.logical_proc_id:



    The logical ID of the package. As we do not trust BIOSes to enumerate the

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/cacheinfo.h

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef _ASM_X86_CACHEINFO_H

#define _ASM_X86_CACHEINFO_H



void cacheinfo_amd_init_llc_id(struct cpuinfo_x86 *c, int cpu, u8 node_id);

void cacheinfo_hygon_init_llc_id(struct cpuinfo_x86 *c, int cpu, u8 node_id);

void cacheinfo_amd_init_llc_id(struct cpuinfo_x86 *c, int cpu);

void cacheinfo_hygon_init_llc_id(struct cpuinfo_x86 *c, int cpu);



#endif /* _ASM_X86_CACHEINFO_H */

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;