ieu.desnoy...@efficios.com>, Frederic Weisbecker <frede...@kernel.org>, Len 
Brown <l...@kernel.org>, linux-xte...@linux-xtensa.org, Sascha Hauer 
<ker...@pengutronix.de>, Vasily Gorbik <g...@linux.ibm.com>, linux-arm-msm 
<linux-arm-...@vger.kernel.org>, linux-al...@vger.kernel.org, linux-m68k 
<linux-m...@lists.linux-m68k.org>, Stafford Horne <sho...@gmail.com>, Linux ARM 
<linux-arm-ker...@lists.infradead.org>, Chris Zankel <ch...@zankel.net>, 
Stephen Boyd <sb...@kernel.org>, dingu...@kernel.org, Daniel Bristot de 
Oliveira <bris...@redhat.com>, Alexander Shishkin 
<alexander.shish...@linux.intel.com>, Lorenzo Pieralisi 
<lpieral...@kernel.org>, Rasmus Villemoes <li...@rasmusvillemoes.dk>, Joel 
Fernandes <j...@joelfernandes.org>, Will Deacon <w...@kernel.org>, Boris 
Ostrovsky <boris.ostrov...@oracle.com>, Kevin Hilman <khil...@kernel.org>, 
linux-c...@vger.kernel.org, pv-driv...@vmware.com, 
linux-snps-...@lists.infradead.org, Mel Gorman <mgor...@suse.de>, Jacob Pan 
<jacob.jun....@linux.inte
 l.com>, Arnd Bergmann <a...@arndb.de>, ulli.kr...@googlemail.com, 
vgu...@kernel.org, linux-clk <linux-...@vger.kernel.org>, Josh Triplett 
<j...@joshtriplett.org>, Steven Rostedt <rost...@goodmis.org>, 
r...@vger.kernel.org, Borislav Petkov <b...@alien8.de>, bc...@quicinc.com, 
Thomas Bogendoerfer <tsbog...@alpha.franken.de>, Parisc List 
<linux-par...@vger.kernel.org>, Sudeep Holla <sudeep.ho...@arm.com>, Shawn Guo 
<shawn...@kernel.org>, David Miller <da...@davemloft.net>, Rich Felker 
<dal...@libc.org>, Tony Lindgren <t...@atomide.com>, amakha...@vmware.com, 
Bjorn Andersson <bjorn.anders...@linaro.org>, "H. Peter Anvin" 
<h...@zytor.com>, sparcli...@vger.kernel.org, linux-hexa...@vger.kernel.org, 
linux-riscv <linux-ri...@lists.infradead.org>, anton.iva...@cambridgegreys.com, 
jo...@southpole.se, Yury Norov <yury.no...@gmail.com>, Richard Weinberger 
<rich...@nod.at>, the arch/x86 maintainers <x...@kernel.org>, Russell King - 
ARM Linux <li...@armlinux.org.uk>, Ingo Molnar <mi...@redhat.com>, Al
 bert Ou <a...@eecs.berkeley.edu>, "Paul E. McKenney" <
paul...@kernel.org>, Heiko Carstens <h...@linux.ibm.com>, 
stefan.kristians...@saunalahti.fi, openr...@lists.librecores.org, Paul Walmsley 
<paul.walms...@sifive.com>, linux-tegra <linux-te...@vger.kernel.org>, 
namhy...@kernel.org, Andy Shevchenko <andriy.shevche...@linux.intel.com>, 
jpoim...@kernel.org, Juergen Gross <jgr...@suse.com>, Michal Simek 
<mon...@monstr.eu>, "open list:BROADCOM NVRAM DRIVER" 
<linux-m...@vger.kernel.org>, Palmer Dabbelt <pal...@dabbelt.com>, Anup Patel 
<a...@brainfault.org>, i...@jurassic.park.msu.ru, Johannes Berg 
<johan...@sipsolutions.net>, linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
Errors-To: linuxppc-dev-bounces+archive=mail-archive....@lists.ozlabs.org
Sender: "Linuxppc-dev" 
<linuxppc-dev-bounces+archive=mail-archive....@lists.ozlabs.org>

On Wed, Jun 8, 2022 at 4:47 PM Peter Zijlstra <pet...@infradead.org> wrote:
>
> All the idle routines are called with RCU disabled, as such there must
> not be any tracing inside.
>
> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>

This actually does some additional code duplication cleanup which
would be good to mention in the changelog.  Or even move to a separate
patch for that matter.

Otherwise LGTM.

> ---
>  drivers/acpi/processor_idle.c |   24 +++++++++++++-----------
>  1 file changed, 13 insertions(+), 11 deletions(-)
>
> --- a/drivers/acpi/processor_idle.c
> +++ b/drivers/acpi/processor_idle.c
> @@ -108,8 +108,8 @@ static const struct dmi_system_id proces
>  static void __cpuidle acpi_safe_halt(void)
>  {
>         if (!tif_need_resched()) {
> -               safe_halt();
> -               local_irq_disable();
> +               raw_safe_halt();
> +               raw_local_irq_disable();
>         }
>  }
>
> @@ -524,16 +524,21 @@ static int acpi_idle_bm_check(void)
>         return bm_status;
>  }
>
> -static void wait_for_freeze(void)
> +static __cpuidle void io_idle(unsigned long addr)
>  {
> +       /* IO port based C-state */
> +       inb(addr);
> +
>  #ifdef CONFIG_X86
>         /* No delay is needed if we are in guest */
>         if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
>                 return;
>  #endif
> -       /* Dummy wait op - must do something useless after P_LVL2 read
> -          because chipsets cannot guarantee that STPCLK# signal
> -          gets asserted in time to freeze execution properly. */
> +       /*
> +        * Dummy wait op - must do something useless after P_LVL2 read
> +        * because chipsets cannot guarantee that STPCLK# signal
> +        * gets asserted in time to freeze execution properly.
> +        */
>         inl(acpi_gbl_FADT.xpm_timer_block.address);
>  }
>
> @@ -553,9 +558,7 @@ static void __cpuidle acpi_idle_do_entry
>         } else if (cx->entry_method == ACPI_CSTATE_HALT) {
>                 acpi_safe_halt();
>         } else {
> -               /* IO port based C-state */
> -               inb(cx->address);
> -               wait_for_freeze();
> +               io_idle(cx->address);
>         }
>
>         perf_lopwr_cb(false);
> @@ -577,8 +580,7 @@ static int acpi_idle_play_dead(struct cp
>                 if (cx->entry_method == ACPI_CSTATE_HALT)
>                         safe_halt();
>                 else if (cx->entry_method == ACPI_CSTATE_SYSTEMIO) {
> -                       inb(cx->address);
> -                       wait_for_freeze();
> +                       io_idle(cx->address);
>                 } else
>                         return -ENODEV;
>
>
>

Reply via email to