[PATCH v1] PM: sleep: Fix suspend_test() at the TEST_CORE level

[PATCH v1] PM: sleep: Fix suspend_test() at the TEST_CORE level

[Rafael J. Wysocki]

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

Commit a10ad1b10402 ("PM: suspend: Make pm_test delay interruptible by
wakeup events") replaced mdelay() in suspend_test() with msleep() which
does not work at the TEST_CORE test level that calls suspend_test()
while running on one CPU with interrupts off.

Address this by making suspend_test() check if the test level is
suitable for using msleep() and use mdelay() otherwise.

Fixes: a10ad1b10402 ("PM: suspend: Make pm_test delay interruptible by wakeup events")
Reported-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Closes: https://lore.kernel.org/linux-pm/aUsAk0k1N9hw8IkY@venus/
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 kernel/power/suspend.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -349,9 +349,12 @@ static int suspend_test(int level)
 	if (pm_test_level == level) {
 		pr_info("suspend debug: Waiting for %d second(s).\n",
 				pm_test_delay);
-		for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++)
-			msleep(1000);
-
+		for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++) {
+			if (level > TEST_CORE)
+				msleep(1000);
+			else
+				mdelay(1000);
+		}
 		return 1;
 	}
 #endif /* !CONFIG_PM_DEBUG */

Re: [PATCH v1] PM: sleep: Fix suspend_test() at the TEST_CORE level

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1652 bytes --]

Hi,

On Fri, Dec 26, 2025 at 02:50:57PM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> Commit a10ad1b10402 ("PM: suspend: Make pm_test delay interruptible by
> wakeup events") replaced mdelay() in suspend_test() with msleep() which
> does not work at the TEST_CORE test level that calls suspend_test()
> while running on one CPU with interrupts off.
> 
> Address this by making suspend_test() check if the test level is
> suitable for using msleep() and use mdelay() otherwise.
> 
> Fixes: a10ad1b10402 ("PM: suspend: Make pm_test delay interruptible by wakeup events")
> Reported-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> Closes: https://lore.kernel.org/linux-pm/aUsAk0k1N9hw8IkY@venus/
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---

I can confirm it fixes the issue I reported, so:

Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Greetings,

-- Sebastian

>  kernel/power/suspend.c |    9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> --- a/kernel/power/suspend.c
> +++ b/kernel/power/suspend.c
> @@ -349,9 +349,12 @@ static int suspend_test(int level)
>  	if (pm_test_level == level) {
>  		pr_info("suspend debug: Waiting for %d second(s).\n",
>  				pm_test_delay);
> -		for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++)
> -			msleep(1000);
> -
> +		for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++) {
> +			if (level > TEST_CORE)
> +				msleep(1000);
> +			else
> +				mdelay(1000);
> +		}
>  		return 1;
>  	}
>  #endif /* !CONFIG_PM_DEBUG */
> 
> 
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v1] PM: sleep: Fix suspend_test() at the TEST_CORE level

[luriwen]

在 2025/12/26 21:50, Rafael J. Wysocki 写道:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Commit a10ad1b10402 ("PM: suspend: Make pm_test delay interruptible by
> wakeup events") replaced mdelay() in suspend_test() with msleep() which
> does not work at the TEST_CORE test level that calls suspend_test()
> while running on one CPU with interrupts off.
>
> Address this by making suspend_test() check if the test level is
> suitable for using msleep() and use mdelay() otherwise.
>
> Fixes: a10ad1b10402 ("PM: suspend: Make pm_test delay interruptible by wakeup events")
> Reported-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> Closes: https://lore.kernel.org/linux-pm/aUsAk0k1N9hw8IkY@venus/
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
>   kernel/power/suspend.c |    9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
>
> --- a/kernel/power/suspend.c
> +++ b/kernel/power/suspend.c
> @@ -349,9 +349,12 @@ static int suspend_test(int level)
>   	if (pm_test_level == level) {
>   		pr_info("suspend debug: Waiting for %d second(s).\n",
>   				pm_test_delay);
> -		for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++)
> -			msleep(1000);
> -
> +		for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++) {
> +			if (level > TEST_CORE)
> +				msleep(1000);
> +			else
> +				mdelay(1000);
> +		}

Maybe this can be rewritten as follows

		for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++)
			level == TEST_CORE ? mdelay(1000) : msleep(1000);

>   		return 1;
>   	}
>   #endif /* !CONFIG_PM_DEBUG */

Re: [PATCH v1] PM: sleep: Fix suspend_test() at the TEST_CORE level

[Rafael J. Wysocki]

On Mon, Dec 29, 2025 at 3:31 AM luriwen <luriwen@kylinos.cn> wrote:
>
> 在 2025/12/26 21:50, Rafael J. Wysocki 写道:
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> > Commit a10ad1b10402 ("PM: suspend: Make pm_test delay interruptible by
> > wakeup events") replaced mdelay() in suspend_test() with msleep() which
> > does not work at the TEST_CORE test level that calls suspend_test()
> > while running on one CPU with interrupts off.
> >
> > Address this by making suspend_test() check if the test level is
> > suitable for using msleep() and use mdelay() otherwise.
> >
> > Fixes: a10ad1b10402 ("PM: suspend: Make pm_test delay interruptible by wakeup events")
> > Reported-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > Closes: https://lore.kernel.org/linux-pm/aUsAk0k1N9hw8IkY@venus/
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > ---
> >   kernel/power/suspend.c |    9 ++++++---
> >   1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > --- a/kernel/power/suspend.c
> > +++ b/kernel/power/suspend.c
> > @@ -349,9 +349,12 @@ static int suspend_test(int level)
> >       if (pm_test_level == level) {
> >               pr_info("suspend debug: Waiting for %d second(s).\n",
> >                               pm_test_delay);
> > -             for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++)
> > -                     msleep(1000);
> > -
> > +             for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++) {
> > +                     if (level > TEST_CORE)
> > +                             msleep(1000);
> > +                     else
> > +                             mdelay(1000);
> > +             }
>
> Maybe this can be rewritten as follows
>
>                 for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++)
>                         level == TEST_CORE ? mdelay(1000) : msleep(1000);

Not really, the current trend is to avoid the ternary operator.