linux-kernel - Re: [PATCH] thermal/intel_powerclamp: Don't report an error for AMD CPUs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 17 Feb 2020 15:59:34 +0800
From:   Zhang Rui <rui.zhang@...el.com>
To:     Alexander Koskovich <zvnexus@...il.com>, arjan@...ux.intel.com,
        jacob.jun.pan@...ux.intel.com
Cc:     Alexander Koskovich <zvnexus@...look.com>,
        Daniel Lezcano <daniel.lezcano@...aro.org>,
        Amit Kucheria <amit.kucheria@...durent.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Luc Van Oostenryck <luc.vanoostenryck@...il.com>,
        Petr Mladek <pmladek@...e.com>,
        Thomas Gleixner <tglx@...utronix.de>, linux-pm@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] thermal/intel_powerclamp: Don't report an error for AMD
 CPUs

On Sat, 2020-02-15 at 11:09 -0500, Alexander Koskovich wrote:
> Resolves dmesg error "intel_powerclamp: CPU does not support MWAIT".
> 
> The error that is outputted in dmesg prior to this patch
> is innacurate, AMD Ryzen CPUs do support MWAIT. We could
> also add the AMD vendor to the MWAIT check, but even though
> AMD CPUs do support MWAIT, they fail the C-state package
> check so it's better just to bail out in the beginning.
> 
> Signed-off-by: Alexander Koskovich <zvnexus@...look.com>

I think you're resending the same patch.

As intel_powerclamp_ids already checks for Intel CPUs, so we don't need
the check for AMD CPU, but instead, just remove the following line

"pr_err("CPU does not support MWAIT\n");"

when intel_powerclamp driver fails to probe.

thanks,
rui

> ---
>  drivers/thermal/intel/intel_powerclamp.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/thermal/intel/intel_powerclamp.c
> b/drivers/thermal/intel/intel_powerclamp.c
> index 53216dcbe173..3c5b25bfa596 100644
> --- a/drivers/thermal/intel/intel_powerclamp.c
> +++ b/drivers/thermal/intel/intel_powerclamp.c
> @@ -650,6 +650,11 @@ static struct thermal_cooling_device_ops
> powerclamp_cooling_ops = {
>  	.set_cur_state = powerclamp_set_cur_state,
>  };
>  
> +static const struct x86_cpu_id amd_cpu[] = {
> +	{ X86_VENDOR_AMD },
> +	{},
> +};
> +
>  static const struct x86_cpu_id __initconst intel_powerclamp_ids[] =
> {
>  	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY,
> X86_FEATURE_MWAIT },
>  	{}
> @@ -659,6 +664,11 @@ MODULE_DEVICE_TABLE(x86cpu,
> intel_powerclamp_ids);
>  static int __init powerclamp_probe(void)
>  {
>  
> +	if (x86_match_cpu(amd_cpu)) {
> +		pr_info("Intel PowerClamp does not support AMD
> CPUs\n");
> +		return -ENODEV;
> +	}
> +
>  	if (!x86_match_cpu(intel_powerclamp_ids)) {
>  		pr_err("CPU does not support MWAIT\n");
>  		return -ENODEV;