clocksource: rework Atmel TCB timer driver
Subsystems (4)
Alexandre Belloni
maintainerv6 cover clocksource: rework Atmel TCB timer driver
Hi,
This series reworks the Atmel TCB drivers. It introduces a new driver to handle the clocksource and clockevent devices.
As a reminder, this is necessary because:
- the current tcb_clksrc driver is probed too late to be able to be used at boot and we now have SoCs that don't have a PIT. They currently are not able to boot a mainline kernel.
- using the PIT doesn't work well with preempt-rt because its interrupt is shared (in particular with the UART and their interrupt flags are incompatible)
- the current solution is wasting some TCB channels
The plan is to get this driver upstream, then convert the TCB PWM driver to be able to get rid of the tcb_clksrc driver along with atmel_tclib now that AVR32 is gone.
changes in v6:
- rebased on v4.19-rc1
- separated the clocksource/clockevent and the single clockevent in two different patches
- removed struct tc_clkevt_device and simply use struct atmel_tcb_clksrc
- removed struct atmel_tcb_info
- moved tcb_clk_get and tcb_irq_get to users
changes in v5:
- rebased on v4.18-rc1
- fixed the clock enabling/disabling in atomic context under preempt-rt
Changes in v4:
- rebased on top of v4.17-rc1
- fixed an issue when setting max_delta for clockevents_config_and_register
Alexandre Belloni (7):
ARM: at91: add TCB registers definitions clocksource/drivers: Add a new driver for the Atmel ARM TC blocks clocksource/drivers: timer-atmel-tcb: add clockevent device on
separate channel
clocksource/drivers: atmel-pit: make option silent
ARM: at91: Implement clocksource selection
ARM: configs: at91: use new TCB timer driver
ARM: configs: at91: unselect PIT
arch/arm/configs/at91_dt_defconfig | 2 +- arch/arm/configs/sama5_defconfig | 2 +- arch/arm/mach-at91/Kconfig | 25 ++ drivers/clocksource/Kconfig | 13 +- drivers/clocksource/Makefile | 3 +- drivers/clocksource/timer-atmel-tcb.c | 616 ++++++++++++++++++++++++++ include/soc/at91/atmel_tcb.h | 183 ++++++++ 7 files changed, 840 insertions(+), 4 deletions(-) create mode 100644 drivers/clocksource/timer-atmel-tcb.c create mode 100644 include/soc/at91/atmel_tcb.h
Signature · 1 line
2.19.0.rc2
Alexandre Belloni
maintainerPATCH v6 1/7 ARM: at91: add TCB registers definitions
Add registers and bits definitions for the timer counter blocks found on Atmel ARM SoCs.
--- include/soc/at91/atmel_tcb.h | 183 +++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 include/soc/at91/atmel_tcb.h
include/soc/at91/atmel_tcb.h new file +183 -0
@@ -0,0 +1,183 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2018 Microchip */ + +#ifndef __SOC_ATMEL_TCB_H +#define __SOC_ATMEL_TCB_H + +/* Channel registers */ +#define ATMEL_TC_COFFS (c) ((c) * 0x40) +#define ATMEL_TC_CCR (c) ATMEL_TC_COFFS(c) +#define ATMEL_TC_CMR (c) (ATMEL_TC_COFFS(c) + 0x4) +#define ATMEL_TC_SMMR (c) (ATMEL_TC_COFFS(c) + 0x8) +#define ATMEL_TC_RAB (c) (ATMEL_TC_COFFS(c) + 0xc) +#define ATMEL_TC_CV (c) (ATMEL_TC_COFFS(c) + 0x10) +#define ATMEL_TC_RA (c) (ATMEL_TC_COFFS(c) + 0x14) +#define ATMEL_TC_RB (c) (ATMEL_TC_COFFS(c) + 0x18) +#define ATMEL_TC_RC (c) (ATMEL_TC_COFFS(c) + 0x1c) +#define ATMEL_TC_SR (c) (ATMEL_TC_COFFS(c) + 0x20) +#define ATMEL_TC_IER (c) (ATMEL_TC_COFFS(c) + 0x24) +#define ATMEL_TC_IDR (c) (ATMEL_TC_COFFS(c) + 0x28) +#define ATMEL_TC_IMR (c) (ATMEL_TC_COFFS(c) + 0x2c) +#define ATMEL_TC_EMR (c) (ATMEL_TC_COFFS(c) + 0x30) + +/* Block registers */ +#define ATMEL_TC_BCR 0xc0 +#define ATMEL_TC_BMR 0xc4 +#define ATMEL_TC_QIER 0xc8 +#define ATMEL_TC_QIDR 0xcc +#define ATMEL_TC_QIMR 0xd0 +#define ATMEL_TC_QISR 0xd4 +#define ATMEL_TC_FMR 0xd8 +#define ATMEL_TC_WPMR 0xe4 + +/* CCR fields */ +#define ATMEL_TC_CCR_CLKEN BIT(0) +#define ATMEL_TC_CCR_CLKDIS BIT(1) +#define ATMEL_TC_CCR_SWTRG BIT(2) + +/* Common CMR fields */ +#define ATMEL_TC_CMR_TCLKS_MSK GENMASK(2, 0) +#define ATMEL_TC_CMR_TCLK (x) (x) +#define ATMEL_TC_CMR_XC (x) ((x) + 5) +#define ATMEL_TC_CMR_CLKI BIT(3) +#define ATMEL_TC_CMR_BURST_MSK GENMASK(5, 4) +#define ATMEL_TC_CMR_BURST_XC (x) (((x) + 1) << 4) +#define ATMEL_TC_CMR_WAVE BIT(15) + +/* Capture mode CMR fields */ +#define ATMEL_TC_CMR_LDBSTOP BIT(6) +#define ATMEL_TC_CMR_LDBDIS BIT(7) +#define ATMEL_TC_CMR_ETRGEDG_MSK GENMASK(9, 8) +#define ATMEL_TC_CMR_ETRGEDG_NONE (0 << 8) +#define ATMEL_TC_CMR_ETRGEDG_RISING (1 << 8) +#define ATMEL_TC_CMR_ETRGEDG_FALLING (2 << 8) +#define ATMEL_TC_CMR_ETRGEDG_BOTH (3 << 8) +#define ATMEL_TC_CMR_ABETRG BIT(10) +#define ATMEL_TC_CMR_CPCTRG BIT(14) +#define ATMEL_TC_CMR_LDRA_MSK GENMASK(17, 16) +#define ATMEL_TC_CMR_LDRA_NONE (0 << 16) +#define ATMEL_TC_CMR_LDRA_RISING (1 << 16) +#define ATMEL_TC_CMR_LDRA_FALLING (2 << 16) +#define ATMEL_TC_CMR_LDRA_BOTH (3 << 16) +#define ATMEL_TC_CMR_LDRB_MSK GENMASK(19, 18) +#define ATMEL_TC_CMR_LDRB_NONE (0 << 18) +#define ATMEL_TC_CMR_LDRB_RISING (1 << 18) +#define ATMEL_TC_CMR_LDRB_FALLING (2 << 18) +#define ATMEL_TC_CMR_LDRB_BOTH (3 << 18) +#define ATMEL_TC_CMR_SBSMPLR_MSK GENMASK(22, 20) +#define ATMEL_TC_CMR_SBSMPLR (x) ((x) << 20) + +/* Waveform mode CMR fields */ +#define ATMEL_TC_CMR_CPCSTOP BIT(6) +#define ATMEL_TC_CMR_CPCDIS BIT(7) +#define ATMEL_TC_CMR_EEVTEDG_MSK GENMASK(9, 8) +#define ATMEL_TC_CMR_EEVTEDG_NONE (0 << 8) +#define ATMEL_TC_CMR_EEVTEDG_RISING (1 << 8) +#define ATMEL_TC_CMR_EEVTEDG_FALLING (2 << 8) +#define ATMEL_TC_CMR_EEVTEDG_BOTH (3 << 8) +#define ATMEL_TC_CMR_EEVT_MSK GENMASK(11, 10) +#define ATMEL_TC_CMR_EEVT_XC (x) (((x) + 1) << 10) +#define ATMEL_TC_CMR_ENETRG BIT(12) +#define ATMEL_TC_CMR_WAVESEL_MSK GENMASK(14, 13) +#define ATMEL_TC_CMR_WAVESEL_UP (0 << 13) +#define ATMEL_TC_CMR_WAVESEL_UPDOWN (1 << 13) +#define ATMEL_TC_CMR_WAVESEL_UPRC (2 << 13) +#define ATMEL_TC_CMR_WAVESEL_UPDOWNRC (3 << 13) +#define ATMEL_TC_CMR_ACPA_MSK GENMASK(17, 16) +#define ATMEL_TC_CMR_ACPA (a) (ATMEL_TC_CMR_ACTION_##a << 16) +#define ATMEL_TC_CMR_ACPC_MSK GENMASK(19, 18) +#define ATMEL_TC_CMR_ACPC (a) (ATMEL_TC_CMR_ACTION_##a << 18) +#define ATMEL_TC_CMR_AEEVT_MSK GENMASK(21, 20) +#define ATMEL_TC_CMR_AEEVT (a) (ATMEL_TC_CMR_ACTION_##a << 20) +#define ATMEL_TC_CMR_ASWTRG_MSK GENMASK(23, 22) +#define ATMEL_TC_CMR_ASWTRG (a) (ATMEL_TC_CMR_ACTION_##a << 22) +#define ATMEL_TC_CMR_BCPB_MSK GENMASK(25, 24) +#define ATMEL_TC_CMR_BCPB (a) (ATMEL_TC_CMR_ACTION_##a << 24) +#define ATMEL_TC_CMR_BCPC_MSK GENMASK(27, 26) +#define ATMEL_TC_CMR_BCPC (a) (ATMEL_TC_CMR_ACTION_##a << 26) +#define ATMEL_TC_CMR_BEEVT_MSK GENMASK(29, 28) +#define ATMEL_TC_CMR_BEEVT (a) (ATMEL_TC_CMR_ACTION_##a << 28) +#define ATMEL_TC_CMR_BSWTRG_MSK GENMASK(31, 30) +#define ATMEL_TC_CMR_BSWTRG (a) (ATMEL_TC_CMR_ACTION_##a << 30) +#define ATMEL_TC_CMR_ACTION_NONE 0 +#define ATMEL_TC_CMR_ACTION_SET 1 +#define ATMEL_TC_CMR_ACTION_CLEAR 2 +#define ATMEL_TC_CMR_ACTION_TOGGLE 3 + +/* SMMR fields */ +#define ATMEL_TC_SMMR_GCEN BIT(0) +#define ATMEL_TC_SMMR_DOWN BIT(1) + +/* SR/IER/IDR/IMR fields */ +#define ATMEL_TC_COVFS BIT(0) +#define ATMEL_TC_LOVRS BIT(1) +#define ATMEL_TC_CPAS BIT(2) +#define ATMEL_TC_CPBS BIT(3) +#define ATMEL_TC_CPCS BIT(4) +#define ATMEL_TC_LDRAS BIT(5) +#define ATMEL_TC_LDRBS BIT(6) +#define ATMEL_TC_ETRGS BIT(7) +#define ATMEL_TC_CLKSTA BIT(16) +#define ATMEL_TC_MTIOA BIT(17) +#define ATMEL_TC_MTIOB BIT(18) + +/* EMR fields */ +#define ATMEL_TC_EMR_TRIGSRCA_MSK GENMASK(1, 0) +#define ATMEL_TC_EMR_TRIGSRCA_TIOA 0 +#define ATMEL_TC_EMR_TRIGSRCA_PWMX 1 +#define ATMEL_TC_EMR_TRIGSRCB_MSK GENMASK(5, 4) +#define ATMEL_TC_EMR_TRIGSRCB_TIOB (0 << 4) +#define ATMEL_TC_EMR_TRIGSRCB_PWM (1 << 4) +#define ATMEL_TC_EMR_NOCLKDIV BIT(8) + +/* BCR fields */ +#define ATMEL_TC_BCR_SYNC BIT(0) + +/* BMR fields */ +#define ATMEL_TC_BMR_TCXC_MSK (c) GENMASK(((c) * 2) + 1, (c) * 2) +#define ATMEL_TC_BMR_TCXC (x, c) ((x) << (2 * (c))) +#define ATMEL_TC_BMR_QDEN BIT(8) +#define ATMEL_TC_BMR_POSEN BIT(9) +#define ATMEL_TC_BMR_SPEEDEN BIT(10) +#define ATMEL_TC_BMR_QDTRANS BIT(11) +#define ATMEL_TC_BMR_EDGPHA BIT(12) +#define ATMEL_TC_BMR_INVA BIT(13) +#define ATMEL_TC_BMR_INVB BIT(14) +#define ATMEL_TC_BMR_INVIDX BIT(15) +#define ATMEL_TC_BMR_SWAP BIT(16) +#define ATMEL_TC_BMR_IDXPHB BIT(17) +#define ATMEL_TC_BMR_AUTOC BIT(18) +#define ATMEL_TC_MAXFILT_MSK GENMASK(25, 20) +#define ATMEL_TC_MAXFILT (x) (((x) - 1) << 20) +#define ATMEL_TC_MAXCMP_MSK GENMASK(29, 26) +#define ATMEL_TC_MAXCMP (x) ((x) << 26) + +/* QEDC fields */ +#define ATMEL_TC_QEDC_IDX BIT(0) +#define ATMEL_TC_QEDC_DIRCHG BIT(1) +#define ATMEL_TC_QEDC_QERR BIT(2) +#define ATMEL_TC_QEDC_MPE BIT(3) +#define ATMEL_TC_QEDC_DIR BIT(8) + +/* FMR fields */ +#define ATMEL_TC_FMR_ENCF (x) BIT(x) + +/* WPMR fields */ +#define ATMEL_TC_WPMR_WPKEY (0x54494d << 8) +#define ATMEL_TC_WPMR_WPEN BIT(0) + +static const u8 atmel_tc_divisors[5 ] = {2 ,8 ,32 ,128 ,0 , }; + +static const struct of_device_id atmel_tcb_dt_ids[] = { + { + .compatible ="atmel,at91rm9200-tcb" , + .data = (void *)16 , + }, { + .compatible ="atmel,at91sam9x5-tcb" , + .data = (void *)32 , + }, { +/* sentinel */ + } +}; + +#endif /* __SOC_ATMEL_TCB_H */
Signature · 1 line
2.19.0.rc2
Alexandre Belloni
maintainerPATCH v6 2/7 clocksource/drivers: Add a new driver for the Atmel ARM TC blocks
In reply to Alexandre BelloniAdd a driver for the Atmel Timer Counter Blocks. This driver provides a clocksource and two clockevent devices.
One of the clockevent device is linked to the clocksource counter and so it will run at the same frequency. This will be used when there is only on TCB channel available for timers.
The other clockevent device runs on a separate TCB channel when available.
This driver uses regmap and syscon to be able to probe early in the boot and avoid having to switch on the TCB clocksource later. Using regmap also means that unused TCB channels may be used by other drivers (PWM for example). read/writel are still used to access channel specific registers to avoid the performance impact of regmap (mainly locking).
--- drivers/clocksource/Kconfig | 8 + drivers/clocksource/Makefile | 3 +- drivers/clocksource/timer-atmel-tcb.c | 409 ++++++++++++++++++++++++++ 3 files changed, 419 insertions(+), 1 deletion(-) create mode 100644 drivers/clocksource/timer-atmel-tcb.c
drivers/clocksource/Kconfig +8 -0
@@ -403,6 +403,14 @@ config ATMEL_ST help Support for the Atmel ST timer. +config ATMEL_ARM_TCB_CLKSRC + bool "Microchip ARM TC Block" if COMPILE_TEST + select REGMAP_MMIO + depends on GENERIC_CLOCKEVENTS + help + This enables build of clocksource and clockevent driver for + the integrated Timer Counter Blocks in Microchip ARM SoCs. + config CLKSRC_EXYNOS_MCT bool "Exynos multi core timer driver" if COMPILE_TEST depends on ARM || ARM64
drivers/clocksource/Makefile +2 -1
@@ -3,7 +3,8 @@ obj-$(CONFIG_TIMER_OF) += timer-of.o obj-$(CONFIG_TIMER_PROBE) += timer-probe.o obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o -obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o +obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o +obj-$(CONFIG_ATMEL_ARM_TCB_CLKSRC) += timer-atmel-tcb.o obj-$(CONFIG_X86_PM_TIMER) += acpi_pm.o obj-$(CONFIG_SCx200HR_TIMER) += scx200_hrt.o obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC) += cs5535-clockevt.o
drivers/clocksource/timer-atmel-tcb.c new file +409 -0
409 lines not on this page · raw message
Signature · 1 line
2.19.0.rc2
Alexandre Belloni
maintainerPATCH v6 3/7 clocksource/drivers: timer-atmel-tcb: add clockevent device on separate channel
In reply to Alexandre BelloniAdd an other clockevent device that uses a separate TCB channel when available.
--- drivers/clocksource/timer-atmel-tcb.c | 217 +++++++++++++++++++++++++- 1 file changed, 212 insertions(+), 5 deletions(-)
drivers/clocksource/timer-atmel-tcb.c +212 -5
@@ -32,7 +32,7 @@ struct atmel_tcb_clksrc {bool clk_enabled; }; -static struct atmel_tcb_clksrc tc; +static struct atmel_tcb_clksrc tc, tce;static struct clk *tcb_clk_get (struct device_node *node,int channel) {
@@ -47,6 +47,203 @@ static struct clk *tcb_clk_get(struct device_node *node, int channel)return of_clk_get_by_name (node->parent,"t0_clk" ); } +/* +* Clockevent device using its own channel +*/ + +static void tc_clkevt2_clk_disable (struct clock_event_device *d) +{ +clk_disable (tce.clk[0 ]); + tce.clk_enabled = false; +} + +static void tc_clkevt2_clk_enable (struct clock_event_device *d) +{ +if (tce.clk_enabled) +return ; +clk_enable (tce.clk[0 ]); + tce.clk_enabled = true; +} + +static int tc_clkevt2_stop (struct clock_event_device *d) +{ +writel (0xff , tce.base +ATMEL_TC_IDR (tce.channels[0 ])); +writel (ATMEL_TC_CCR_CLKDIS , tce.base +ATMEL_TC_CCR (tce.channels[0 ])); + +return 0 ; +} + +static int tc_clkevt2_shutdown (struct clock_event_device *d) +{ +tc_clkevt2_stop (d); +if (!clockevent_state_detached (d)) +tc_clkevt2_clk_disable (d); + +return 0 ; +} + +/* For now, we always use the 32K clock ... this optimizes for NO_HZ, +* because using one of the divided clocks would usually mean the +* tick rate can never be less than several dozen Hz (vs 0.5 Hz). +* +* A divided clock could be good for high resolution timers, since +* 30.5 usec resolution can seem "low". +*/ +static int tc_clkevt2_set_oneshot (struct clock_event_device *d) +{ +if (clockevent_state_oneshot (d) ||clockevent_state_periodic (d)) +tc_clkevt2_stop (d); + +tc_clkevt2_clk_enable (d); + +/* slow clock, count up to RC, then irq and stop */ +writel (ATMEL_TC_CMR_TCLK (4 ) |ATMEL_TC_CMR_CPCSTOP | +ATMEL_TC_CMR_WAVE |ATMEL_TC_CMR_WAVESEL_UPRC , + tce.base +ATMEL_TC_CMR (tce.channels[0 ])); +writel (ATMEL_TC_CPCS , tce.base +ATMEL_TC_IER (tce.channels[0 ])); + +return 0 ; +} + +static int tc_clkevt2_set_periodic (struct clock_event_device *d) +{ +if (clockevent_state_oneshot (d) ||clockevent_state_periodic (d)) +tc_clkevt2_stop (d); + +/* By not making the gentime core emulate periodic mode on top +* of oneshot, we get lower overhead and improved accuracy. +*/ +tc_clkevt2_clk_enable (d); + +/* slow clock, count up to RC, then irq and restart */ +writel (ATMEL_TC_CMR_TCLK (4 ) |ATMEL_TC_CMR_WAVE | +ATMEL_TC_CMR_WAVESEL_UPRC , + tce.base +ATMEL_TC_CMR (tce.channels[0 ])); +writel ((32768 +HZ /2 ) /HZ , tce.base +ATMEL_TC_RC (tce.channels[0 ])); + +/* Enable clock and interrupts on RC compare */ +writel (ATMEL_TC_CPCS , tce.base +ATMEL_TC_IER (tce.channels[0 ])); +writel (ATMEL_TC_CCR_CLKEN |ATMEL_TC_CCR_SWTRG , + tce.base +ATMEL_TC_CCR (tce.channels[0 ])); + +return 0 ; +} + +static int tc_clkevt2_next_event (unsigned long delta, +struct clock_event_device *d) +{ +writel (delta, tce.base +ATMEL_TC_RC (tce.channels[0 ])); +writel (ATMEL_TC_CCR_CLKEN |ATMEL_TC_CCR_SWTRG , + tce.base +ATMEL_TC_CCR (tce.channels[0 ])); + +return 0 ; +} + +static irqreturn_t tc_clkevt2_irq (int irq,void *handle) +{ +unsigned int sr; + + sr =readl (tce.base +ATMEL_TC_SR (tce.channels[0 ])); +if (sr &ATMEL_TC_CPCS ) { + tce.clkevt.event_handler (&tce.clkevt); +return IRQ_HANDLED ; + } + +return IRQ_NONE ; +} + +static void tc_clkevt2_suspend (struct clock_event_device *d) +{ + tce.cache[0 ].cmr =readl (tce.base +ATMEL_TC_CMR (tce.channels[0 ])); + tce.cache[0 ].imr =readl (tce.base +ATMEL_TC_IMR (tce.channels[0 ])); + tce.cache[0 ].rc =readl (tce.base +ATMEL_TC_RC (tce.channels[0 ])); + tce.cache[0 ].clken = !!(readl (tce.base +ATMEL_TC_SR (tce.channels[0 ])) & +ATMEL_TC_CLKSTA ); +} + +static void tc_clkevt2_resume (struct clock_event_device *d) +{ +/* Restore registers for the channel, RA and RB are not used */ +writel (tce.cache[0 ].cmr, tc.base +ATMEL_TC_CMR (tce.channels[0 ])); +writel (tce.cache[0 ].rc, tc.base +ATMEL_TC_RC (tce.channels[0 ])); +writel (0 , tc.base +ATMEL_TC_RA (tce.channels[0 ])); +writel (0 , tc.base +ATMEL_TC_RB (tce.channels[0 ])); +/* Disable all the interrupts */ +writel (0xff , tc.base +ATMEL_TC_IDR (tce.channels[0 ])); +/* Reenable interrupts that were enabled before suspending */ +writel (tce.cache[0 ].imr, tc.base +ATMEL_TC_IER (tce.channels[0 ])); + +/* Start the clock if it was used */ +if (tce.cache[0 ].clken) +writel (ATMEL_TC_CCR_CLKEN |ATMEL_TC_CCR_SWTRG , + tc.base +ATMEL_TC_CCR (tce.channels[0 ])); +} + +static int __init tc_clkevt_register (struct device_node *node, +struct regmap *regmap,void __iomem *base, +int channel,int irq,int bits) +{ +int ret; +struct clk *slow_clk; + + tce.regmap = regmap; + tce.base = base; + tce.channels[0 ] = channel; + tce.irq = irq; + + slow_clk =of_clk_get_by_name (node->parent,"slow_clk" ); +if (IS_ERR (slow_clk)) +return PTR_ERR (slow_clk); + + ret =clk_prepare_enable (slow_clk); +if (ret) +return ret; + + tce.clk[0 ] =tcb_clk_get (node, tce.channels[0 ]); +if (IS_ERR (tce.clk[0 ])) { + ret =PTR_ERR (tce.clk[0 ]); + goto err_slow; + } + +snprintf (tce.name,sizeof (tce.name),"%s:%d" , +kbasename (node->parent->full_name), channel); + tce.clkevt.cpumask =cpumask_of (0 ); + tce.clkevt.name = tce.name; + tce.clkevt.set_next_event = tc_clkevt2_next_event, + tce.clkevt.set_state_shutdown = tc_clkevt2_shutdown, + tce.clkevt.set_state_periodic = tc_clkevt2_set_periodic, + tce.clkevt.set_state_oneshot = tc_clkevt2_set_oneshot, + tce.clkevt.suspend = tc_clkevt2_suspend, + tce.clkevt.resume = tc_clkevt2_resume, + tce.clkevt.features =CLOCK_EVT_FEAT_PERIODIC |CLOCK_EVT_FEAT_ONESHOT ; + tce.clkevt.rating =140 ; + +/* try to enable clk to avoid future errors in mode change */ + ret =clk_prepare_enable (tce.clk[0 ]); +if (ret) + goto err_slow; +clk_disable (tce.clk[0 ]); + +clockevents_config_and_register (&tce.clkevt,32768 ,1 , +CLOCKSOURCE_MASK (bits)); + + ret =request_irq (tce.irq, tc_clkevt2_irq,IRQF_TIMER |IRQF_SHARED , + tce.clkevt.name, &tce); +if (ret) + goto err_clk; + + tce.registered = true; + +return 0 ; + +err_clk: +clk_unprepare (tce.clk[0 ]); +err_slow: +clk_disable_unprepare (slow_clk); + +return ret; +} +/* * Clocksource and clockevent using the same channel(s) */
@@ -362,7 +559,7 @@ static int __init tcb_clksrc_init(struct device_node *node)u32 channel;int bits, irq, err, chan1 =-1 ; -if (tc.registered) +if (tc.registered && tce.registered)return -ENODEV ;/*
@@ -394,12 +591,22 @@ static int __init tcb_clksrc_init(struct device_node *node)return irq; } +if (tc.registered) +return tc_clkevt_register (node, regmap, tcb_base, channel, irq, + bits); +if (bits ==16 ) {of_property_read_u32_index (node,"reg" ,1 , &chan1);if (chan1 ==-1 ) { -pr_err ("%s: clocksource needs two channels\n" , - node->parent->full_name); -return -EINVAL ; +if (tce.registered) { +pr_err ("%s: clocksource needs two channels\n" , + node->parent->full_name); +return -EINVAL ; + }else { +return tc_clkevt_register (node, regmap, + tcb_base, channel, + irq, bits); + } } }
Signature · 1 line
2.19.0.rc2
Alexandre Belloni
maintainerPATCH v6 4/7 clocksource/drivers: atmel-pit: make option silent
In reply to Alexandre BelloniTo conform with the other option, make the ATMEL_PIT option silent so it can be selected from the platform
--- drivers/clocksource/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clocksource/Kconfig +4 -1
@@ -392,8 +392,11 @@ config ARMV7M_SYSTICK This options enables support for the ARMv7M system timer unit config ATMEL_PIT + bool "Microchip ARM Periodic Interval Timer (PIT)" if COMPILE_TEST select TIMER_OF if OF - def_bool SOC_AT91SAM9 || SOC_SAMA5 + help + This enables build of clocksource and clockevent driver for + the integrated PIT in Microchip ARM SoCs. config ATMEL_ST bool "Atmel ST timer support" if COMPILE_TEST
Signature · 1 line
2.19.0.rc2
Alexandre Belloni
maintainerPATCH v6 5/7 ARM: at91: Implement clocksource selection
In reply to Alexandre BelloniAllow selecting and unselecting the PIT clocksource driver so it doesn't have to be compile when unused.
--- arch/arm/mach-at91/Kconfig | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
arch/arm/mach-at91/Kconfig +25 -0
@@ -107,6 +107,31 @@ config SOC_AT91SAM9 AT91SAM9X35 AT91SAM9XE +comment "Clocksource driver selection" + +config ATMEL_CLOCKSOURCE_PIT + bool "Periodic Interval Timer (PIT) support" + depends on SOC_AT91SAM9 || SOC_SAMA5 + default SOC_AT91SAM9 || SOC_SAMA5 + select ATMEL_PIT + help + Select this to get a clocksource based on the Atmel Periodic Interval + Timer. It has a relatively low resolution and the TC Block clocksource + should be preferred. + +config ATMEL_CLOCKSOURCE_TCB + bool "Timer Counter Blocks (TCB) support" + depends on SOC_AT91RM9200 || SOC_AT91SAM9 || SOC_SAMA5 || COMPILE_TEST + default SOC_AT91RM9200 || SOC_AT91SAM9 || SOC_SAMA5 + depends on !ATMEL_TCLIB + select ATMEL_ARM_TCB_CLKSRC + help + Select this to get a high precision clocksource based on a + TC block with a 5+ MHz base clock rate. + On platforms with 16-bit counters, two timer channels are combined + to make a single 32-bit timer. + It can also be used as a clock event device supporting oneshot mode. + config HAVE_AT91_UTMI bool
Signature · 1 line
2.19.0.rc2
Alexandre Belloni
maintainerPATCH v6 6/7 ARM: configs: at91: use new TCB timer driver
In reply to Alexandre BelloniUnselecting ATMEL_TCLIB switches the TCB timer driver from tcb_clksrc to timer-atmel-tcb.
--- arch/arm/configs/at91_dt_defconfig | 1 - arch/arm/configs/sama5_defconfig | 1 - 2 files changed, 2 deletions(-)
arch/arm/configs/at91_dt_defconfig +0 -1
@@ -64,7 +64,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_TCLIB=y CONFIG_ATMEL_SSC=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y
arch/arm/configs/sama5_defconfig +0 -1
@@ -75,7 +75,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_TCLIB=y CONFIG_ATMEL_SSC=y CONFIG_EEPROM_AT24=y CONFIG_SCSI=y
Signature · 1 line
2.19.0.rc2
Alexandre Belloni
maintainerPATCH v6 7/7 ARM: configs: at91: unselect PIT
In reply to Alexandre BelloniThe PIT is not required anymore to successfully boot and may actually harm in case preempt-rt is used because the PIT interrupt is shared. Disable it so the TCB clocksource is used.
--- arch/arm/configs/at91_dt_defconfig | 1 + arch/arm/configs/sama5_defconfig | 1 + 2 files changed, 2 insertions(+)
arch/arm/configs/at91_dt_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_ARCH_MULTI_V5=y CONFIG_ARCH_AT91=y CONFIG_SOC_AT91RM9200=y CONFIG_SOC_AT91SAM9=y +# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set CONFIG_AEABI=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_ZBOOT_ROM_TEXT=0x0
arch/arm/configs/sama5_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_ARCH_AT91=y CONFIG_SOC_SAMA5D2=y CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y +# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set CONFIG_AEABI=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_ZBOOT_ROM_TEXT=0x0
Signature · 1 line
2.19.0.rc2