timer drivers for v5.4
Subsystems (12)
Hi Thomas,
The following changes since commit d48e0cd8fcaf314175a15d3076d7a1e71bd4e628:
timekeeping: Boot should be boottime for coarse ns accessor
(2019-06-25 08:54:51 +0200)
are available in the Git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git tags/timers-v5.4
for you to fetch changes up to a2e1bb44a35d84bc760a0553fb1e36fecc25a623:
Merge branch 'timers/drivers/davinci' into timers/drivers/next
(2019-06-26 16:24:33 +0200)
----------------------------------------------------------------
This version contains the following changes:
- Rewrite of the davinci timer resulting to an immutable branch to be shared with davinci platform specific tree (Bartosz Golaszewski)
- Cleanup and improvements of the tegra timer (Dmitry Osipenko)
- Add new nxp system counter timer (Bai Ping)
- Increase priority for exynos_mct to take over the initialization of the IP the arch ARM timer depends on (Marek Szyprowski)
- Change macro use _BITUL() by BIT() on arc timer (Masahiro Yamada)
- Implement the delay timer on ixp4xx (Linus Walleij)
- Add the SPDX license identifier on the meson timer (Neil Armstrong)
----------------------------------------------------------------
Andrew Murray (1):
clocksource/drivers/arm_arch_timer: Extract elf_hwcap use to
arch-helper
Bai Ping (1):
clocksource/drivers/sysctr: Add nxp system counter timer driver
support
Bartosz Golaszewski (2):
clocksource/drivers/davinci: Add support for clockevents clocksource/drivers/davinci: Add support for clocksource
Daniel Lezcano (1):
Merge branch 'timers/drivers/davinci' into timers/drivers/next
Dmitry Osipenko (17):
clocksource/drivers/tegra: Support per-CPU timers on all Tegra's clocksource/drivers/tegra: Unify timer code clocksource/drivers/tegra: Reset hardware state on init clocksource/drivers/tegra: Replace readl/writel with relaxed versions clocksource/drivers/tegra: Release all IRQ's on request_irq() error clocksource/drivers/tegra: Minor code clean up clocksource/drivers/tegra: Support COMPILE_TEST universally clocksource/drivers/tegra: Lower clocksource rating for some Tegra's clocksource/drivers/tegra: Rename timer-tegra20.c to timer-tegra.c clocksource/drivers/tegra: Restore timer rate on Tegra210 clocksource/drivers/tegra: Remove duplicated use of per_cpu_ptr clocksource/drivers/tegra: Set and use timer's period clocksource/drivers/tegra: Drop unneeded typecasting in one place clocksource/drivers/tegra: Add verbose definition for 1MHz constant clocksource/drivers/tegra: Restore base address before cleanup clocksource/drivers/tegra: Cycles can't be 0 clocksource/drivers/tegra: Set up maximum-ticks limit properly
Linus Walleij (1):
clocksource/drivers/ixp4xx: Implement delay timer
Marek Szyprowski (1):
clocksource/drivers/exynos_mct: Increase priority over ARM arch timer
Masahiro Yamada (1):
clocksource/drivers/arc_timer: Use BIT() instead of _BITUL()
Neil Armstrong (1):
clocksource/drivers/timer-meson6: Update with SPDX Licence identifier
.../devicetree/bindings/timer/nxp,sysctr-timer.txt | 25 ++ arch/arm/include/asm/arch_timer.h | 10 + arch/arm64/include/asm/arch_timer.h | 13 + drivers/clocksource/Kconfig | 14 +- drivers/clocksource/Makefile | 4 +- drivers/clocksource/arc_timer.c | 3 +- drivers/clocksource/arm_arch_timer.c | 15 +- drivers/clocksource/exynos_mct.c | 4 +- drivers/clocksource/timer-davinci.c | 369 ++++++++++++++++++ drivers/clocksource/timer-imx-sysctr.c | 145 +++++++ drivers/clocksource/timer-ixp4xx.c | 16 +- drivers/clocksource/timer-meson6.c | 5 +- drivers/clocksource/timer-tegra.c | 416 +++++++++++++++++++++ drivers/clocksource/timer-tegra20.c | 379 ------------------- include/clocksource/timer-davinci.h | 44 +++ include/linux/cpuhotplug.h | 2 +- 16 files changed, 1060 insertions(+), 404 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/nxp,sysctr-timer.txt create mode 100644 drivers/clocksource/timer-davinci.c create mode 100644 drivers/clocksource/timer-imx-sysctr.c create mode 100644 drivers/clocksource/timer-tegra.c delete mode 100644 drivers/clocksource/timer-tegra20.c create mode 100644 include/clocksource/timer-davinci.h
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH 1/25 clocksource/drivers/timer-meson6: Update with SPDX Licence identifier
From: Neil Armstrong <[email protected]>
Comply with the licensing rules defined in the documentation.
--- drivers/clocksource/timer-meson6.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/clocksource/timer-meson6.c +1 -4
@@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Amlogic Meson6 SoCs timer handling. * * Copyright (C) 2014 Carlo Caione <[email protected]> * * Based on code from Amlogic, Inc -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. */ #include <linux/bitfield.h>
Signature · 1 line
2.17.1
PATCH 2/25 clocksource/drivers/ixp4xx: Implement delay timer
From: Linus Walleij <[email protected]>
This adds delay timer functionality to the IXP4xx
timer driver.
--- drivers/clocksource/timer-ixp4xx.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/clocksource/timer-ixp4xx.c +14 -2
@@ -75,14 +75,19 @@ to_ixp4xx_timer(struct clock_event_device *evt) return container_of(evt, struct ixp4xx_timer, clkevt); } -static u64 notrace ixp4xx_read_sched_clock(void) +static unsigned long ixp4xx_read_timer (void ) {return __raw_readl (local_ixp4xx_timer->base +IXP4XX_OSTS_OFFSET ); } +static u64 notrace ixp4xx_read_sched_clock(void) +{ +return ixp4xx_read_timer (); +} +static u64 ixp4xx_clocksource_read (struct clocksource *c) { -return __raw_readl (local_ixp4xx_timer->base +IXP4XX_OSTS_OFFSET ); +return ixp4xx_read_timer (); }static irqreturn_t ixp4xx_timer_interrupt (int irq,void *dev_id)
@@ -224,6 +229,13 @@ static __init int ixp4xx_timer_register(void __iomem *base,sched_clock_register (ixp4xx_read_sched_clock,32 , timer_freq); +#ifdef CONFIG_ARM +/* Also use this timer for delays */ + tmr->delay_timer.read_current_timer = ixp4xx_read_timer; + tmr->delay_timer.freq = timer_freq; +register_current_timer_delay (&tmr->delay_timer); +#endif +return 0 ; }
Signature · 1 line
2.17.1
PATCH 3/25 clocksource/drivers/arc_timer: Use BIT() instead of _BITUL()
In reply to Daniel LezcanoFrom: Masahiro Yamada <[email protected]>
This is in-kernel C code, so there is no reason to use _BITUL(). Replace it with equivalent BIT().
I added #include <linux/bits.h> explicitly although it has been included by other headers eventually.
--- drivers/clocksource/arc_timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clocksource/arc_timer.c +2 -1
@@ -16,6 +16,7 @@*/ #include <linux/interrupt.h> +#include <linux/bits.h> #include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clocksource.h>
@@ -142,7 +143,7 @@ static u64 arc_read_rtc(struct clocksource *cs) l =read_aux_reg (AUX_RTC_LOW ); h =read_aux_reg (AUX_RTC_HIGH ); status =read_aux_reg (AUX_RTC_CTRL ); - }while (!(status &_BITUL (31 ))); + }while (!(status &BIT (31 )));return (((u64 )h) <<32 ) | l; }
Signature · 1 line
2.17.1
PATCH 4/25 clocksource/drivers/exynos_mct: Increase priority over ARM arch timer
In reply to Daniel LezcanoFrom: Marek Szyprowski <[email protected]>
Exynos SoCs based on CA7/CA15 have 2 timer interfaces: custom Exynos MCT (Multi Core Timer) and standard ARM Architected Timers.
There are use cases, where both timer interfaces are used simultanously. One of such examples is using Exynos MCT for the main system timer and ARM Architected Timers for the KVM and virtualized guests (KVM requires arch timers).
Exynos Multi-Core Timer driver (exynos_mct) must be however started before ARM Architected Timers (arch_timer), because they both share some common hardware blocks (global system counter) and turning on MCT is needed to get ARM Architected Timer working properly.
To ensure selecting Exynos MCT as the main system timer, increase MCT timer rating. To ensure proper starting order of both timers during suspend/resume cycle, increase MCT hotplug priority over ARM Archictected Timers.
--- drivers/clocksource/exynos_mct.c | 4 ++-- include/linux/cpuhotplug.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/clocksource/exynos_mct.c +2 -2
@@ -209,7 +209,7 @@ static void exynos4_frc_resume(struct clocksource *cs)static struct clocksource mct_frc = { .name ="mct-frc" , - .rating =400 , + .rating =450 ,/* use value higher than ARM arch timer */ .read = exynos4_frc_read, .mask =CLOCKSOURCE_MASK (32 ), .flags =CLOCK_SOURCE_IS_CONTINUOUS ,
@@ -464,7 +464,7 @@ static int exynos4_mct_starting_cpu(unsigned int cpu) evt->set_state_oneshot_stopped = set_state_shutdown; evt->tick_resume = set_state_shutdown; evt->features =CLOCK_EVT_FEAT_PERIODIC |CLOCK_EVT_FEAT_ONESHOT ; - evt->rating =450 ; + evt->rating =500 ;/* use value higher than ARM arch timer */ exynos4_mct_write (TICK_BASE_CNT , mevt->base +MCT_L_TCNTB_OFFSET );
include/linux/cpuhotplug.h +1 -1
@@ -116,10 +116,10 @@ enum cpuhp_state {CPUHP_AP_PERF_ARM_ACPI_STARTING ,CPUHP_AP_PERF_ARM_STARTING ,CPUHP_AP_ARM_L2X0_STARTING , +CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING ,CPUHP_AP_ARM_ARCH_TIMER_STARTING ,CPUHP_AP_ARM_GLOBAL_TIMER_STARTING ,CPUHP_AP_JCORE_TIMER_STARTING , -CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING ,CPUHP_AP_ARM_TWD_STARTING ,CPUHP_AP_QCOM_TIMER_STARTING , CPUHP_AP_TEGRA_TIMER_STARTING,
Signature · 1 line
2.17.1
PATCH 5/25 clocksource/drivers/tegra: Support per-CPU timers on all Tegra's
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Assign TMR1-4 per-CPU core on 32bit Tegra's in a way it is done for Tegra210. In a result each core can handle its own timer events, less code is unique to ARM64 and Tegra's clock events driver now has higher rating on all Tegra's, replacing the ARM's TWD timer which isn't very accurate due to the clock rate jitter caused by CPU frequency scaling.
--- drivers/clocksource/timer-tegra20.c | 120 ++++++++++------------------ 1 file changed, 43 insertions(+), 77 deletions(-)
drivers/clocksource/timer-tegra20.c +43 -77
@@ -40,13 +40,18 @@#define TIMER_PCR_INTR_CLR BIT(30)#ifdef CONFIG_ARM -#define TIMER_CPU0 0x50/* TIMER3 */ +#define TIMER_CPU0 0x00/* TIMER1 */ +#define TIMER_CPU2 0x50/* TIMER3 */ +#define TIMER1_IRQ_IDX 0 +#define IRQ_IDX_FOR_CPU (cpu) (TIMER1_IRQ_IDX + cpu) +#define TIMER_BASE_FOR_CPU (cpu) \ + (((cpu) & 1) * 8 + ((cpu) < 2 ? TIMER_CPU0 : TIMER_CPU2))#else #define TIMER_CPU0 0x90/* TIMER10 */ #define TIMER10_IRQ_IDX 10#define IRQ_IDX_FOR_CPU (cpu) (TIMER10_IRQ_IDX + cpu) -#endif #define TIMER_BASE_FOR_CPU (cpu) (TIMER_CPU0 + (cpu) * 8) +#endif static u32 usec_config;static void __iomem *timer_reg_base;
@@ -109,7 +114,6 @@ static void tegra_timer_resume(struct clock_event_device *evt)writel (usec_config, timer_reg_base +TIMERUS_USEC_CFG ); } -#ifdef CONFIG_ARM64 static DEFINE_PER_CPU(struct timer_of, tegra_to) = { .flags =TIMER_OF_CLOCK |TIMER_OF_BASE ,
@@ -150,33 +154,8 @@ static int tegra_timer_stop(unsigned int cpu)return 0 ; } -#else /* CONFIG_ARM */ -static struct timer_of tegra_to = { - .flags =TIMER_OF_CLOCK |TIMER_OF_BASE |TIMER_OF_IRQ , - - .clkevt = { - .name ="tegra_timer" , - .rating =300 , - .features =CLOCK_EVT_FEAT_ONESHOT | -CLOCK_EVT_FEAT_PERIODIC | -CLOCK_EVT_FEAT_DYNIRQ , - .set_next_event = tegra_timer_set_next_event, - .set_state_shutdown = tegra_timer_shutdown, - .set_state_periodic = tegra_timer_set_periodic, - .set_state_oneshot = tegra_timer_shutdown, - .tick_resume = tegra_timer_shutdown, - .suspend = tegra_timer_suspend, - .resume = tegra_timer_resume, - .cpumask = cpu_possible_mask, - }, - - .of_irq = { - .index =2 , - .flags =IRQF_TIMER |IRQF_TRIGGER_HIGH , - .handler = tegra_timer_isr, - }, -}; +#ifdef CONFIG_ARM static u64 notrace tegra_read_sched_clock(void) {return readl (timer_reg_base +TIMERUS_CNTR_1US );
@@ -213,10 +192,12 @@ static struct clocksource suspend_rtc_clocksource = { };#endif -static int tegra_timer_common_init (struct device_node *np,struct timer_of *to) +static int tegra_init_timer (struct device_node *np,bool tegra20) { -int ret =0 ; +struct timer_of *to; +int cpu, ret; + to =this_cpu_ptr (&tegra_to); ret =timer_of_init (np, to);if (ret <0 ) goto out;
@@ -258,29 +239,19 @@ static int tegra_timer_common_init(struct device_node *np, struct timer_of *to) goto out; } -writel (usec_config,timer_of_base (to) +TIMERUS_USEC_CFG ); - -out: -return ret; -} - -#ifdef CONFIG_ARM64 -static int __init tegra_init_timer (struct device_node *np) -{ -int cpu, ret =0 ; -struct timer_of *to; - - to =this_cpu_ptr (&tegra_to); - ret =tegra_timer_common_init (np, to); -if (ret <0 ) - goto out; +writel (usec_config, timer_reg_base +TIMERUS_USEC_CFG );for_each_possible_cpu (cpu) { -struct timer_of *cpu_to; +struct timer_of *cpu_to =per_cpu_ptr (&tegra_to, cpu); + +/* +* TIMER1-9 are fixed to 1MHz, TIMER10-13 are running off the +* parent clock. +*/ +if (tegra20) + cpu_to->of_clk.rate =1000000 ; - cpu_to =per_cpu_ptr (&tegra_to, cpu); cpu_to->of_base.base = timer_reg_base +TIMER_BASE_FOR_CPU (cpu); - cpu_to->of_clk.rate =timer_of_rate (to); cpu_to->clkevt.cpumask =cpumask_of (cpu); cpu_to->clkevt.irq =irq_of_parse_and_map (np,IRQ_IDX_FOR_CPU (cpu));
@@ -322,43 +293,39 @@ static int __init tegra_init_timer(struct device_node *np)timer_of_cleanup (to);return ret; } + +#ifdef CONFIG_ARM64 +static int __init tegra210_init_timer (struct device_node *np) +{ +return tegra_init_timer (np, false); +} +TIMER_OF_DECLARE (tegra210_timer,"nvidia,tegra210-timer" , tegra210_init_timer);#else /* CONFIG_ARM */ -static int __init tegra_init_timer (struct device_node *np) +static int __init tegra20_init_timer (struct device_node *np) { -int ret =0 ; +struct timer_of *to; +int err; - ret =tegra_timer_common_init (np, &tegra_to); -if (ret <0 ) - goto out; + err =tegra_init_timer (np, true); +if (err) +return err; - tegra_to.of_base.base = timer_reg_base +TIMER_BASE_FOR_CPU (0 ); - tegra_to.of_clk.rate =1000000 ;/* microsecond timer */ + to =this_cpu_ptr (&tegra_to);sched_clock_register (tegra_read_sched_clock,32 , -timer_of_rate (&tegra_to)); - ret =clocksource_mmio_init (timer_reg_base +TIMERUS_CNTR_1US , -"timer_us" ,timer_of_rate (&tegra_to), +timer_of_rate (to)); + err =clocksource_mmio_init (timer_reg_base +TIMERUS_CNTR_1US , +"timer_us" ,timer_of_rate (to),300 ,32 , clocksource_mmio_readl_up); -if (ret) { -pr_err ("Failed to register clocksource\n" ); - goto out; - } +if (err) +pr_err ("Failed to register clocksource: %d\n" , err); tegra_delay_timer.read_current_timer = tegra_delay_timer_read_counter_long; - tegra_delay_timer.freq =timer_of_rate (&tegra_to); + tegra_delay_timer.freq =timer_of_rate (to);register_current_timer_delay (&tegra_delay_timer); -clockevents_config_and_register (&tegra_to.clkevt, -timer_of_rate (&tegra_to), -0x1 , -0x1fffffff ); - -return ret; -out: -timer_of_cleanup (&tegra_to); - -return ret; +return 0 ; }static int __init tegra20_init_rtc (struct device_node *np)
@@ -374,6 +341,5 @@ static int __init tegra20_init_rtc(struct device_node *np) return 0; }TIMER_OF_DECLARE (tegra20_rtc,"nvidia,tegra20-rtc" , tegra20_init_rtc); +TIMER_OF_DECLARE (tegra20_timer,"nvidia,tegra20-timer" , tegra20_init_timer);#endif -TIMER_OF_DECLARE (tegra210_timer,"nvidia,tegra210-timer" , tegra_init_timer); -TIMER_OF_DECLARE (tegra20_timer,"nvidia,tegra20-timer" , tegra_init_timer);
Signature · 1 line
2.17.1
PATCH 6/25 clocksource/drivers/tegra: Unify timer code
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Tegra132 is 64bit platform and it has the tegra20-timer hardware unit. Right now the corresponding timer code isn't compiled for ARM64, remove ifdef'iness from the code and compile tegra20-timer for both 32 and 64 bit platforms. Also note that like the older generations, Tegra210 has the microseconds counter, hence the timer_us clocksource is now made available for Tegra210 as well.
--- drivers/clocksource/timer-tegra20.c | 111 +++++++++++++++------------- 1 file changed, 60 insertions(+), 51 deletions(-)
drivers/clocksource/timer-tegra20.c +60 -51
@@ -21,10 +21,6 @@#include "timer-of.h" -#ifdef CONFIG_ARM -#include <asm/mach/time.h> -#endif -#define RTC_SECONDS 0x08#define RTC_SHADOW_SECONDS 0x0c#define RTC_MILLISECONDS 0x10
@@ -39,25 +35,17 @@#define TIMER_PCR 0x4#define TIMER_PCR_INTR_CLR BIT(30) -#ifdef CONFIG_ARM -#define TIMER_CPU0 0x00/* TIMER1 */ -#define TIMER_CPU2 0x50/* TIMER3 */ +#define TIMER1_BASE 0x00 +#define TIMER2_BASE 0x08 +#define TIMER3_BASE 0x50 +#define TIMER4_BASE 0x58 +#define TIMER10_BASE 0x90 +#define TIMER1_IRQ_IDX 0 -#define IRQ_IDX_FOR_CPU (cpu) (TIMER1_IRQ_IDX + cpu) -#define TIMER_BASE_FOR_CPU (cpu) \ - (((cpu) & 1) * 8 + ((cpu) < 2 ? TIMER_CPU0 : TIMER_CPU2)) -#else -#define TIMER_CPU0 0x90/* TIMER10 */ #define TIMER10_IRQ_IDX 10 -#define IRQ_IDX_FOR_CPU (cpu) (TIMER10_IRQ_IDX + cpu) -#define TIMER_BASE_FOR_CPU (cpu) (TIMER_CPU0 + (cpu) * 8) -#endif static u32 usec_config;static void __iomem *timer_reg_base; -#ifdef CONFIG_ARM -static struct delay_timer tegra_delay_timer; -#endif static int tegra_timer_set_next_event (unsigned long cycles,struct clock_event_device *evt)
@@ -155,17 +143,23 @@ static int tegra_timer_stop(unsigned int cpu)return 0 ; } -#ifdef CONFIG_ARM static u64 notrace tegra_read_sched_clock(void) {return readl (timer_reg_base +TIMERUS_CNTR_1US ); } +#ifdef CONFIG_ARM static unsigned long tegra_delay_timer_read_counter_long (void ) {return readl (timer_reg_base +TIMERUS_CNTR_1US ); } +static struct delay_timer tegra_delay_timer = { + .read_current_timer = tegra_delay_timer_read_counter_long, + .freq =1000000 , +}; +#endif +static struct timer_of suspend_rtc_to = { .flags =TIMER_OF_BASE |TIMER_OF_CLOCK , };
@@ -190,9 +184,34 @@ static struct clocksource suspend_rtc_clocksource = { .mask = CLOCKSOURCE_MASK(32), .flags = CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_SUSPEND_NONSTOP, }; -#endif -static int tegra_init_timer (struct device_node *np,bool tegra20) +static inline unsigned int tegra_base_for_cpu (int cpu,bool tegra20) +{ +if (tegra20) { +switch (cpu) { +case 0 : +return TIMER1_BASE ; +case 1 : +return TIMER2_BASE ; +case 2 : +return TIMER3_BASE ; +default : +return TIMER4_BASE ; + } + } + +return TIMER10_BASE + cpu *8 ; +} + +static inline unsigned int tegra_irq_idx_for_cpu (int cpu,bool tegra20) +{ +if (tegra20) +return TIMER1_IRQ_IDX + cpu; + +return TIMER10_IRQ_IDX + cpu; +} + +static int __init tegra_init_timer (struct device_node *np,bool tegra20) {struct timer_of *to;int cpu, ret;
@@ -243,6 +262,8 @@ static int tegra_init_timer(struct device_node *np, bool tegra20)for_each_possible_cpu (cpu) {struct timer_of *cpu_to =per_cpu_ptr (&tegra_to, cpu); +unsigned int base =tegra_base_for_cpu (cpu, tegra20); +unsigned int idx =tegra_irq_idx_for_cpu (cpu, tegra20);/* * TIMER1-9 are fixed to 1MHz, TIMER10-13 are running off the
@@ -251,10 +272,10 @@ static int tegra_init_timer(struct device_node *np, bool tegra20)if (tegra20) cpu_to->of_clk.rate =1000000 ; - cpu_to->of_base.base = timer_reg_base +TIMER_BASE_FOR_CPU (cpu); + cpu_to =per_cpu_ptr (&tegra_to, cpu); + cpu_to->of_base.base = timer_reg_base + base; cpu_to->clkevt.cpumask =cpumask_of (cpu); - cpu_to->clkevt.irq = -irq_of_parse_and_map (np,IRQ_IDX_FOR_CPU (cpu)); + cpu_to->clkevt.irq =irq_of_parse_and_map (np, idx);if (!cpu_to->clkevt.irq) {pr_err ("%s: can't map IRQ for CPU%d\n" , __func__, cpu);
@@ -274,6 +295,18 @@ static int tegra_init_timer(struct device_node *np, bool tegra20) } } +sched_clock_register (tegra_read_sched_clock,32 ,1000000 ); + + ret =clocksource_mmio_init (timer_reg_base +TIMERUS_CNTR_1US , +"timer_us" ,1000000 , +300 ,32 , clocksource_mmio_readl_up); +if (ret) +pr_err ("failed to register clocksource: %d\n" , ret); + +#ifdef CONFIG_ARM +register_current_timer_delay (&tegra_delay_timer); +#endif +cpuhp_setup_state (CPUHP_AP_TEGRA_TIMER_STARTING ,"AP_TEGRA_TIMER_STARTING" , tegra_timer_setup, tegra_timer_stop);
@@ -294,39 +327,17 @@ static int tegra_init_timer(struct device_node *np, bool tegra20)return ret; } -#ifdef CONFIG_ARM64 static int __init tegra210_init_timer (struct device_node *np) {return tegra_init_timer (np, false); }TIMER_OF_DECLARE (tegra210_timer,"nvidia,tegra210-timer" , tegra210_init_timer); -#else /* CONFIG_ARM */ +static int __init tegra20_init_timer (struct device_node *np) { -struct timer_of *to; -int err; - - err =tegra_init_timer (np, true); -if (err) -return err; - - to =this_cpu_ptr (&tegra_to); - -sched_clock_register (tegra_read_sched_clock,32 , -timer_of_rate (to)); - err =clocksource_mmio_init (timer_reg_base +TIMERUS_CNTR_1US , -"timer_us" ,timer_of_rate (to), -300 ,32 , clocksource_mmio_readl_up); -if (err) -pr_err ("Failed to register clocksource: %d\n" , err); - - tegra_delay_timer.read_current_timer = - tegra_delay_timer_read_counter_long; - tegra_delay_timer.freq =timer_of_rate (to); -register_current_timer_delay (&tegra_delay_timer); - -return 0 ; +return tegra_init_timer (np, true); } +TIMER_OF_DECLARE (tegra20_timer,"nvidia,tegra20-timer" , tegra20_init_timer);static int __init tegra20_init_rtc (struct device_node *np) {
@@ -341,5 +352,3 @@ static int __init tegra20_init_rtc(struct device_node *np)return 0 ; }TIMER_OF_DECLARE (tegra20_rtc,"nvidia,tegra20-rtc" , tegra20_init_rtc); -TIMER_OF_DECLARE (tegra20_timer,"nvidia,tegra20-timer" , tegra20_init_timer); -#endif
Signature · 1 line
2.17.1
PATCH 7/25 clocksource/drivers/tegra: Reset hardware state on init
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Reset timer's hardware state to ensure that initially it is in a predictable state.
--- drivers/clocksource/timer-tegra20.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clocksource/timer-tegra20.c +3 -0
@@ -123,6 +123,9 @@ static int tegra_timer_setup(unsigned int cpu) {struct timer_of *to =per_cpu_ptr (&tegra_to, cpu); +writel (0 ,timer_of_base (to) +TIMER_PTV ); +writel (TIMER_PCR_INTR_CLR ,timer_of_base (to) +TIMER_PCR ); +irq_force_affinity (to->clkevt.irq,cpumask_of (cpu));enable_irq (to->clkevt.irq);
Signature · 1 line
2.17.1
PATCH 8/25 clocksource/drivers/tegra: Replace readl/writel with relaxed versions
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
The readl/writel functions are inserting memory barrier to ensure that outstanding memory writes are completed, this results in L2 cache syncing being done on Tegra20 and Tegra30 which isn't a very cheap operation. Replace all readl/writel occurrences in the code with the relaxed versions since there is no need for the memory-access syncing.
--- drivers/clocksource/timer-tegra20.c | 35 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 17 deletions(-)
drivers/clocksource/timer-tegra20.c +18 -17
@@ -52,9 +52,9 @@ static int tegra_timer_set_next_event(unsigned long cycles, {void __iomem *reg_base =timer_of_base (to_timer_of (evt)); -writel (TIMER_PTV_EN | - ((cycles >1 ) ? (cycles -1 ) :0 ),/* n+1 scheme */ - reg_base +TIMER_PTV ); +writel_relaxed (TIMER_PTV_EN | + ((cycles >1 ) ? (cycles -1 ) :0 ),/* n+1 scheme */ + reg_base +TIMER_PTV );return 0 ; }
@@ -63,7 +63,7 @@ static int tegra_timer_shutdown(struct clock_event_device *evt) {void __iomem *reg_base =timer_of_base (to_timer_of (evt)); -writel (0 , reg_base +TIMER_PTV ); +writel_relaxed (0 , reg_base +TIMER_PTV );return 0 ; }
@@ -72,9 +72,9 @@ static int tegra_timer_set_periodic(struct clock_event_device *evt) {void __iomem *reg_base =timer_of_base (to_timer_of (evt)); -writel (TIMER_PTV_EN |TIMER_PTV_PER | - ((timer_of_rate (to_timer_of (evt)) /HZ ) -1 ), - reg_base +TIMER_PTV ); +writel_relaxed (TIMER_PTV_EN |TIMER_PTV_PER | + ((timer_of_rate (to_timer_of (evt)) /HZ ) -1 ), + reg_base +TIMER_PTV );return 0 ; }
@@ -84,7 +84,7 @@ static irqreturn_t tegra_timer_isr(int irq, void *dev_id)struct clock_event_device *evt = (struct clock_event_device *)dev_id;void __iomem *reg_base =timer_of_base (to_timer_of (evt)); -writel (TIMER_PCR_INTR_CLR , reg_base +TIMER_PCR ); +writel_relaxed (TIMER_PCR_INTR_CLR , reg_base +TIMER_PCR ); evt->event_handler (evt);return IRQ_HANDLED ;
@@ -94,12 +94,12 @@ static void tegra_timer_suspend(struct clock_event_device *evt) {void __iomem *reg_base =timer_of_base (to_timer_of (evt)); -writel (TIMER_PCR_INTR_CLR , reg_base +TIMER_PCR ); +writel_relaxed (TIMER_PCR_INTR_CLR , reg_base +TIMER_PCR ); }static void tegra_timer_resume (struct clock_event_device *evt) { -writel (usec_config, timer_reg_base +TIMERUS_USEC_CFG ); +writel_relaxed (usec_config, timer_reg_base +TIMERUS_USEC_CFG ); } static DEFINE_PER_CPU(struct timer_of, tegra_to) = {
@@ -123,8 +123,8 @@ static int tegra_timer_setup(unsigned int cpu) {struct timer_of *to =per_cpu_ptr (&tegra_to, cpu); -writel (0 ,timer_of_base (to) +TIMER_PTV ); -writel (TIMER_PCR_INTR_CLR ,timer_of_base (to) +TIMER_PCR ); +writel_relaxed (0 ,timer_of_base (to) +TIMER_PTV ); +writel_relaxed (TIMER_PCR_INTR_CLR ,timer_of_base (to) +TIMER_PCR );irq_force_affinity (to->clkevt.irq,cpumask_of (cpu));enable_irq (to->clkevt.irq);
@@ -148,13 +148,13 @@ static int tegra_timer_stop(unsigned int cpu) static u64 notrace tegra_read_sched_clock(void) { -return readl (timer_reg_base +TIMERUS_CNTR_1US ); +return readl_relaxed (timer_reg_base +TIMERUS_CNTR_1US ); }#ifdef CONFIG_ARM static unsigned long tegra_delay_timer_read_counter_long (void ) { -return readl (timer_reg_base +TIMERUS_CNTR_1US ); +return readl_relaxed (timer_reg_base +TIMERUS_CNTR_1US ); } static struct delay_timer tegra_delay_timer = {
@@ -175,8 +175,9 @@ static struct timer_of suspend_rtc_to = {*/ static u64 tegra_rtc_read_ms (struct clocksource *cs) { -u32 ms =readl (timer_of_base (&suspend_rtc_to) +RTC_MILLISECONDS ); -u32 s =readl (timer_of_base (&suspend_rtc_to) +RTC_SHADOW_SECONDS ); +void __iomem *reg_base =timer_of_base (&suspend_rtc_to); +u32 ms =readl_relaxed (reg_base +RTC_MILLISECONDS ); +u32 s =readl_relaxed (reg_base +RTC_SHADOW_SECONDS );return (u64 )s *MSEC_PER_SEC + ms; }
@@ -261,7 +262,7 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20) goto out; } -writel (usec_config, timer_reg_base +TIMERUS_USEC_CFG ); +writel_relaxed (usec_config, timer_reg_base +TIMERUS_USEC_CFG );for_each_possible_cpu (cpu) {struct timer_of *cpu_to =per_cpu_ptr (&tegra_to, cpu);
Signature · 1 line
2.17.1
PATCH 9/25 clocksource/drivers/tegra: Release all IRQ's on request_irq() error
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Release all requested IRQ's on the request error to properly clean up allocated resources.
--- drivers/clocksource/timer-tegra20.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clocksource/timer-tegra20.c +3 -2
@@ -284,7 +284,7 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20)pr_err ("%s: can't map IRQ for CPU%d\n" , __func__, cpu); ret = -EINVAL ; - goto out; + goto out_irq; }irq_set_status_flags (cpu_to->clkevt.irq,IRQ_NOAUTOEN );
@@ -294,7 +294,8 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20)if (ret) {pr_err ("%s: cannot setup irq %d for CPU%d\n" , __func__, cpu_to->clkevt.irq, cpu); - ret = -EINVAL ; +irq_dispose_mapping (cpu_to->clkevt.irq); + cpu_to->clkevt.irq =0 ; goto out_irq; } }
Signature · 1 line
2.17.1
PATCH 10/25 clocksource/drivers/tegra: Minor code clean up
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Correct typo and use proper upper casing for acronyms in the comments, use common style for error messages, prepend error messages with "tegra-timer:", add error message for cpuhp_setup_state() failure and clean up whitespaces in the code to fix checkpatch warnings.
--- drivers/clocksource/timer-tegra20.c | 43 ++++++++++++++++------------- 1 file changed, 24 insertions(+), 19 deletions(-)
drivers/clocksource/timer-tegra20.c +24 -19
@@ -6,6 +6,8 @@* Colin Cross <[email protected]> */ +#define pr_fmt (fmt) "tegra-timer: " fmt +#include <linux/clk.h> #include <linux/clockchips.h> #include <linux/cpu.h>
@@ -21,13 +23,13 @@#include "timer-of.h" -#define RTC_SECONDS 0x08 -#define RTC_SHADOW_SECONDS 0x0c -#define RTC_MILLISECONDS 0x10 +#define RTC_SECONDS 0x08 +#define RTC_SHADOW_SECONDS 0x0c +#define RTC_MILLISECONDS 0x10 -#define TIMERUS_CNTR_1US 0x10 -#define TIMERUS_USEC_CFG 0x14 -#define TIMERUS_CNTR_FREEZE 0x4c +#define TIMERUS_CNTR_1US 0x10 +#define TIMERUS_USEC_CFG 0x14 +#define TIMERUS_CNTR_FREEZE 0x4c#define TIMER_PTV 0x0#define TIMER_PTV_EN BIT(31)
@@ -48,7 +50,7 @@ static u32 usec_config;static void __iomem *timer_reg_base;static int tegra_timer_set_next_event (unsigned long cycles, -struct clock_event_device *evt) +struct clock_event_device *evt) {void __iomem *reg_base =timer_of_base (to_timer_of (evt));
@@ -169,15 +171,17 @@ static struct timer_of suspend_rtc_to = {/* * tegra_rtc_read - Reads the Tegra RTC registers -* Care must be taken that this funciton is not called while the +* Care must be taken that this function is not called while the * tegra_rtc driver could be executing to avoid race conditions * on the RTC shadow register */ static u64 tegra_rtc_read_ms (struct clocksource *cs) {void __iomem *reg_base =timer_of_base (&suspend_rtc_to); +u32 ms =readl_relaxed (reg_base +RTC_MILLISECONDS );u32 s =readl_relaxed (reg_base +RTC_SHADOW_SECONDS ); +return (u64 )s *MSEC_PER_SEC + ms; }
@@ -222,7 +226,7 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20) to =this_cpu_ptr (&tegra_to); ret =timer_of_init (np, to); -if (ret <0 ) +if (ret) goto out; timer_reg_base =timer_of_base (to);
@@ -281,8 +285,7 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20) cpu_to->clkevt.cpumask =cpumask_of (cpu); cpu_to->clkevt.irq =irq_of_parse_and_map (np, idx);if (!cpu_to->clkevt.irq) { -pr_err ("%s: can't map IRQ for CPU%d\n" , - __func__, cpu); +pr_err ("failed to map irq for cpu%d\n" , cpu); ret = -EINVAL ; goto out_irq; }
@@ -292,8 +295,8 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20)IRQF_TIMER |IRQF_NOBALANCING , cpu_to->clkevt.name, &cpu_to->clkevt);if (ret) { -pr_err ("%s: cannot setup irq %d for CPU%d\n" , - __func__, cpu_to->clkevt.irq, cpu); +pr_err ("failed to set up irq for cpu%d: %d\n" , + cpu, ret);irq_dispose_mapping (cpu_to->clkevt.irq); cpu_to->clkevt.irq =0 ; goto out_irq;
@@ -312,11 +315,14 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20)register_current_timer_delay (&tegra_delay_timer);#endif -cpuhp_setup_state (CPUHP_AP_TEGRA_TIMER_STARTING , -"AP_TEGRA_TIMER_STARTING" , tegra_timer_setup, - tegra_timer_stop); + ret =cpuhp_setup_state (CPUHP_AP_TEGRA_TIMER_STARTING , +"AP_TEGRA_TIMER_STARTING" , tegra_timer_setup, + tegra_timer_stop); +if (ret) +pr_err ("failed to set up cpu hp state: %d\n" , ret);return ret; + out_irq:for_each_possible_cpu (cpu) {struct timer_of *cpu_to;
@@ -329,6 +335,7 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20) } out:timer_of_cleanup (to); +return ret; }
@@ -352,8 +359,6 @@ static int __init tegra20_init_rtc(struct device_node *np)if (ret)return ret; -clocksource_register_hz (&suspend_rtc_clocksource,1000 ); - -return 0 ; +return clocksource_register_hz (&suspend_rtc_clocksource,1000 ); }TIMER_OF_DECLARE (tegra20_rtc,"nvidia,tegra20-rtc" , tegra20_init_rtc);
Signature · 1 line
2.17.1
PATCH 11/25 clocksource/drivers/tegra: Support COMPILE_TEST universally
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Remove build dependency on ARM for compile-testing to allow non-arch specific build-bots (like Intel's test robot) to compile the driver and report about problems.
--- drivers/clocksource/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/Kconfig +1 -1
@@ -140,7 +140,7 @@ config TEGRA_TIMER bool "Tegra timer driver" if COMPILE_TEST select CLKSRC_MMIO select TIMER_OF - depends on ARM || ARM64 + depends on ARCH_TEGRA || COMPILE_TEST help Enables support for the Tegra driver.
Signature · 1 line
2.17.1
PATCH 12/25 clocksource/drivers/tegra: Lower clocksource rating for some Tegra's
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Arch-timer is more preferable for a range of Tegra SoC generations as it has higher precision and is not affect by any kind of problems.
--- drivers/clocksource/timer-tegra20.c | 30 +++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
drivers/clocksource/timer-tegra20.c +26 -4
@@ -109,7 +109,6 @@ static DEFINE_PER_CPU(struct timer_of, tegra_to) = { .clkevt = { .name = "tegra_timer", - .rating = 460, .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC, .set_next_event = tegra_timer_set_next_event, .set_state_shutdown = tegra_timer_shutdown,
@@ -219,7 +218,8 @@ static inline unsigned int tegra_irq_idx_for_cpu(int cpu, bool tegra20)return TIMER10_IRQ_IDX + cpu; } -static int __init tegra_init_timer (struct device_node *np,bool tegra20) +static int __init tegra_init_timer (struct device_node *np,bool tegra20, +int rating) {struct timer_of *to;int cpu, ret;
@@ -282,6 +282,7 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20) cpu_to =per_cpu_ptr (&tegra_to, cpu); cpu_to->of_base.base = timer_reg_base + base; + cpu_to->clkevt.rating = rating; cpu_to->clkevt.cpumask =cpumask_of (cpu); cpu_to->clkevt.irq =irq_of_parse_and_map (np, idx);if (!cpu_to->clkevt.irq) {
@@ -341,13 +342,34 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20)static int __init tegra210_init_timer (struct device_node *np) { -return tegra_init_timer (np, false); +/* +* Arch-timer can't survive across power cycle of CPU core and +* after CPUPORESET signal due to a system design shortcoming, +* hence tegra-timer is more preferable on Tegra210. +*/ +return tegra_init_timer (np, false,460 ); }TIMER_OF_DECLARE (tegra210_timer,"nvidia,tegra210-timer" , tegra210_init_timer);static int __init tegra20_init_timer (struct device_node *np) { -return tegra_init_timer (np, true); +int rating; + +/* +* Tegra20 and Tegra30 have Cortex A9 CPU that has a TWD timer, +* that timer runs off the CPU clock and hence is subjected to +* a jitter caused by DVFS clock rate changes. Tegra-timer is +* more preferable for older Tegra's, while later SoC generations +* have arch-timer as a main per-CPU timer and it is not affected +* by DVFS changes. +*/ +if (of_machine_is_compatible ("nvidia,tegra20" ) || +of_machine_is_compatible ("nvidia,tegra30" )) + rating =460 ; +else + rating =330 ; + +return tegra_init_timer (np, true, rating); }TIMER_OF_DECLARE (tegra20_timer,"nvidia,tegra20-timer" , tegra20_init_timer);
Signature · 1 line
2.17.1
PATCH 13/25 clocksource/drivers/tegra: Rename timer-tegra20.c to timer-tegra.c
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Rename driver's source file to better reflect that it's not specific to older SoC generations.
---
drivers/clocksource/Makefile | 2 +-
drivers/clocksource/{timer-tegra20.c => timer-tegra.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/clocksource/{timer-tegra20.c => timer-tegra.c} (100%)drivers/clocksource/Makefile +1 -1
@@ -36,7 +36,7 @@ obj-$(CONFIG_U300_TIMER) += timer-u300.o obj-$(CONFIG_SUN4I_TIMER) += timer-sun4i.o obj-$(CONFIG_SUN5I_HSTIMER) += timer-sun5i.o obj-$(CONFIG_MESON6_TIMER) += timer-meson6.o -obj-$(CONFIG_TEGRA_TIMER) += timer-tegra20.o +obj-$(CONFIG_TEGRA_TIMER) += timer-tegra.o obj-$(CONFIG_VT8500_TIMER) += timer-vt8500.o obj-$(CONFIG_NSPIRE_TIMER) += timer-zevio.o obj-$(CONFIG_BCM_KONA_TIMER) += bcm_kona_timer.o
drivers/clocksource/timer-tegra.c renamed from drivers/clocksource/timer-tegra20.c +0 -0
Signature · 1 line
2.17.1
PATCH 14/25 clocksource/drivers/sysctr: Add nxp system counter timer driver support
In reply to Daniel LezcanoFrom: Bai Ping <[email protected]>
The system counter (sys_ctr) is a programmable system counter which provides a shared time base to the Cortex A15, A7, A53 etc cores. It is intended for use in applications where the counter is always powered on and supports multiple, unrelated clocks. The sys_ctr hardware supports:
- 56-bit counter width (roll-over time greater than 40 years)
- compare frame(64-bit compare value) contains programmable interrupt generation when compare value <= counter value.
[dlezcano] Fixed over 80 chars length warning
--- .../bindings/timer/nxp,sysctr-timer.txt | 25 +++ drivers/clocksource/Kconfig | 7 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-imx-sysctr.c | 145 ++++++++++++++++++ 4 files changed, 178 insertions(+) create mode 100644 Documentation/devicetree/bindings/timer/nxp,sysctr-timer.txt create mode 100644 drivers/clocksource/timer-imx-sysctr.c
Documentation/devicetree/bindings/timer/nxp,sysctr-timer.txt new file +25 -0
@@ -0,0 +1,25 @@ +NXP System Counter Module(sys_ctr) + +The system counter(sys_ctr) is a programmable system counter which provides +a shared time base to Cortex A15, A7, A53, A73, etc. it is intended for use in +applications where the counter is always powered and support multiple, +unrelated clocks. The compare frame inside can be used for timer purpose. + +Required properties: + +- compatible : should be "nxp,sysctr-timer" +- reg : Specifies the base physical address and size of the comapre + frame and the counter control, read & compare. +- interrupts : should be the first compare frames' interrupt +- clocks : Specifies the counter clock. +- clock-names: Specifies the clock's name of this module + +Example: + + system_counter: timer@306a0000 { + compatible = "nxp,sysctr-timer"; + reg = <0x306a0000 0x20000>;/* system-counter-rd & compare */ + clocks = <&clk_8m>; + clock-names = "per"; + interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; + };
drivers/clocksource/Kconfig +7 -0
@@ -617,6 +617,13 @@ config CLKSRC_IMX_TPM Enable this option to use IMX Timer/PWM Module (TPM) timer as clocksource. +config TIMER_IMX_SYS_CTR + bool "i.MX system counter timer" if COMPILE_TEST + select TIMER_OF + help + Enable this option to use i.MX system counter timer as a + clockevent. + config CLKSRC_ST_LPC bool "Low power clocksource found in the LPC" if COMPILE_TEST select TIMER_OF if OF
drivers/clocksource/Makefile +1 -0
@@ -74,6 +74,7 @@ obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o obj-$(CONFIG_CLKSRC_TANGO_XTAL) += timer-tango-xtal.o obj-$(CONFIG_CLKSRC_IMX_GPT) += timer-imx-gpt.o obj-$(CONFIG_CLKSRC_IMX_TPM) += timer-imx-tpm.o +obj-$(CONFIG_TIMER_IMX_SYS_CTR) += timer-imx-sysctr.o obj-$(CONFIG_ASM9260_TIMER) += asm9260_timer.o obj-$(CONFIG_H8300_TMR8) += h8300_timer8.o obj-$(CONFIG_H8300_TMR16) += h8300_timer16.o
drivers/clocksource/timer-imx-sysctr.c new file +145 -0
145 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 15/25 clocksource/drivers/arm_arch_timer: Extract elf_hwcap use to arch-helper
In reply to Daniel LezcanoFrom: Andrew Murray <[email protected]>
Different mechanisms are used to test and set elf_hwcaps between ARM and ARM64, this results in the use of ifdeferry in this file when setting/testing for the EVTSTRM hwcap.
Let's improve readability by extracting this to an arch helper.
--- arch/arm/include/asm/arch_timer.h | 10 ++++++++++ arch/arm64/include/asm/arch_timer.h | 13 +++++++++++++ drivers/clocksource/arm_arch_timer.c | 15 ++------------- 3 files changed, 25 insertions(+), 13 deletions(-)
arch/arm/include/asm/arch_timer.h +10 -0
@@ -4,6 +4,7 @@#include <asm/barrier.h> #include <asm/errno.h> +#include <asm/hwcap.h> #include <linux/clocksource.h> #include <linux/init.h> #include <linux/types.h>
@@ -124,6 +125,15 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)isb (); } +static inline void arch_timer_set_evtstrm_feature (void ) +{ + elf_hwcap |=HWCAP_EVTSTRM ; +} + +static inline bool arch_timer_have_evtstrm_feature (void ) +{ +return elf_hwcap &HWCAP_EVTSTRM ; +}#endif #endif
arch/arm64/include/asm/arch_timer.h +13 -0
@@ -20,6 +20,7 @@#define __ASM_ARCH_TIMER_H#include <asm/barrier.h> +#include <asm/hwcap.h> #include <asm/sysreg.h> #include <linux/bug.h>
@@ -240,4 +241,16 @@ static inline int arch_timer_arch_init(void) return 0; } +static inline void arch_timer_set_evtstrm_feature (void ) +{ +cpu_set_named_feature (EVTSTRM ); +#ifdef CONFIG_COMPAT + compat_elf_hwcap |=COMPAT_HWCAP_EVTSTRM ; +#endif +} + +static inline bool arch_timer_have_evtstrm_feature (void ) +{ +return cpu_have_named_feature (EVTSTRM ); +}#endif
drivers/clocksource/arm_arch_timer.c +2 -13
@@ -804,14 +804,7 @@ static void arch_timer_evtstrm_enable(int divider) cntkctl |= (divider <<ARCH_TIMER_EVT_TRIGGER_SHIFT ) |ARCH_TIMER_VIRT_EVT_EN ;arch_timer_set_cntkctl (cntkctl); -#ifdef CONFIG_ARM64 -cpu_set_named_feature (EVTSTRM ); -#else - elf_hwcap |=HWCAP_EVTSTRM ; -#endif -#ifdef CONFIG_COMPAT - compat_elf_hwcap |=COMPAT_HWCAP_EVTSTRM ; -#endif +arch_timer_set_evtstrm_feature ();cpumask_set_cpu (smp_processor_id (), &evtstrm_available); }
@@ -1040,11 +1033,7 @@ static int arch_timer_cpu_pm_notify(struct notifier_block *self, }else if (action ==CPU_PM_ENTER_FAILED || action ==CPU_PM_EXIT ) {arch_timer_set_cntkctl (__this_cpu_read (saved_cntkctl)); -#ifdef CONFIG_ARM64 -if (cpu_have_named_feature (EVTSTRM )) -#else - if (elf_hwcap & HWCAP_EVTSTRM) -#endif +if (arch_timer_have_evtstrm_feature ())cpumask_set_cpu (smp_processor_id (), &evtstrm_available); }return NOTIFY_OK ;
Signature · 1 line
2.17.1
PATCH 16/25 clocksource/drivers/tegra: Restore timer rate on Tegra210
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
The clocksource rate is initialized only for the first per-CPU clocksource and then that rate shall be replicated for the rest of clocksource's because they are initialized manually in the code.
--- drivers/clocksource/timer-tegra.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clocksource/timer-tegra.c +2 -0
@@ -279,6 +279,8 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20,*/ if (tegra20) cpu_to->of_clk.rate =1000000 ; +else + cpu_to->of_clk.rate =timer_of_rate (to); cpu_to =per_cpu_ptr (&tegra_to, cpu); cpu_to->of_base.base = timer_reg_base + base;
Signature · 1 line
2.17.1
PATCH 17/25 clocksource/drivers/tegra: Remove duplicated use of per_cpu_ptr
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
It was left unnoticed by accident, which means that the code could be cleaned up a tad more.
--- drivers/clocksource/timer-tegra.c | 42 ++++++++++++++++++------------- 1 file changed, 25 insertions(+), 17 deletions(-)
drivers/clocksource/timer-tegra.c +25 -17
@@ -218,6 +218,19 @@ static inline unsigned int tegra_irq_idx_for_cpu(int cpu, bool tegra20)return TIMER10_IRQ_IDX + cpu; } +static inline unsigned long tegra_rate_for_timer (struct timer_of *to, +bool tegra20) +{ +/* +* TIMER1-9 are fixed to 1MHz, TIMER10-13 are running off the +* parent clock. +*/ +if (tegra20) +return 1000000 ; + +return timer_of_rate (to); +} +static int __init tegra_init_timer (struct device_node *np,bool tegra20,int rating) {
@@ -270,32 +283,27 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20,for_each_possible_cpu (cpu) {struct timer_of *cpu_to =per_cpu_ptr (&tegra_to, cpu); +unsigned long flags =IRQF_TIMER |IRQF_NOBALANCING ; +unsigned long rate =tegra_rate_for_timer (to, tegra20);unsigned int base =tegra_base_for_cpu (cpu, tegra20);unsigned int idx =tegra_irq_idx_for_cpu (cpu, tegra20); +unsigned int irq =irq_of_parse_and_map (np, idx); -/* -* TIMER1-9 are fixed to 1MHz, TIMER10-13 are running off the -* parent clock. -*/ -if (tegra20) - cpu_to->of_clk.rate =1000000 ; -else - cpu_to->of_clk.rate =timer_of_rate (to); - - cpu_to =per_cpu_ptr (&tegra_to, cpu); - cpu_to->of_base.base = timer_reg_base + base; - cpu_to->clkevt.rating = rating; - cpu_to->clkevt.cpumask =cpumask_of (cpu); - cpu_to->clkevt.irq =irq_of_parse_and_map (np, idx); -if (!cpu_to->clkevt.irq) { +if (!irq) {pr_err ("failed to map irq for cpu%d\n" , cpu); ret = -EINVAL ; goto out_irq; } + cpu_to->clkevt.irq = irq; + cpu_to->clkevt.rating = rating; + cpu_to->clkevt.cpumask =cpumask_of (cpu); + cpu_to->of_base.base = timer_reg_base + base; + cpu_to->of_clk.rate = rate; +irq_set_status_flags (cpu_to->clkevt.irq,IRQ_NOAUTOEN ); - ret =request_irq (cpu_to->clkevt.irq, tegra_timer_isr, -IRQF_TIMER |IRQF_NOBALANCING , + + ret =request_irq (cpu_to->clkevt.irq, tegra_timer_isr, flags, cpu_to->clkevt.name, &cpu_to->clkevt);if (ret) { pr_err("failed to set up irq for cpu%d: %d\n",
Signature · 1 line
2.17.1
PATCH 18/25 clocksource/drivers/tegra: Set and use timer's period
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
The of_clk structure has a period field that is set up initially by timer_of_clk_init(), that period value need to be adjusted for a case of TIMER1-9 that are running at a fixed rate that doesn't match the clock's rate. Note that the period value is currently used only by some of the clocksource drivers internally and hence this is just a minor cleanup change that doesn't fix anything.
--- drivers/clocksource/timer-tegra.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clocksource/timer-tegra.c +3 -2
@@ -73,9 +73,9 @@ static int tegra_timer_shutdown(struct clock_event_device *evt)static int tegra_timer_set_periodic (struct clock_event_device *evt) {void __iomem *reg_base =timer_of_base (to_timer_of (evt)); +unsigned long period =timer_of_period (to_timer_of (evt)); -writel_relaxed (TIMER_PTV_EN |TIMER_PTV_PER | - ((timer_of_rate (to_timer_of (evt)) /HZ ) -1 ), +writel_relaxed (TIMER_PTV_EN |TIMER_PTV_PER | (period -1 ), reg_base +TIMER_PTV );return 0 ;
@@ -299,6 +299,7 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20, cpu_to->clkevt.rating = rating; cpu_to->clkevt.cpumask =cpumask_of (cpu); cpu_to->of_base.base = timer_reg_base + base; + cpu_to->of_clk.period = rate /HZ ; cpu_to->of_clk.rate = rate;irq_set_status_flags (cpu_to->clkevt.irq,IRQ_NOAUTOEN );
Signature · 1 line
2.17.1
PATCH 19/25 clocksource/drivers/tegra: Drop unneeded typecasting in one place
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
There is no need to cast void because kernel allows to do that without a warning message from a compiler.
--- drivers/clocksource/timer-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/timer-tegra.c +1 -1
@@ -83,7 +83,7 @@ static int tegra_timer_set_periodic(struct clock_event_device *evt)static irqreturn_t tegra_timer_isr (int irq,void *dev_id) { -struct clock_event_device *evt = (struct clock_event_device *)dev_id; +struct clock_event_device *evt = dev_id;void __iomem *reg_base =timer_of_base (to_timer_of (evt));writel_relaxed (TIMER_PCR_INTR_CLR , reg_base +TIMER_PCR );
Signature · 1 line
2.17.1
PATCH 20/25 clocksource/drivers/tegra: Add verbose definition for 1MHz constant
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Convert all 1MHz literals to a verbose constant for better readability.
--- drivers/clocksource/timer-tegra.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/clocksource/timer-tegra.c +7 -5
@@ -46,6 +46,8 @@#define TIMER1_IRQ_IDX 0#define TIMER10_IRQ_IDX 10 +#define TIMER_1MHz 1000000 +static u32 usec_config;static void __iomem *timer_reg_base;
@@ -160,7 +162,7 @@ static unsigned long tegra_delay_timer_read_counter_long(void)static struct delay_timer tegra_delay_timer = { .read_current_timer = tegra_delay_timer_read_counter_long, - .freq =1000000 , + .freq = TIMER_1MHz, };#endif
@@ -226,7 +228,7 @@ static inline unsigned long tegra_rate_for_timer(struct timer_of *to,* parent clock. */ if (tegra20) -return 1000000 ; +return TIMER_1MHz;return timer_of_rate (to); }
@@ -315,11 +317,11 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20, } } -sched_clock_register (tegra_read_sched_clock,32 ,1000000 ); +sched_clock_register (tegra_read_sched_clock,32 , TIMER_1MHz); ret =clocksource_mmio_init (timer_reg_base +TIMERUS_CNTR_1US , -"timer_us" ,1000000 , -300 ,32 , clocksource_mmio_readl_up); +"timer_us" , TIMER_1MHz,300 ,32 , + clocksource_mmio_readl_up);if (ret)pr_err ("failed to register clocksource: %d\n" , ret);
Signature · 1 line
2.17.1
PATCH 21/25 clocksource/drivers/tegra: Restore base address before cleanup
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
We're adjusting the timer's base for each per-CPU timer to point to the actual start of the timer since device-tree defines a compound registers range that includes all of the timers. In this case the original base need to be restore before calling iounmap to unmap the proper address.
--- drivers/clocksource/timer-tegra.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clocksource/timer-tegra.c +2 -0
@@ -347,6 +347,8 @@ static int __init tegra_init_timer(struct device_node *np, bool tegra20,irq_dispose_mapping (cpu_to->clkevt.irq); } } + + to->of_base.base = timer_reg_base; out:timer_of_cleanup (to);
Signature · 1 line
2.17.1
PATCH 22/25 clocksource/drivers/tegra: Cycles can't be 0
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Tegra's timer uses n+1 scheme for the counter, i.e. timer will fire after one tick if 0 is loaded. The minimum and maximum numbers of oneshot ticks are defined by clockevents_config_and_register(min, max) invocation and the min value is set to 1 tick. Hence "cycles" value can't ever be 0, unless it's a bug in clocksource core.
--- drivers/clocksource/timer-tegra.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/clocksource/timer-tegra.c +10 -3
@@ -56,9 +56,16 @@ static int tegra_timer_set_next_event(unsigned long cycles, {void __iomem *reg_base =timer_of_base (to_timer_of (evt)); -writel_relaxed (TIMER_PTV_EN | - ((cycles >1 ) ? (cycles -1 ) :0 ),/* n+1 scheme */ - reg_base +TIMER_PTV ); +/* +* Tegra's timer uses n+1 scheme for the counter, i.e. timer will +* fire after one tick if 0 is loaded. +* +* The minimum and maximum numbers of oneshot ticks are defined +* by clockevents_config_and_register(1, 0x1fffffff + 1) invocation +* below in the code. Hence the cycles (ticks) can't be outside of +* a range supportable by hardware. +*/ +writel_relaxed (TIMER_PTV_EN | (cycles -1 ), reg_base +TIMER_PTV );return 0 ; }
Signature · 1 line
2.17.1
PATCH 23/25 clocksource/drivers/tegra: Set up maximum-ticks limit properly
In reply to Daniel LezcanoFrom: Dmitry Osipenko <[email protected]>
Tegra's timer has 29 bits for the counter and for the "load" register which sets counter to a load-value. The counter's value is lower than the actual value by 1 because it starts to decrement after one tick, hence the maximum number of ticks that hardware can handle equals to 29 bits + 1.
--- drivers/clocksource/timer-tegra.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/clocksource/timer-tegra.c +9 -1
@@ -139,9 +139,17 @@ static int tegra_timer_setup(unsigned int cpu)irq_force_affinity (to->clkevt.irq,cpumask_of (cpu));enable_irq (to->clkevt.irq); +/* +* Tegra's timer uses n+1 scheme for the counter, i.e. timer will +* fire after one tick if 0 is loaded and thus minimum number of +* ticks is 1. In result both of the clocksource's tick limits are +* higher than a minimum and maximum that hardware register can +* take by 1, this is then taken into account by set_next_event +* callback. +*/ clockevents_config_and_register (&to->clkevt,timer_of_rate (to),1 ,/* min */ -0x1fffffff );/* 29 bits */ +0x1fffffff +1 );/* max 29 bits + 1 */ return 0 ; }
Signature · 1 line
2.17.1
PATCH 24/25 clocksource/drivers/davinci: Add support for clockevents
In reply to Daniel LezcanoFrom: Bartosz Golaszewski <[email protected]>
Currently the clocksource and clockevent support for davinci platforms lives in mach-davinci. It hard-codes many things, uses global variables, implements functionalities unused by any platform and has code fragments scattered across many (often unrelated) files.
Implement a new, modern and simplified timer driver and put it into drivers/clocksource. We still need to support legacy board files so export a config structure and a function that allows machine code to register the timer.
The timer we're using is 64-bit but can be programmed in dual 32-bit mode (both chained and unchained).
On all davinci SoCs except for da830 we're using both halves. Lower half for clockevents and upper half for clocksource. On da830 we're using the lower half for both with the help of a compare register.
This patch contains the core code and support for clockevent. The clocksource code will be included in a subsequent patch.
--- drivers/clocksource/Kconfig | 5 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-davinci.c | 284 ++++++++++++++++++++++++++++ include/clocksource/timer-davinci.h | 44 +++++ 4 files changed, 334 insertions(+) create mode 100644 drivers/clocksource/timer-davinci.c create mode 100644 include/clocksource/timer-davinci.h
drivers/clocksource/Kconfig +5 -0
@@ -43,6 +43,11 @@ config BCM_KONA_TIMER help Enables the support for the BCM Kona mobile timer driver. +config DAVINCI_TIMER + bool "Texas Instruments DaVinci timer driver" if COMPILE_TEST + help + Enables the support for the TI DaVinci timer driver. + config DIGICOLOR_TIMER bool "Digicolor timer driver" if COMPILE_TEST select CLKSRC_MMIO
drivers/clocksource/Makefile +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o obj-$(CONFIG_EM_TIMER_STI) += em_sti.o obj-$(CONFIG_CLKBLD_I8253) += i8253.o obj-$(CONFIG_CLKSRC_MMIO) += mmio.o +obj-$(CONFIG_DAVINCI_TIMER) += timer-davinci.o obj-$(CONFIG_DIGICOLOR_TIMER) += timer-digicolor.o obj-$(CONFIG_OMAP_DM_TIMER) += timer-ti-dm.o obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o
drivers/clocksource/timer-davinci.c new file +284 -0
284 lines not on this page · raw message
include/clocksource/timer-davinci.h new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 25/25 clocksource/drivers/davinci: Add support for clocksource
In reply to Daniel LezcanoFrom: Bartosz Golaszewski <[email protected]>
Extend the davinci-timer driver to also register a clock source.
--- drivers/clocksource/timer-davinci.c | 85 +++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+)
drivers/clocksource/timer-davinci.c +85 -0
@@ -43,6 +43,8 @@#define DAVINCI_TIMER_MIN_DELTA 0x01#define DAVINCI_TIMER_MAX_DELTA 0xfffffffe +#define DAVINCI_TIMER_CLKSRC_BITS 32 +#define DAVINCI_TIMER_TGCR_DEFAULT \ (DAVINCI_TIMER_TIMMODE_32BIT_UNCHAINED | DAVINCI_TIMER_UNRESET)
@@ -52,6 +54,16 @@ struct davinci_clockevent {unsigned int cmp_off; }; +/* +* This must be globally accessible by davinci_timer_read_sched_clock(), so +* let's keep it here. +*/ +static struct { +struct clocksource dev; +void __iomem *base; +unsigned int tim_off; +} davinci_clocksource; +static struct davinci_clockevent *to_davinci_clockevent (struct clock_event_device *clockevent) {
@@ -166,6 +178,53 @@ static irqreturn_t davinci_timer_irq_timer(int irq, void *data)return IRQ_HANDLED ; } +static u64 notrace davinci_timer_read_sched_clock(void) +{ +return readl_relaxed (davinci_clocksource.base + + davinci_clocksource.tim_off); +} + +static u64 davinci_clocksource_read (struct clocksource *dev) +{ +return davinci_timer_read_sched_clock (); +} + +/* +* Standard use-case: we're using tim12 for clockevent and tim34 for +* clocksource. The default is making the former run in oneshot mode +* and the latter in periodic mode. +*/ +static void davinci_clocksource_init_tim34 (void __iomem *base) +{ +int tcr; + + tcr =DAVINCI_TIMER_ENAMODE_PERIODIC << +DAVINCI_TIMER_ENAMODE_SHIFT_TIM34 ; + tcr |=DAVINCI_TIMER_ENAMODE_ONESHOT << +DAVINCI_TIMER_ENAMODE_SHIFT_TIM12 ; + +writel_relaxed (0x0 , base +DAVINCI_TIMER_REG_TIM34 ); +writel_relaxed (UINT_MAX , base +DAVINCI_TIMER_REG_PRD34 ); +writel_relaxed (tcr, base +DAVINCI_TIMER_REG_TCR ); +} + +/* +* Special use-case on da830: the DSP may use tim34. We're using tim12 for +* both clocksource and clockevent. We set tim12 to periodic and don't touch +* tim34. +*/ +static void davinci_clocksource_init_tim12 (void __iomem *base) +{ +unsigned int tcr; + + tcr =DAVINCI_TIMER_ENAMODE_PERIODIC << +DAVINCI_TIMER_ENAMODE_SHIFT_TIM12 ; + +writel_relaxed (0x0 , base +DAVINCI_TIMER_REG_TIM12 ); +writel_relaxed (UINT_MAX , base +DAVINCI_TIMER_REG_PRD12 ); +writel_relaxed (tcr, base +DAVINCI_TIMER_REG_TCR ); +} +static void davinci_timer_init (void __iomem *base) {/* Set clock to internal mode and disable it. */
@@ -247,6 +306,32 @@ int __init davinci_timer_register(struct clk *clk,DAVINCI_TIMER_MIN_DELTA , DAVINCI_TIMER_MAX_DELTA); + davinci_clocksource.dev.rating =300 ; + davinci_clocksource.dev.read = davinci_clocksource_read; + davinci_clocksource.dev.mask = +CLOCKSOURCE_MASK (DAVINCI_TIMER_CLKSRC_BITS ); + davinci_clocksource.dev.flags =CLOCK_SOURCE_IS_CONTINUOUS ; + davinci_clocksource.base = base; + +if (timer_cfg->cmp_off) { + davinci_clocksource.dev.name ="tim12" ; + davinci_clocksource.tim_off =DAVINCI_TIMER_REG_TIM12 ; +davinci_clocksource_init_tim12 (base); + }else { + davinci_clocksource.dev.name ="tim34" ; + davinci_clocksource.tim_off =DAVINCI_TIMER_REG_TIM34 ; +davinci_clocksource_init_tim34 (base); + } + + rv =clocksource_register_hz (&davinci_clocksource.dev, tick_rate); +if (rv) { +pr_err ("Unable to register clocksource" ); +return rv; + } + +sched_clock_register (davinci_timer_read_sched_clock, +DAVINCI_TIMER_CLKSRC_BITS , tick_rate); +return 0 ; }
Signature · 1 line
2.17.1