Patch "x86: PM: Make APM idle driver initialize polling state" has been added to the 4.15-stable tree

Patch "x86: PM: Make APM idle driver initialize polling state" has been added to the 4.15-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    x86: PM: Make APM idle driver initialize polling state

to the 4.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-pm-make-apm-idle-driver-initialize-polling-state.patch
and it can be found in the queue-4.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From f859422075165e32c00c8d75d63f300015cc07ae Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Tue, 6 Feb 2018 18:55:12 +0100
Subject: x86: PM: Make APM idle driver initialize polling state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

commit f859422075165e32c00c8d75d63f300015cc07ae upstream.

Update the APM driver overlooked by commit 1b39e3f813b4 (cpuidle: Make
drivers initialize polling state) to initialize the polling state like
the other cpuidle drivers modified by that commit to prevent cpuidle
from crashing.

Fixes: 1b39e3f813b4 (cpuidle: Make drivers initialize polling state)
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: 4.14+ <stable@vger.kernel.org> # 4.14+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/x86/kernel/apm_32.c |    1 +
 1 file changed, 1 insertion(+)

--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -2389,6 +2389,7 @@ static int __init apm_init(void)
 	if (HZ != 100)
 		idle_period = (idle_period * HZ) / 100;
 	if (idle_threshold < 100) {
+		cpuidle_poll_state_init(&apm_idle_driver);
 		if (!cpuidle_register_driver(&apm_idle_driver))
 			if (cpuidle_register_device(&apm_cpuidle_device))
 				cpuidle_unregister_driver(&apm_idle_driver);


Patches currently in stable-queue which might be from rafael.j.wysocki@intel.com are

queue-4.15/x86-pm-make-apm-idle-driver-initialize-polling-state.patch
queue-4.15/cpufreq-powernv-dont-assume-distinct-pstate-values-for-nominal-and-pmin.patch

Re: Patch "x86: PM: Make APM idle driver initialize polling state" has been added to the 4.15-stable tree

[Rafael J. Wysocki]

On 2/19/2018 5:43 PM, gregkh@linuxfoundation.org wrote:
> This is a note to let you know that I've just added the patch titled
>
>      x86: PM: Make APM idle driver initialize polling state
>
> to the 4.15-stable tree which can be found at:
>      http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Mainline commit

commit    d7212cfb05ba802bea4dd6c90d61cfe6366ea224
tree    92b37c0446514a1304d5222337f93189c1c67650
parent    b6d8ef86cb7b8b6920b6815ebf1352757d3adb87

PM: cpuidle: Fix cpuidle_poll_state_init() prototype

is necessary on top of this to fix a build issue on 32-bit x86 when 
CONFIG_CPU_IDLE is not set.

> The filename of the patch is:
>       x86-pm-make-apm-idle-driver-initialize-polling-state.patch
> and it can be found in the queue-4.15 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
>
>
>  From f859422075165e32c00c8d75d63f300015cc07ae Mon Sep 17 00:00:00 2001
> From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
> Date: Tue, 6 Feb 2018 18:55:12 +0100
> Subject: x86: PM: Make APM idle driver initialize polling state
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> commit f859422075165e32c00c8d75d63f300015cc07ae upstream.
>
> Update the APM driver overlooked by commit 1b39e3f813b4 (cpuidle: Make
> drivers initialize polling state) to initialize the polling state like
> the other cpuidle drivers modified by that commit to prevent cpuidle
> from crashing.
>
> Fixes: 1b39e3f813b4 (cpuidle: Make drivers initialize polling state)
> Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: 4.14+ <stable@vger.kernel.org> # 4.14+
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
>   arch/x86/kernel/apm_32.c |    1 +
>   1 file changed, 1 insertion(+)
>
> --- a/arch/x86/kernel/apm_32.c
> +++ b/arch/x86/kernel/apm_32.c
> @@ -2389,6 +2389,7 @@ static int __init apm_init(void)
>   	if (HZ != 100)
>   		idle_period = (idle_period * HZ) / 100;
>   	if (idle_threshold < 100) {
> +		cpuidle_poll_state_init(&apm_idle_driver);
>   		if (!cpuidle_register_driver(&apm_idle_driver))
>   			if (cpuidle_register_device(&apm_cpuidle_device))
>   				cpuidle_unregister_driver(&apm_idle_driver);
>
>
> Patches currently in stable-queue which might be from rafael.j.wysocki@intel.com are
>
> queue-4.15/x86-pm-make-apm-idle-driver-initialize-polling-state.patch
> queue-4.15/cpufreq-powernv-dont-assume-distinct-pstate-values-for-nominal-and-pmin.patch

Re: Patch "x86: PM: Make APM idle driver initialize polling state" has been added to the 4.15-stable tree

[Greg KH]

On Tue, Feb 20, 2018 at 10:11:25AM +0100, Rafael J. Wysocki wrote:
> On 2/19/2018 5:43 PM, gregkh@linuxfoundation.org wrote:
> > This is a note to let you know that I've just added the patch titled
> > 
> >      x86: PM: Make APM idle driver initialize polling state
> > 
> > to the 4.15-stable tree which can be found at:
> >      http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> 
> Mainline commit
> 
> commit��� d7212cfb05ba802bea4dd6c90d61cfe6366ea224
> tree��� 92b37c0446514a1304d5222337f93189c1c67650
> parent��� b6d8ef86cb7b8b6920b6815ebf1352757d3adb87
> 
> PM: cpuidle: Fix cpuidle_poll_state_init() prototype
> 
> is necessary on top of this to fix a build issue on 32-bit x86 when
> CONFIG_CPU_IDLE is not set.

Thanks, now queued up.  I hadn't gotten that far in my list yet :)

greg k-h