[PATCH] x86/apic: Delete useless BUG_ON in validate_apic_and_package_id()

[PATCH] x86/apic: Delete useless BUG_ON in validate_apic_and_package_id()

[Peng Liu]

Both topology_update_package_map() and topology_update_die_map() have a fixed
return value 0. That is, they never fail. So the BUG_ON() checks on them are
useless and better be deleted.

Signed-off-by: Peng Liu <pngliu@hotmail.com>
---
 arch/x86/kernel/cpu/common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index fbc4e60d027c..44b08de3971c 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1796,8 +1796,8 @@ static void validate_apic_and_package_id(struct cpuinfo_x86 *c)
 		pr_err(FW_BUG "CPU%u: APIC id mismatch. Firmware: %x APIC: %x\n",
 		       cpu, apicid, c->topo.initial_apicid);
 	}
-	BUG_ON(topology_update_package_map(c->topo.pkg_id, cpu));
-	BUG_ON(topology_update_die_map(c->topo.die_id, cpu));
+	topology_update_package_map(c->topo.pkg_id, cpu);
+	topology_update_die_map(c->topo.die_id, cpu);
 #else
 	c->topo.logical_pkg_id = 0;
 #endif
-- 
2.34.1

Re: [PATCH] x86/apic: Delete useless BUG_ON in validate_apic_and_package_id()

[Borislav Petkov]

On Fri, Mar 08, 2024 at 04:01:52PM +0800, Peng Liu wrote:
> Both topology_update_package_map() and topology_update_die_map() have a fixed
> return value 0. That is, they never fail. So the BUG_ON() checks on them are
> useless and better be deleted.
> 
> Signed-off-by: Peng Liu <pngliu@hotmail.com>
> ---
>  arch/x86/kernel/cpu/common.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
> index fbc4e60d027c..44b08de3971c 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -1796,8 +1796,8 @@ static void validate_apic_and_package_id(struct cpuinfo_x86 *c)
>  		pr_err(FW_BUG "CPU%u: APIC id mismatch. Firmware: %x APIC: %x\n",
>  		       cpu, apicid, c->topo.initial_apicid);
>  	}
> -	BUG_ON(topology_update_package_map(c->topo.pkg_id, cpu));
> -	BUG_ON(topology_update_die_map(c->topo.die_id, cpu));
> +	topology_update_package_map(c->topo.pkg_id, cpu);
> +	topology_update_die_map(c->topo.die_id, cpu);
>  #else
>  	c->topo.logical_pkg_id = 0;
>  #endif
> -- 

https://lore.kernel.org/r/20240213210252.901865302@linutronix.de

If you wanna do arch/x86/ patches, do them always ontop of tip/master or
the current linux-next master branch.

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette