diff mbox series

[tip:,timers/core] clocksource: mips-gic-timer: Register as sched_clock

Message ID 159101709641.17951.17143096075240874128.tip-bot2@tip-bot2
State Not Applicable
Headers show
Series [tip:,timers/core] clocksource: mips-gic-timer: Register as sched_clock | expand

Commit Message

tip-bot2 for Serge Semin June 1, 2020, 1:11 p.m. UTC
The following commit has been merged into the timers/core branch of tip:

Commit-ID:     48016e78d328998b1f00bcfb639adeabca51abe5
Gitweb:        https://git.kernel.org/tip/48016e78d328998b1f00bcfb639adeabca51abe5
Author:        Paul Burton <paulburton@kernel.org>
AuthorDate:    Thu, 21 May 2020 23:48:16 +03:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Sat, 23 May 2020 00:03:08 +02:00

clocksource: mips-gic-timer: Register as sched_clock

The MIPS GIC timer is well suited for use as sched_clock, so register it
as such.

Whilst the existing gic_read_count() function matches the prototype
needed by sched_clock_register() already, we split it into 2 functions
in order to remove the need to evaluate the mips_cm_is64 condition
within each call since sched_clock should be as fast as possible.

Note the sched clock framework needs the clock source being stable in
order to rely on it. So we register the MIPS GIC timer as schedule clocks
only if it's, if either the system doesn't have CPU-frequency enabled or
the CPU frequency is changed by means of the CPC core clock divider
available on the platforms with CM3 or newer.

Signed-off-by: Paul Burton <paulburton@kernel.org>
Co-developed-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
[Sergey.Semin@baikalelectronics.ru: Register sched-clock if CM3 or !CPU-freq]
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-rtc@vger.kernel.org
Cc: devicetree@vger.kernel.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200521204818.25436-8-Sergey.Semin@baikalelectronics.ru
 drivers/clocksource/mips-gic-timer.c | 31 +++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 8b5f8ae..ef12c12 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -16,6 +16,7 @@ 
 #include <linux/notifier.h>
 #include <linux/of_irq.h>
 #include <linux/percpu.h>
+#include <linux/sched_clock.h>
 #include <linux/smp.h>
 #include <linux/time.h>
 #include <asm/mips-cps.h>
@@ -24,13 +25,10 @@  static DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device);
 static int gic_timer_irq;
 static unsigned int gic_frequency;
-static u64 notrace gic_read_count(void)
+static u64 notrace gic_read_count_2x32(void)
 	unsigned int hi, hi2, lo;
-	if (mips_cm_is64)
-		return read_gic_counter();
 	do {
 		hi = read_gic_counter_32h();
 		lo = read_gic_counter_32l();
@@ -40,6 +38,19 @@  static u64 notrace gic_read_count(void)
 	return (((u64) hi) << 32) + lo;
+static u64 notrace gic_read_count_64(void)
+	return read_gic_counter();
+static u64 notrace gic_read_count(void)
+	if (mips_cm_is64)
+		return gic_read_count_64();
+	return gic_read_count_2x32();
 static int gic_next_event(unsigned long delta, struct clock_event_device *evt)
 	int cpu = cpumask_first(evt->cpumask);
@@ -228,6 +239,18 @@  static int __init gic_clocksource_of_init(struct device_node *node)
 	/* And finally start the counter */
+	/*
+	 * It's safe to use the MIPS GIC timer as a sched clock source only if
+	 * its ticks are stable, which is true on either the platforms with
+	 * stable CPU frequency or on the platforms with CM3 and CPU frequency
+	 * change performed by the CPC core clocks divider.
+	 */
+	if (mips_cm_revision() >= CM_REV_CM3 || !IS_ENABLED(CONFIG_CPU_FREQ)) {
+		sched_clock_register(mips_cm_is64 ?
+				     gic_read_count_64 : gic_read_count_2x32,
+				     64, gic_frequency);
+	}
 	return 0;
 TIMER_OF_DECLARE(mips_gic_timer, "mti,gic-timer",