mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86/cpu: Get rid of compute_unit_id

Browse source 
It is cpu_core_id anyway.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1458917557-8757-3-git-send-email-bp@alien8.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Borislav Petkov 2016-03-25 15:52:36 +01:00 committed by Thomas Gleixner
parent 32b62f4468
commit 8196dab4fc
4 changed files with 6 additions and 14 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/include/asm/processor.h
View file

@ -132,8 +132,6 @@ struct cpuinfo_x86 {
u16 logical_proc_id; u16 logical_proc_id;
/* Core id: */ /* Core id: */
u16 cpu_core_id; u16 cpu_core_id;
/* Compute unit id */
u8 compute_unit_id;
/* Index into per_cpu list: */ /* Index into per_cpu list: */
u16 cpu_index; u16 cpu_index;
u32 microcode; u32 microcode;

6
arch/x86/kernel/amd_nb.c
View file

@ -170,15 +170,13 @@ 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(amd_get_nb_id(cpu))->link;
unsigned int mask; unsigned int mask;
int cuid;
if (!amd_nb_has_feature(AMD_NB_L3_PARTITIONING)) if (!amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
return 0; return 0;
pci_read_config_dword(link, 0x1d4, &mask); pci_read_config_dword(link, 0x1d4, &mask);
cuid = cpu_data(cpu).compute_unit_id; return (mask >> (4 * cpu_data(cpu).cpu_core_id)) & 0xf;
return (mask >> (4 * cuid)) & 0xf;
} }
int amd_set_subcaches(int cpu, unsigned long mask) int amd_set_subcaches(int cpu, unsigned long mask)
@ -204,7 +202,7 @@ int amd_set_subcaches(int cpu, unsigned long mask)
pci_write_config_dword(nb->misc, 0x1b8, reg & ~0x180000); pci_write_config_dword(nb->misc, 0x1b8, reg & ~0x180000);
} }
cuid = cpu_data(cpu).compute_unit_id; cuid = cpu_data(cpu).cpu_core_id;
mask <<= 4 * cuid; mask <<= 4 * cuid;
mask |= (0xf ^ (1 << cuid)) << 26; mask |= (0xf ^ (1 << cuid)) << 26;

10
arch/x86/kernel/cpu/amd.c
View file

@ -300,7 +300,6 @@ static int nearby_node(int apicid)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static void amd_get_topology(struct cpuinfo_x86 *c) static void amd_get_topology(struct cpuinfo_x86 *c)
{ {
u32 cores_per_cu = 1;
u8 node_id; u8 node_id;
int cpu = smp_processor_id(); int cpu = smp_processor_id();
@ -312,9 +311,9 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
node_id = ecx & 7; node_id = ecx & 7;
/* get compute unit information */ /* get compute unit information */
cores_per_cu = smp_num_siblings = ((ebx >> 8) & 3) + 1; smp_num_siblings = ((ebx >> 8) & 3) + 1;
c->x86_max_cores /= smp_num_siblings; c->x86_max_cores /= smp_num_siblings;
c->compute_unit_id = ebx & 0xff; c->cpu_core_id = ebx & 0xff;
} else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) { } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {
u64 value; u64 value;
@ -325,19 +324,16 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
/* fixup multi-node processor information */ /* fixup multi-node processor information */
if (nodes_per_socket > 1) { if (nodes_per_socket > 1) {
u32 cores_per_node;
u32 cus_per_node; u32 cus_per_node;
set_cpu_cap(c, X86_FEATURE_AMD_DCM); set_cpu_cap(c, X86_FEATURE_AMD_DCM);
cus_per_node = c->x86_max_cores / nodes_per_socket; cus_per_node = c->x86_max_cores / nodes_per_socket;
cores_per_node = cus_per_node * cores_per_cu;
/* store NodeID, use llc_shared_map to store sibling info */ /* store NodeID, use llc_shared_map to store sibling info */
per_cpu(cpu_llc_id, cpu) = node_id; per_cpu(cpu_llc_id, cpu) = node_id;
/* core id has to be in the [0 .. cores_per_node - 1] range */ /* core id has to be in the [0 .. cores_per_node - 1] range */
c->cpu_core_id %= cores_per_node; c->cpu_core_id %= cus_per_node;
c->compute_unit_id %= cus_per_node;
} }
} }
#endif #endif

2
arch/x86/kernel/smpboot.c
View file

@ -422,7 +422,7 @@ static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
if (c->phys_proc_id == o->phys_proc_id && if (c->phys_proc_id == o->phys_proc_id &&
per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2) && per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2) &&
c->compute_unit_id == o->compute_unit_id) c->cpu_core_id == o->cpu_core_id)
return topology_sane(c, o, "smt"); return topology_sane(c, o, "smt");
} else if (c->phys_proc_id == o->phys_proc_id && } else if (c->phys_proc_id == o->phys_proc_id &&