Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc589e57 authored by Borislav Petkov's avatar Borislav Petkov Committed by Greg Kroah-Hartman
Browse files

x86/CPU/AMD: Have smp_num_siblings and cpu_llc_id always be present 



commit f8b64d08dde2714c62751d18ba77f4aeceb161d3 upstream.

Move smp_num_siblings and cpu_llc_id to cpu/common.c so that they're
always present as symbols and not only in the CONFIG_SMP case. Then,
other code using them doesn't need ugly ifdeffery anymore. Get rid of
some ifdeffery.

Signed-off-by: default avatarBorislav Petkov <bpetkov@suse.de>
Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1524864877-111962-2-git-send-email-suravee.suthikulpanit@amd.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b37de2cf

arch/x86/include/asm/smp.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -170,7 +170,6 @@ static inline int wbinvd_on_all_cpus(void) 
	wbinvd();

	wbinvd();

	return 0;

	return 0;

}

}

#define smp_num_siblings	1

#endif /* CONFIG_SMP */

#endif /* CONFIG_SMP */





extern unsigned disabled_cpus;

extern unsigned disabled_cpus;

arch/x86/kernel/cpu/amd.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -298,7 +298,6 @@ static int nearby_node(int apicid) 
}

}

#endif

#endif





#ifdef CONFIG_SMP

/*

/*

 * Fix up cpu_core_id for pre-F17h systems to be in the

 * Fix up cpu_core_id for pre-F17h systems to be in the

 * [0 .. cores_per_node - 1] range. Not really needed but

 * [0 .. cores_per_node - 1] range. Not really needed but
@@ -382,7 +381,6 @@ static void amd_get_topology(struct cpuinfo_x86 *c) 
		legacy_fixup_core_id(c);

		legacy_fixup_core_id(c);

	}

	}

}

}

#endif





/*

/*

 * On a AMD dual core setup the lower bits of the APIC id distinguish the cores.

 * On a AMD dual core setup the lower bits of the APIC id distinguish the cores.
@@ -390,7 +388,6 @@ static void amd_get_topology(struct cpuinfo_x86 *c) 
 */

 */

static void amd_detect_cmp(struct cpuinfo_x86 *c)

static void amd_detect_cmp(struct cpuinfo_x86 *c)

{

{

#ifdef CONFIG_SMP

	unsigned bits;

	unsigned bits;

	int cpu = smp_processor_id();

	int cpu = smp_processor_id();
@@ -402,16 +399,11 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c) 
	/* use socket ID also for last level cache */

	/* use socket ID also for last level cache */

	per_cpu(cpu_llc_id, cpu) = c->phys_proc_id;

	per_cpu(cpu_llc_id, cpu) = c->phys_proc_id;

	amd_get_topology(c);

	amd_get_topology(c);

#endif

}

}





u16 amd_get_nb_id(int cpu)

u16 amd_get_nb_id(int cpu)

{

{

	u16 id = 0;

	return per_cpu(cpu_llc_id, cpu);

#ifdef CONFIG_SMP

	id = per_cpu(cpu_llc_id, cpu);

#endif

	return id;

}

}

EXPORT_SYMBOL_GPL(amd_get_nb_id);

EXPORT_SYMBOL_GPL(amd_get_nb_id);

arch/x86/kernel/cpu/common.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,13 @@ cpumask_var_t cpu_callin_mask; 
/* representing cpus for which sibling maps can be computed */

/* representing cpus for which sibling maps can be computed */

cpumask_var_t cpu_sibling_setup_mask;

cpumask_var_t cpu_sibling_setup_mask;





/* Number of siblings per CPU package */

int smp_num_siblings = 1;

EXPORT_SYMBOL(smp_num_siblings);



/* Last level cache ID of each logical CPU */

DEFINE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id) = BAD_APICID;



/* correctly size the local cpu masks */

/* correctly size the local cpu masks */

void __init setup_cpu_local_masks(void)

void __init setup_cpu_local_masks(void)

{

{

arch/x86/kernel/smpboot.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -80,13 +80,6 @@ 
#include <asm/spec-ctrl.h>

#include <asm/spec-ctrl.h>

#include <asm/hw_irq.h>

#include <asm/hw_irq.h>





/* Number of siblings per CPU package */

int smp_num_siblings = 1;

EXPORT_SYMBOL(smp_num_siblings);



/* Last level cache ID of each logical CPU */

DEFINE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id) = BAD_APICID;



/* representing HT siblings of each logical CPU */

/* representing HT siblings of each logical CPU */

DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);

DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);

EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);

EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);