Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 70a08cca1227dc31c784ec930099a4417a06e7d0

Authored by John Stultz
1 parent 314ac37150
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

timers: Add CLOCK_BOOTTIME hrtimer base 

CLOCK_MONOTONIC stops while the system is in suspend. This is because
to applications system suspend is invisible. However, there is a
growing set of applications that are wanting to be suspend-aware,
but do not want to deal with the complications of CLOCK_REALTIME
(which might jump around if settimeofday is called).

For these applications, I propose a new clockid: CLOCK_BOOTTIME.
CLOCK_BOOTTIME is idential to CLOCK_MONOTONIC, except it also
includes any time spent in suspend.

This patch add hrtimer base for CLOCK_BOOTTIME, using
get_monotonic_boottime/ktime_get_boottime, to allow
in kernel users to set timers against.

CC: Jamie Lokier <jamie@shareable.org>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Alexander Shishkin <virtuoso@slind.org>
CC: Arve Hjønnevåg <arve@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>

Showing 3 changed files with 14 additions and 4 deletions Side-by-side Diff

include/linux/hrtimer.h
Diff comments   View file @ 70a08cc
... ... @@ -151,6 +151,7 @@
151 151 enum hrtimer_base_type {
152 152 HRTIMER_BASE_REALTIME,
153 153 HRTIMER_BASE_MONOTONIC,
  154 + HRTIMER_BASE_BOOTTIME,
154 155 HRTIMER_MAX_CLOCK_BASES,
155 156 };
156 157  
include/linux/time.h
Diff comments   View file @ 70a08cc
... ... @@ -293,6 +293,7 @@
293 293 #define CLOCK_MONOTONIC_RAW 4
294 294 #define CLOCK_REALTIME_COARSE 5
295 295 #define CLOCK_MONOTONIC_COARSE 6
  296 +#define CLOCK_BOOTTIME 7
296 297  
297 298 /*
298 299 * The IDs of various hardware clocks:
... ... @@ -73,6 +73,11 @@
73 73 .get_time = &ktime_get,
74 74 .resolution = KTIME_LOW_RES,
75 75 },
  76 + {
  77 + .index = CLOCK_BOOTTIME,
  78 + .get_time = &ktime_get_boottime,
  79 + .resolution = KTIME_LOW_RES,
  80 + },
76 81 }
77 82 };
78 83  
79 84  
80 85  
... ... @@ -90,16 +95,17 @@
90 95 */
91 96 static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)
92 97 {
93   - ktime_t xtim, tomono;
  98 + ktime_t xtim, mono, boot;
94 99 struct timespec xts, tom, slp;
95 100  
96 101 get_xtime_and_monotonic_and_sleep_offset(&xts, &tom, &slp);
97 102  
98 103 xtim = timespec_to_ktime(xts);
99   - tomono = timespec_to_ktime(tom);
  104 + mono = ktime_add(xtim, timespec_to_ktime(tom));
  105 + boot = ktime_add(mono, timespec_to_ktime(slp));
100 106 base->clock_base[HRTIMER_BASE_REALTIME].softirq_time = xtim;
101   - base->clock_base[HRTIMER_BASE_MONOTONIC].softirq_time =
102   - ktime_add(xtim, tomono);
  107 + base->clock_base[HRTIMER_BASE_MONOTONIC].softirq_time = mono;
  108 + base->clock_base[HRTIMER_BASE_BOOTTIME].softirq_time = boot;
103 109 }
104 110  
105 111 /*
... ... @@ -727,6 +733,7 @@
727 733 base->hres_active = 1;
728 734 base->clock_base[HRTIMER_BASE_REALTIME].resolution = KTIME_HIGH_RES;
729 735 base->clock_base[HRTIMER_BASE_MONOTONIC].resolution = KTIME_HIGH_RES;
  736 + base->clock_base[HRTIMER_BASE_BOOTTIME].resolution = KTIME_HIGH_RES;
730 737  
731 738 tick_setup_sched_timer();
732 739  
... ... @@ -1719,6 +1726,7 @@
1719 1726 {
1720 1727 hrtimer_clock_to_base_table[CLOCK_REALTIME] = HRTIMER_BASE_REALTIME;
1721 1728 hrtimer_clock_to_base_table[CLOCK_MONOTONIC] = HRTIMER_BASE_MONOTONIC;
  1729 + hrtimer_clock_to_base_table[CLOCK_BOOTTIME] = HRTIMER_BASE_BOOTTIME;
1722 1730  
1723 1731 hrtimer_cpu_notify(&hrtimers_nb, (unsigned long)CPU_UP_PREPARE,
1724 1732 (void *)(long)smp_processor_id());