57 lines
2.2 KiB
Diff
57 lines
2.2 KiB
Diff
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
|
Date: Wed, 20 Dec 2017 17:13:18 +0100
|
|
Subject: [PATCH 29/29] hrtimer: Implement SOFT/HARD clock base selection
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patches-4.14.15-rt13.tar.xz
|
|
|
|
All prerequisites to handle hrtimers for expiry in either hard or soft
|
|
interrupt context are in place.
|
|
|
|
Add the missing bit in hrtimer_init() which associates the timer to the
|
|
hard or the soft irq clock base.
|
|
|
|
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/time/hrtimer.c | 15 +++++++++++----
|
|
1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
--- a/kernel/time/hrtimer.c
|
|
+++ b/kernel/time/hrtimer.c
|
|
@@ -1222,8 +1222,9 @@ static inline int hrtimer_clockid_to_bas
|
|
static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
|
|
enum hrtimer_mode mode)
|
|
{
|
|
+ bool softtimer = !!(mode & HRTIMER_MODE_SOFT);
|
|
+ int base = softtimer ? HRTIMER_MAX_CLOCK_BASES / 2 : 0;
|
|
struct hrtimer_cpu_base *cpu_base;
|
|
- int base;
|
|
|
|
memset(timer, 0, sizeof(struct hrtimer));
|
|
|
|
@@ -1237,7 +1238,8 @@ static void __hrtimer_init(struct hrtime
|
|
if (clock_id == CLOCK_REALTIME && mode & HRTIMER_MODE_REL)
|
|
clock_id = CLOCK_MONOTONIC;
|
|
|
|
- base = hrtimer_clockid_to_base(clock_id);
|
|
+ base += hrtimer_clockid_to_base(clock_id);
|
|
+ timer->is_soft = softtimer;
|
|
timer->base = &cpu_base->clock_base[base];
|
|
timerqueue_init(&timer->node);
|
|
}
|
|
@@ -1246,8 +1248,13 @@ static void __hrtimer_init(struct hrtime
|
|
* hrtimer_init - initialize a timer to the given clock
|
|
* @timer: the timer to be initialized
|
|
* @clock_id: the clock to be used
|
|
- * @mode: timer mode: absolute (HRTIMER_MODE_ABS) or
|
|
- * relative (HRTIMER_MODE_REL); pinned is not considered here!
|
|
+ * @mode: The modes which are relevant for intitialization:
|
|
+ * HRTIMER_MODE_ABS, HRTIMER_MODE_REL, HRTIMER_MODE_ABS_SOFT,
|
|
+ * HRTIMER_MODE_REL_SOFT
|
|
+ *
|
|
+ * The PINNED variants of the above can be handed in,
|
|
+ * but the PINNED bit is ignored as pinning happens
|
|
+ * when the hrtimer is started
|
|
*/
|
|
void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
|
|
enum hrtimer_mode mode)
|