[PATCH] thermal/powerclamp: add back module device table

[PATCH] thermal/powerclamp: add back module device table

[Jacob Pan]

Commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 replaced module
cpu id table with a cpu feature check, which is logically correct.
But we need the module device table to allow module auto loading.

Fixes:3105f234 thermal/powerclamp: correct cpu support check
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 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 bd4914e..745fcec 100644
--- a/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
@@ -704,9 +704,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;
 	}
-- 
1.9.1

Re: [PATCH] thermal/powerclamp: add back module device table

[Greg Kroah-Hartman]

On Mon, Nov 14, 2016 at 11:08:45AM -0800, Jacob Pan wrote:
> Commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 replaced module
> cpu id table with a cpu feature check, which is logically correct.
> But we need the module device table to allow module auto loading.
> 
> Fixes:3105f234 thermal/powerclamp: correct cpu support check
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> ---
>  drivers/thermal/intel_powerclamp.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
for how to do this properly.

</formletter>

Re: [PATCH] thermal/powerclamp: add back module device table

[Jacob Pan]

On Tue, 15 Nov 2016 08:03:32 +0100
Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:

> On Mon, Nov 14, 2016 at 11:08:45AM -0800, Jacob Pan wrote:
> > Commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 replaced module
> > cpu id table with a cpu feature check, which is logically correct.
> > But we need the module device table to allow module auto loading.
> > 
> > Fixes:3105f234 thermal/powerclamp: correct cpu support check
> > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> > ---
> >  drivers/thermal/intel_powerclamp.c | 9 ++++++++-
> >  1 file changed, 8 insertions(+), 1 deletion(-)  
> 
> <formletter>
> 
> This is not the correct way to submit patches for inclusion in the
> stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
> for how to do this properly.
> 
> </formletter>

Good to know, thanks. Rui will take care of it this time. Per Rui
"I will apply patch 1 and queue up for next -rc and 4.8 stable."

Thanks,

Jacob

Re: [PATCH] thermal/powerclamp: add back module device table

[Zhang Rui]

On Thu, 2016-11-17 at 11:42 -0800, Jacob Pan wrote:
> On Tue, 15 Nov 2016 08:03:32 +0100
> Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
> 
> > 
> > On Mon, Nov 14, 2016 at 11:08:45AM -0800, Jacob Pan wrote:
> > > 
> > > Commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 replaced module
> > > cpu id table with a cpu feature check, which is logically
> > > correct.
> > > But we need the module device table to allow module auto loading.
> > > 
> > > Fixes:3105f234 thermal/powerclamp: correct cpu support check
> > > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> > > ---
> > >  drivers/thermal/intel_powerclamp.c | 9 ++++++++-
> > >  1 file changed, 8 insertions(+), 1 deletion(-)  
> > <formletter>
> > 
> > This is not the correct way to submit patches for inclusion in the
> > stable kernel tree.  Please read
> > Documentation/stable_kernel_rules.txt
> > for how to do this properly.
> > 
> > </formletter>
> Good to know, thanks. Rui will take care of it this time. Per Rui
> "I will apply patch 1 and queue up for next -rc and 4.8 stable."
> 

Just find another problem.
We're still missing this upstream
commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 (thermal/powerclamp:
correct cpu support check) for 4.7 stable, and in this case, we can not
queue this patch for both 4.7 and 4.8 stable at the moment because it
does not apply to 4.7 stable.

I will send this patch out asap to catch 4.9, and then send a note to
stable kernel with the following Option 2
in Documentation/stable_kernel_rules.txt after it's merged.

thanks,
rui

Re: [PATCH] thermal/powerclamp: add back module device table

[Greg Kroah-Hartman]

