x86/cpu/amd: Move TOPOEXT enablement into the topology parser
PATCH 1/1 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.
--- arch/x86/kernel/cpu/amd.c | 15 --------------- arch/x86/kernel/cpu/topology_amd.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/amd.c +0 -15
@@ -535,7 +535,6 @@ static void early_detect_mem_encrypt(strstatic void early_init_amd (struct cpuinfo_x86 *c) { -u64 value;u32 dummy;if (c->x86 >=0xf )
@@ -603,20 +602,6 @@ static void early_init_amd(struct cpuinfearly_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 (c->x86 ==0x17 &&boot_cpu_has (X86_FEATURE_AMD_IBPB ))setup_force_cpu_cap (X86_FEATURE_IBPB_BRTYPE );
arch/x86/kernel/cpu/topology_amd.c +21 -0
@@ -147,6 +147,26 @@ static void legacy_set_llc(struct topo_s 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) {bool has_0xb = false;
@@ -176,6 +196,7 @@ static void parse_topology_amd(struct tovoid cpu_parse_topology_amd (struct topo_scan *tscan) { tscan->amd_nodes_per_pkg =1 ; +topoext_fixup (tscan);parse_topology_amd (tscan);if (tscan->amd_nodes_per_pkg >1 )
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 7211274fe0ee352332255e41ab5e628b86e83994 Gitweb: https://git.kernel.org/tip/7211274fe0ee352332255e41ab5e628b86e83994 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 11 Apr 2024 18:55:38 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 12 Apr 2024 12:05:54 +02: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.
--- arch/x86/kernel/cpu/amd.c | 15 --------------- arch/x86/kernel/cpu/topology_amd.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/amd.c +0 -15
@@ -535,7 +535,6 @@ clear_sev:static void early_init_amd (struct cpuinfo_x86 *c) { -u64 value;u32 dummy;if (c->x86 >=0xf )
@@ -603,20 +602,6 @@ static void early_init_amd(struct cpuinfo_x86 *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 (c->x86 ==0x17 &&boot_cpu_has (X86_FEATURE_AMD_IBPB ))setup_force_cpu_cap (X86_FEATURE_IBPB_BRTYPE );
arch/x86/kernel/cpu/topology_amd.c +21 -0
@@ -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 ]; } +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) {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) { tscan->amd_nodes_per_pkg =1 ; +topoext_fixup (tscan);parse_topology_amd (tscan);if (tscan->amd_nodes_per_pkg >1 )