Commit 8196dab4 authored by Borislav Petkov's avatar Borislav Petkov Committed by Thomas Gleixner
Browse files

x86/cpu: Get rid of compute_unit_id 



It is cpu_core_id anyway.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1458917557-8757-3-git-send-email-bp@alien8.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 32b62f44

arch/x86/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ struct cpuinfo_x86 { 
	u16			logical_proc_id;

	/* Core id: */

	u16			cpu_core_id;

	/* Compute unit id */

	u8			compute_unit_id;

	/* Index into per_cpu list: */

	u16			cpu_index;

	u32			microcode;

arch/x86/kernel/amd_nb.c

+2 −4
Original line number Diff line number Diff line
@@ -170,15 +170,13 @@ int amd_get_subcaches(int cpu) 
{

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

	unsigned int mask;

	int cuid;



	if (!amd_nb_has_feature(AMD_NB_L3_PARTITIONING))

		return 0;



	pci_read_config_dword(link, 0x1d4, &mask);



	cuid = cpu_data(cpu).compute_unit_id;

	return (mask >> (4 * cuid)) & 0xf;

	return (mask >> (4 * cpu_data(cpu).cpu_core_id)) & 0xf;

}



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);

	}



	cuid = cpu_data(cpu).compute_unit_id;

	cuid = cpu_data(cpu).cpu_core_id;

	mask <<= 4 * cuid;

	mask |= (0xf ^ (1 << cuid)) << 26;

arch/x86/kernel/cpu/amd.c

+3 −7
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ static int nearby_node(int apicid) 
#ifdef CONFIG_SMP

static void amd_get_topology(struct cpuinfo_x86 *c)

{

	u32 cores_per_cu = 1;

	u8 node_id;

	int cpu = smp_processor_id();
@@ -312,9 +311,9 @@ static void amd_get_topology(struct cpuinfo_x86 *c) 
		node_id = ecx & 7;



		/* 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->compute_unit_id = ebx & 0xff;

		c->cpu_core_id = ebx & 0xff;

	} else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {

		u64 value;
@@ -325,19 +324,16 @@ static void amd_get_topology(struct cpuinfo_x86 *c) 


	/* fixup multi-node processor information */

	if (nodes_per_socket > 1) {

		u32 cores_per_node;

		u32 cus_per_node;



		set_cpu_cap(c, X86_FEATURE_AMD_DCM);

		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 */

		per_cpu(cpu_llc_id, cpu) = node_id;



		/* core id has to be in the [0 .. cores_per_node - 1] range */

		c->cpu_core_id %= cores_per_node;

		c->compute_unit_id %= cus_per_node;

		c->cpu_core_id %= cus_per_node;

	}

}

#endif

arch/x86/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -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 &&

		    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");



	} else if (c->phys_proc_id == o->phys_proc_id &&