lkml.org 
[lkml]   [2023]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: sched/core] cpuidle,arch: Mark all regular cpuidle_state:: Enter methods __cpuidle
    The following commit has been merged into the sched/core branch of tip:

    Commit-ID: 26388a7c353f7b1d3fd8a6df6452fa9773193155
    Gitweb: https://git.kernel.org/tip/26388a7c353f7b1d3fd8a6df6452fa9773193155
    Author: Peter Zijlstra <peterz@infradead.org>
    AuthorDate: Thu, 12 Jan 2023 20:44:03 +01:00
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitterDate: Fri, 13 Jan 2023 11:48:18 +01:00

    cpuidle,arch: Mark all regular cpuidle_state:: Enter methods __cpuidle

    For all cpuidle drivers that do not use CPUIDLE_FLAG_RCU_IDLE (iow,
    the simple ones) make sure all the functions are marked __cpuidle.

    ( due to lack of noinstr validation on these platforms it is entirely
    possible this isn't complete )

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Link: https://lore.kernel.org/r/20230112195542.335211484@infradead.org
    ---
    arch/arm/kernel/cpuidle.c | 4 ++--
    arch/arm/mach-davinci/cpuidle.c | 4 ++--
    arch/arm/mach-imx/cpuidle-imx5.c | 4 ++--
    arch/arm/mach-imx/cpuidle-imx6sl.c | 4 ++--
    arch/arm/mach-imx/cpuidle-imx7ulp.c | 4 ++--
    arch/arm/mach-s3c/cpuidle-s3c64xx.c | 5 ++---
    arch/mips/kernel/idle.c | 6 +++---
    7 files changed, 15 insertions(+), 16 deletions(-)

    diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
    index e168462..437ff39 100644
    --- a/arch/arm/kernel/cpuidle.c
    +++ b/arch/arm/kernel/cpuidle.c
    @@ -26,8 +26,8 @@ static struct cpuidle_ops cpuidle_ops[NR_CPUS] __ro_after_init;
    *
    * Returns the index passed as parameter
    */
    -int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
    - struct cpuidle_driver *drv, int index)
    +__cpuidle int arm_cpuidle_simple_enter(struct cpuidle_device *dev, struct
    + cpuidle_driver *drv, int index)
    {
    cpu_do_idle();

    diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
    index dd38785..78a1575 100644
    --- a/arch/arm/mach-davinci/cpuidle.c
    +++ b/arch/arm/mach-davinci/cpuidle.c
    @@ -44,8 +44,8 @@ static void davinci_save_ddr_power(int enter, bool pdown)
    }

    /* Actual code that puts the SoC in different idle states */
    -static int davinci_enter_idle(struct cpuidle_device *dev,
    - struct cpuidle_driver *drv, int index)
    +static __cpuidle int davinci_enter_idle(struct cpuidle_device *dev,
    + struct cpuidle_driver *drv, int index)
    {
    davinci_save_ddr_power(1, ddr2_pdown);
    cpu_do_idle();
    diff --git a/arch/arm/mach-imx/cpuidle-imx5.c b/arch/arm/mach-imx/cpuidle-imx5.c
    index a8457c4..5ad9f2f 100644
    --- a/arch/arm/mach-imx/cpuidle-imx5.c
    +++ b/arch/arm/mach-imx/cpuidle-imx5.c
    @@ -8,8 +8,8 @@
    #include <asm/system_misc.h>
    #include "cpuidle.h"

    -static int imx5_cpuidle_enter(struct cpuidle_device *dev,
    - struct cpuidle_driver *drv, int index)
    +static __cpuidle int imx5_cpuidle_enter(struct cpuidle_device *dev,
    + struct cpuidle_driver *drv, int index)
    {
    arm_pm_idle();
    return index;
    diff --git a/arch/arm/mach-imx/cpuidle-imx6sl.c b/arch/arm/mach-imx/cpuidle-imx6sl.c
    index b86ffbe..b49cd63 100644
    --- a/arch/arm/mach-imx/cpuidle-imx6sl.c
    +++ b/arch/arm/mach-imx/cpuidle-imx6sl.c
    @@ -11,8 +11,8 @@
    #include "common.h"
    #include "cpuidle.h"

    -static int imx6sl_enter_wait(struct cpuidle_device *dev,
    - struct cpuidle_driver *drv, int index)
    +static __cpuidle int imx6sl_enter_wait(struct cpuidle_device *dev,
    + struct cpuidle_driver *drv, int index)
    {
    imx6_set_lpm(WAIT_UNCLOCKED);
    /*
    diff --git a/arch/arm/mach-imx/cpuidle-imx7ulp.c b/arch/arm/mach-imx/cpuidle-imx7ulp.c
    index ca86c96..f55ed74 100644
    --- a/arch/arm/mach-imx/cpuidle-imx7ulp.c
    +++ b/arch/arm/mach-imx/cpuidle-imx7ulp.c
    @@ -12,8 +12,8 @@
    #include "common.h"
    #include "cpuidle.h"

    -static int imx7ulp_enter_wait(struct cpuidle_device *dev,
    - struct cpuidle_driver *drv, int index)
    +static __cpuidle int imx7ulp_enter_wait(struct cpuidle_device *dev,
    + struct cpuidle_driver *drv, int index)
    {
    if (index == 1)
    imx7ulp_set_lpm(ULP_PM_WAIT);
    diff --git a/arch/arm/mach-s3c/cpuidle-s3c64xx.c b/arch/arm/mach-s3c/cpuidle-s3c64xx.c
    index b1c5f43..27a13cc 100644
    --- a/arch/arm/mach-s3c/cpuidle-s3c64xx.c
    +++ b/arch/arm/mach-s3c/cpuidle-s3c64xx.c
    @@ -19,9 +19,8 @@
    #include "regs-sys-s3c64xx.h"
    #include "regs-syscon-power-s3c64xx.h"

    -static int s3c64xx_enter_idle(struct cpuidle_device *dev,
    - struct cpuidle_driver *drv,
    - int index)
    +static __cpuidle int s3c64xx_enter_idle(struct cpuidle_device *dev,
    + struct cpuidle_driver *drv, int index)
    {
    unsigned long tmp;

    diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c
    index 3e7ccdd..5abc8b7 100644
    --- a/arch/mips/kernel/idle.c
    +++ b/arch/mips/kernel/idle.c
    @@ -241,7 +241,7 @@ void __init check_wait(void)
    }
    }

    -void arch_cpu_idle(void)
    +__cpuidle void arch_cpu_idle(void)
    {
    if (cpu_wait)
    cpu_wait();
    @@ -249,8 +249,8 @@ void arch_cpu_idle(void)

    #ifdef CONFIG_CPU_IDLE

    -int mips_cpuidle_wait_enter(struct cpuidle_device *dev,
    - struct cpuidle_driver *drv, int index)
    +__cpuidle int mips_cpuidle_wait_enter(struct cpuidle_device *dev,
    + struct cpuidle_driver *drv, int index)
    {
    arch_cpu_idle();
    return index;
    \
     
     \ /
      Last update: 2023-03-26 23:39    [W:4.027 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site