On Mon, Nov 21, 2016 at 11:43:10AM +0800, Zhang Rui wrote:
> On Thu, 2016-11-17 at 11:42 -0800, Jacob Pan wrote:
> > On Tue, 15 Nov 2016 08:03:32 +0100
> > Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
> > 
> > > 
> > > On Mon, Nov 14, 2016 at 11:08:45AM -0800, Jacob Pan wrote:
> > > > 
> > > > Commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 replaced module
> > > > cpu id table with a cpu feature check, which is logically
> > > > correct.
> > > > But we need the module device table to allow module auto loading.
> > > > 
> > > > Fixes:3105f234 thermal/powerclamp: correct cpu support check
> > > > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> > > > ---
> > > >  drivers/thermal/intel_powerclamp.c | 9 ++++++++-
> > > >  1 file changed, 8 insertions(+), 1 deletion(-)  
> > > <formletter>
> > > 
> > > This is not the correct way to submit patches for inclusion in the
> > > stable kernel tree.  Please read
> > > Documentation/stable_kernel_rules.txt
> > > for how to do this properly.
> > > 
> > > </formletter>
> > Good to know, thanks. Rui will take care of it this time. Per Rui
> > "I will apply patch 1 and queue up for next -rc and 4.8 stable."
> > 
> 
> Just find another problem.
> We're still missing this upstream
> commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 (thermal/powerclamp:
> correct cpu support check) for 4.7 stable, and in this case, we can not
> queue this patch for both 4.7 and 4.8 stable at the moment because it
> does not apply to 4.7 stable.

I don't understand, 4.7 is end-of-life, no one cares about it anymore,
why are you worrying about that kernel version?

confused,

greg k-h

Re: [PATCH] thermal/powerclamp: add back module device table

[Zhang Rui]

On Mon, 2016-11-21 at 08:13 +0100, Greg Kroah-Hartman wrote:
> On Mon, Nov 21, 2016 at 11:43:10AM +0800, Zhang Rui wrote:
> > 
> > On Thu, 2016-11-17 at 11:42 -0800, Jacob Pan wrote:
> > > 
> > > On Tue, 15 Nov 2016 08:03:32 +0100
> > > Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
> > > 
> > > > 
> > > > 
> > > > On Mon, Nov 14, 2016 at 11:08:45AM -0800, Jacob Pan wrote:
> > > > > 
> > > > > 
> > > > > Commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 replaced
> > > > > module
> > > > > cpu id table with a cpu feature check, which is logically
> > > > > correct.
> > > > > But we need the module device table to allow module auto
> > > > > loading.
> > > > > 
> > > > > Fixes:3105f234 thermal/powerclamp: correct cpu support check
> > > > > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> > > > > ---
> > > > >  drivers/thermal/intel_powerclamp.c | 9 ++++++++-
> > > > >  1 file changed, 8 insertions(+), 1 deletion(-)  
> > > > <formletter>
> > > > 
> > > > This is not the correct way to submit patches for inclusion in
> > > > the
> > > > stable kernel tree.  Please read
> > > > Documentation/stable_kernel_rules.txt
> > > > for how to do this properly.
> > > > 
> > > > </formletter>
> > > Good to know, thanks. Rui will take care of it this time. Per Rui
> > > "I will apply patch 1 and queue up for next -rc and 4.8 stable."
> > > 
> > Just find another problem.
> > We're still missing this upstream
> > commit 3105f234e0aba43e44e277c20f9b32ee8add43d4
> > (thermal/powerclamp:
> > correct cpu support check) for 4.7 stable, and in this case, we can
> > not
> > queue this patch for both 4.7 and 4.8 stable at the moment because
> > it
> > does not apply to 4.7 stable.
> I don't understand, 4.7 is end-of-life, no one cares about it
> anymore,

sorry, I was not aware of that.
will send the patch out tomorrow.

thanks,
rui

Re: [PATCH] thermal/powerclamp: add back module device table

[Jacob Pan]

On Wed, 9 Nov 2016 16:08:35 +0100
Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:

> >  drivers/thermal/intel_powerclamp.c | 9 ++++++++-
> >  1 file changed, 8 insertions(+), 1 deletion(-)  
> 
> No signed-off-by :(
> 
> No Fixes: line, and no stable: line :(

my bad, just resent with fixes.

Re: [PATCH] thermal/powerclamp: add back module device table

[Greg Kroah-Hartman]

On Wed, Nov 09, 2016 at 07:01:01AM -0800, Jacob Pan wrote:
> Commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 replaced module
> cpu id table with a cpu feature check, which is logically correct.
> But we need the module device table to allow module auto loading.
> ---
>  drivers/thermal/intel_powerclamp.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)

No signed-off-by :(

No Fixes: line, and no stable: line :(

[PATCH] thermal/powerclamp: add back module device table

[Jacob Pan]

Commit 3105f234e0aba43e44e277c20f9b32ee8add43d4 replaced module
cpu id table with a cpu feature check, which is logically correct.
But we need the module device table to allow module auto loading.
---
 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;
 	}
-- 
1.9.1