[MODERATED] Re: [patch V2 06/12] x86/cpu: Remove the pointless CPU printout

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

On Wed, Jun 06, 2018 at 09:27:20PM +0200, speck for Thomas Gleixner wrote:
> Subject: [patch V2 06/12] x86/cpu: Remove the pointless CPU printout
> From: Thomas Gleixner <tglx@linutronix.de>
> 
> The value of this printout is dubious at best and there is no point in
> having it in two different places along with convoluted ways to reach it.
> 
> Remove it completely.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Heh, when I was looking at patch #1 I stumbled on this and thought
"oh man this looks like it could use some flossing, will cobble up a patch
after reviewing this full patchset" and sure enough you did for me :-)

Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Thank you!
> ---
>  arch/x86/kernel/cpu/common.c   |   19 +++++--------------
>  arch/x86/kernel/cpu/topology.c |   10 ----------
>  2 files changed, 5 insertions(+), 24 deletions(-)
> 
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -669,7 +669,7 @@ void detect_ht(struct cpuinfo_x86 *c)
>  		return;
>  
>  	if (cpu_has(c, X86_FEATURE_CMP_LEGACY))
> -		goto out;
> +		return;
>  
>  	if (cpu_has(c, X86_FEATURE_XTOPOLOGY))
>  		return;
> @@ -678,14 +678,14 @@ void detect_ht(struct cpuinfo_x86 *c)
>  
>  	smp_num_siblings = (ebx & 0xff0000) >> 16;
>  
> +	if (!smp_num_siblings)
> +		smp_num_siblings = 1;
> +
>  	if (smp_num_siblings == 1) {
>  		pr_info_once("CPU0: Hyper-Threading is disabled\n");
> -		goto out;
> +		return;
>  	}
>  
> -	if (smp_num_siblings <= 1)
> -		goto out;
> -
>  	index_msb = get_count_order(smp_num_siblings);
>  	c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, index_msb);
>  
> @@ -697,15 +697,6 @@ void detect_ht(struct cpuinfo_x86 *c)
>  
>  	c->cpu_core_id = apic->phys_pkg_id(c->initial_apicid, index_msb) &
>  				       ((1 << core_bits) - 1);
> -
> -out:
> -	if (!printed && (c->x86_max_cores * smp_num_siblings) > 1) {
> -		pr_info("CPU: Physical Processor ID: %d\n",
> -			c->phys_proc_id);
> -		pr_info("CPU: Processor Core ID: %d\n",
> -			c->cpu_core_id);
> -		printed = 1;
> -	}
>  #endif
>  }
>  
> --- a/arch/x86/kernel/cpu/topology.c
> +++ b/arch/x86/kernel/cpu/topology.c
> @@ -33,7 +33,6 @@ int detect_extended_topology(struct cpui
>  	unsigned int eax, ebx, ecx, edx, sub_index;
>  	unsigned int ht_mask_width, core_plus_mask_width;
>  	unsigned int core_select_mask, core_level_siblings;
> -	static bool printed;
>  
>  	if (c->cpuid_level < 0xb)
>  		return -1;
> @@ -86,15 +85,6 @@ int detect_extended_topology(struct cpui
>  	c->apicid = apic->phys_pkg_id(c->initial_apicid, 0);
>  
>  	c->x86_max_cores = (core_level_siblings / smp_num_siblings);
> -
> -	if (!printed) {
> -		pr_info("CPU: Physical Processor ID: %d\n",
> -		       c->phys_proc_id);
> -		if (c->x86_max_cores > 1)
> -			pr_info("CPU: Processor Core ID: %d\n",
> -			       c->cpu_core_id);
> -		printed = 1;
> -	}
>  #endif
>  	return 0;
>  }
>