lkml.org 
[lkml]   [2023]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 11/21] timers: Create helper function to forward timer base clk
    Date
    The logic for forwarding timer base clock is split into a separate function
    to make it accessible for other call sites.

    No functional change.

    Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
    Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
    ---
    v6: s/splitted/split
    v5: New patch to simplify next patch
    ---
    kernel/time/timer.c | 25 +++++++++++++++++--------
    1 file changed, 17 insertions(+), 8 deletions(-)

    diff --git a/kernel/time/timer.c b/kernel/time/timer.c
    index 749b1570bdcd..fcff03757641 100644
    --- a/kernel/time/timer.c
    +++ b/kernel/time/timer.c
    @@ -1956,6 +1956,21 @@ static unsigned long next_timer_interrupt(struct timer_base *base)
    return base->next_expiry;
    }

    +/*
    + * Forward base clock is done only when @basej is past base->clk, otherwise
    + * base-clk might be rewind.
    + */
    +static void forward_base_clk(struct timer_base *base, unsigned long nextevt,
    + unsigned long basej)
    +{
    + if (time_after(basej, base->clk)) {
    + if (time_after(nextevt, basej))
    + base->clk = basej;
    + else if (time_after(nextevt, base->clk))
    + base->clk = nextevt;
    + }
    +}
    +
    /**
    * get_next_timer_interrupt - return the time (clock mono) of the next timer
    * @basej: base time jiffies
    @@ -1987,15 +2002,9 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)

    /*
    * We have a fresh next event. Check whether we can forward the
    - * base. We can only do that when @basej is past base->clk
    - * otherwise we might rewind base->clk.
    + * base.
    */
    - if (time_after(basej, base->clk)) {
    - if (time_after(nextevt, basej))
    - base->clk = basej;
    - else if (time_after(nextevt, base->clk))
    - base->clk = nextevt;
    - }
    + forward_base_clk(base, nextevt, basej);

    /*
    * Base is idle if the next event is more than a tick away. Also
    --
    2.30.2
    \
     
     \ /
      Last update: 2023-05-24 09:09    [W:4.047 / U:0.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site