Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933588AbcKIPDw (ORCPT ); Wed, 9 Nov 2016 10:03:52 -0500 Received: from mga01.intel.com ([192.55.52.88]:64104 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932327AbcKIPDt (ORCPT ); Wed, 9 Nov 2016 10:03:49 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,614,1473145200"; d="scan'208";a="29361503" Date: Wed, 9 Nov 2016 07:05:15 -0800 From: Jacob Pan To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Eric Ernst , Zhang Rui , jacob.jun.pan@linux.intel.com Subject: Re: [PATCH 4.8 022/138] thermal/powerclamp: correct cpu support check Message-ID: <20161109070515.08bd390d@jacob-builder> In-Reply-To: <20161109102845.758765195@linuxfoundation.org> References: <20161109102844.808685475@linuxfoundation.org> <20161109102845.758765195@linuxfoundation.org> Organization: OTC X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3150 Lines: 102 On Wed, 9 Nov 2016 11:45:05 +0100 Greg Kroah-Hartman wrote: > 4.8-stable review patch. If anyone has any objections, please let me > know. > I just realized that this patch would prevent module auto loading since we don't have device id table. I will send out this patch in a minute. So we need to apply both this patch and the one below. drivers/thermal/intel_powerclamp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c index f0bad48..c82b41f 100644 --- a/drivers/thermal/intel_powerclamp.c +++ b/drivers/thermal/intel_powerclamp.c @@ -694,9 +694,16 @@ static int powerclamp_set_cur_state(struct thermal_cooling_device *cdev, .set_cur_state = powerclamp_set_cur_state, }; +static const struct x86_cpu_id __initconst intel_powerclamp_ids[] = { + { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_MWAIT }, + {} +}; +MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids); + static int __init powerclamp_probe(void) { - if (!boot_cpu_has(X86_FEATURE_MWAIT)) { + + if (!x86_match_cpu(intel_powerclamp_ids)) { pr_err("CPU does not support MWAIT"); return -ENODEV; } > ------------------ > > From: Eric Ernst > > commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 upstream. > > Initial logic for checking CPU match resulted in OR of CPU features > rather than the intended AND. > > Updated to use boot_cpu_has macro rather than x86_match_cpu. > > In addition, MWAIT is the only required CPU feature for idle > injection to work. Drop other feature requirements since they are > only needed for optimal efficiency. > > Signed-off-by: Eric Ernst > Acked-by: Jacob Pan > Signed-off-by: Zhang Rui > Signed-off-by: Greg Kroah-Hartman > > --- > drivers/thermal/intel_powerclamp.c | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > > --- a/drivers/thermal/intel_powerclamp.c > +++ b/drivers/thermal/intel_powerclamp.c > @@ -669,20 +669,10 @@ static struct thermal_cooling_device_ops > .set_cur_state = powerclamp_set_cur_state, > }; > > -static const struct x86_cpu_id intel_powerclamp_ids[] __initconst = { > - { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, > X86_FEATURE_MWAIT }, > - { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, > X86_FEATURE_ARAT }, > - { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, > X86_FEATURE_NONSTOP_TSC }, > - { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, > X86_FEATURE_CONSTANT_TSC}, > - {} > -}; > -MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids); > - > static int __init powerclamp_probe(void) > { > - if (!x86_match_cpu(intel_powerclamp_ids)) { > - pr_err("Intel powerclamp does not run on family %d > model %d\n", > - boot_cpu_data.x86, > boot_cpu_data.x86_model); > + if (!boot_cpu_has(X86_FEATURE_MWAIT)) { > + pr_err("CPU does not support MWAIT"); > return -ENODEV; > } > > > [Jacob Pan]