mirror of
https://github.com/torvalds/linux
synced 2024-07-24 12:11:06 +00:00
x86/cpu/amd: Move TOPOEXT enablement into the topology parser
The topology rework missed that early_init_amd() tries to re-enable the
Topology Extensions when the BIOS disabled them.
The new parser is invoked before early_init_amd() so the re-enable attempt
happens too late.
Move it into the AMD specific topology parser code where it belongs.
Fixes: f7fb3b2dd9
("x86/cpu: Provide an AMD/HYGON specific topology parser")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/878r1j260l.ffs@tglx
This commit is contained in:
parent
c064b536a8
commit
7211274fe0
|
@ -535,7 +535,6 @@ static void early_detect_mem_encrypt(struct cpuinfo_x86 *c)
|
||||||
|
|
||||||
static void early_init_amd(struct cpuinfo_x86 *c)
|
static void early_init_amd(struct cpuinfo_x86 *c)
|
||||||
{
|
{
|
||||||
u64 value;
|
|
||||||
u32 dummy;
|
u32 dummy;
|
||||||
|
|
||||||
if (c->x86 >= 0xf)
|
if (c->x86 >= 0xf)
|
||||||
|
@ -603,20 +602,6 @@ static void early_init_amd(struct cpuinfo_x86 *c)
|
||||||
|
|
||||||
early_detect_mem_encrypt(c);
|
early_detect_mem_encrypt(c);
|
||||||
|
|
||||||
/* Re-enable TopologyExtensions if switched off by BIOS */
|
|
||||||
if (c->x86 == 0x15 &&
|
|
||||||
(c->x86_model >= 0x10 && c->x86_model <= 0x6f) &&
|
|
||||||
!cpu_has(c, X86_FEATURE_TOPOEXT)) {
|
|
||||||
|
|
||||||
if (msr_set_bit(0xc0011005, 54) > 0) {
|
|
||||||
rdmsrl(0xc0011005, value);
|
|
||||||
if (value & BIT_64(54)) {
|
|
||||||
set_cpu_cap(c, X86_FEATURE_TOPOEXT);
|
|
||||||
pr_info_once(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!cpu_has(c, X86_FEATURE_HYPERVISOR) && !cpu_has(c, X86_FEATURE_IBPB_BRTYPE)) {
|
if (!cpu_has(c, X86_FEATURE_HYPERVISOR) && !cpu_has(c, X86_FEATURE_IBPB_BRTYPE)) {
|
||||||
if (c->x86 == 0x17 && boot_cpu_has(X86_FEATURE_AMD_IBPB))
|
if (c->x86 == 0x17 && boot_cpu_has(X86_FEATURE_AMD_IBPB))
|
||||||
setup_force_cpu_cap(X86_FEATURE_IBPB_BRTYPE);
|
setup_force_cpu_cap(X86_FEATURE_IBPB_BRTYPE);
|
||||||
|
|
|
@ -147,6 +147,26 @@ static void legacy_set_llc(struct topo_scan *tscan)
|
||||||
tscan->c->topo.llc_id = apicid >> tscan->dom_shifts[TOPO_CORE_DOMAIN];
|
tscan->c->topo.llc_id = apicid >> tscan->dom_shifts[TOPO_CORE_DOMAIN];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void topoext_fixup(struct topo_scan *tscan)
|
||||||
|
{
|
||||||
|
struct cpuinfo_x86 *c = tscan->c;
|
||||||
|
u64 msrval;
|
||||||
|
|
||||||
|
/* Try to re-enable TopologyExtensions if switched off by BIOS */
|
||||||
|
if (cpu_has(c, X86_FEATURE_TOPOEXT) || c->x86_vendor != X86_VENDOR_AMD ||
|
||||||
|
c->x86 != 0x15 || c->x86_model < 0x10 || c->x86_model > 0x6f)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (msr_set_bit(0xc0011005, 54) <= 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
rdmsrl(0xc0011005, msrval);
|
||||||
|
if (msrval & BIT_64(54)) {
|
||||||
|
set_cpu_cap(c, X86_FEATURE_TOPOEXT);
|
||||||
|
pr_info_once(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void parse_topology_amd(struct topo_scan *tscan)
|
static void parse_topology_amd(struct topo_scan *tscan)
|
||||||
{
|
{
|
||||||
bool has_0xb = false;
|
bool has_0xb = false;
|
||||||
|
@ -176,6 +196,7 @@ static void parse_topology_amd(struct topo_scan *tscan)
|
||||||
void cpu_parse_topology_amd(struct topo_scan *tscan)
|
void cpu_parse_topology_amd(struct topo_scan *tscan)
|
||||||
{
|
{
|
||||||
tscan->amd_nodes_per_pkg = 1;
|
tscan->amd_nodes_per_pkg = 1;
|
||||||
|
topoext_fixup(tscan);
|
||||||
parse_topology_amd(tscan);
|
parse_topology_amd(tscan);
|
||||||
|
|
||||||
if (tscan->amd_nodes_per_pkg > 1)
|
if (tscan->amd_nodes_per_pkg > 1)
|
||||||
|
|
Loading…
Reference in a new issue