Skip to contentSkip to conversation

Add CPUidle support for Tegra210

PATCH Superseded Joseph Lo 3 participants 19 messages Feb 1, 2019 – Feb 19, 2019

Subsystems (4)

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Joseph Lo

author
#0 lore raw

v6 cover Add CPUidle support for Tegra210

This patch series adds CPUidle support for Tegra210, which supports power-down state (C7) for CPU cores. And due to arch timer cannot work across CPU core power-down and power on reset signal event. We introduce Tegra210 timer driver to work as clock event device. So it can be the wake-up source of CPU cores when they idled in the power-down state.

Fix in V6:
* refine the timer defines in the timer driver (PATCH 2)
* add ack tags from Jon Hunter.

Fixed in V5:
* Just resend this whole series again with timer and Tegra maintainers included

Fixed in V4:
* merge timer-tegra210.c into timer-tegra20.c
* add a new patch to select TEGRA_TIMER by default for Tegra210

Fixed in V3:
* use timer-of API for Tegra210 timer driver

Fixed in V2:
* list all the timer IRQs in the binding doc and dts file
* add error clean-up code in timer driver
* add entry-latency-us and exit-latency-us properties for idle-states DT node

Joseph Lo (7):
dt-bindings: timer: add Tegra210 timer
clocksource: tegra: add Tegra210 timer support soc/tegra: default select TEGRA_TIMER for Tegra210
arm64: dts: tegra210: fix timer node
arm64: dts: tegra210: add CPU idle states properties
arm64: dts: tegra210-p2180: Enable CPU idle support
arm64: dts: tegra210-smaug: Enable CPU idle support

 .../bindings/timer/nvidia,tegra210-timer.txt  |  36 ++
 .../arm64/boot/dts/nvidia/tegra210-p2180.dtsi |   6 +
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts |   7 +
 arch/arm64/boot/dts/nvidia/tegra210.dtsi      |  33 +-
 drivers/clocksource/Kconfig                   |   2 +-
 drivers/clocksource/timer-tegra20.c           | 371 +++++++++++++-----
 drivers/soc/tegra/Kconfig                     |   1 +
 include/linux/cpuhotplug.h                    |   1 +
 8 files changed, 350 insertions(+), 107 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra210-timer.txt
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH v6 1/7 dt-bindings: timer: add Tegra210 timer

The Tegra210 timer provides fourteen 29-bit timer counters and one 32-bit timestamp counter. The TMRs run at either a fixed 1 MHz clock rate derived from the oscillator clock (TMR0-TMR9) or directly at the oscillator clock (TMR10-TMR13). Each TMR can be programmed to generate one-shot periodic, or watchdog interrupts.

---
v6:
* add ack tag from Jon.
v5:
* no change
v4:
* no change
v3:
* no change
v2:
* list all the interrupts that are supported by tegra210 timers block
* add RB tag from Rob.

---
 .../bindings/timer/nvidia,tegra210-timer.txt  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra210-timer.txt
Documentation/devicetree/bindings/timer/nvidia,tegra210-timer.txt new file +36 -0
new file mode 100644
index 000000000000..032cda96fe0d
@@ -0,0 +1,36 @@
+NVIDIA Tegra210 timer
+
+The Tegra210 timer provides fourteen 29-bit timer counters and one 32-bit
+timestamp counter. The TMRs run at either a fixed 1 MHz clock rate derived
+from the oscillator clock (TMR0-TMR9) or directly at the oscillator clock
+(TMR10-TMR13). Each TMR can be programmed to generate one-shot, periodic,
+or watchdog interrupts.
+
+Required properties:
+- compatible : "nvidia,tegra210-timer".
+- reg : Specifies base physical address and size of the registers.
+- interrupts : A list of 14 interrupts; one per each timer channels 0 through
+  13.
+- clocks : Must contain one entry, for the module clock.
+  See ../clocks/clock-bindings.txt for details.
+
+timer@60005000 {
+	compatible = "nvidia,tegra210-timer";
+	reg = <0x0 0x60005000 0x0 0x400>;
+	interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>,
+		     <GIC_SPI 179 IRQ_TYPE_LEVEL_HIGH>;
+	clocks = <&tegra_car TEGRA210_CLK_TIMER>;
+	clock-names = "timer";
+};
Signature · 1 line
2.20.1
author
#2 lore raw

PATCH v6 2/7 clocksource: tegra: add Tegra210 timer support

In reply to Joseph Lo

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
* refine the timer defines
* add ack tag from Jon.
v5:
* add ack tag from Thierry
v4:
* merge timer-tegra210.c in previous version into timer-tegra20.c
v3:
* use timer-of API
v2:
* add error clean-up code

---
 drivers/clocksource/Kconfig         |   2 +-
 drivers/clocksource/timer-tegra20.c | 371 ++++++++++++++++++++--------
 include/linux/cpuhotplug.h          |   1 +
 3 files changed, 270 insertions(+), 104 deletions(-)
drivers/clocksource/Kconfig +1 -1
index a9e26f6a81a1..6af78534a285 100644
@@ -131,7 +131,7 @@ config SUN5I_HSTIMER
 config TEGRA_TIMER
 	bool "Tegra timer driver" if COMPILE_TEST
 	select CLKSRC_MMIO
-	depends on ARM
+	select TIMER_OF
 	help
 	  Enables support for the Tegra driver.
 
drivers/clocksource/timer-tegra20.c +268 -103

464 lines not on this page · raw message

include/linux/cpuhotplug.h +1 -0
index fd586d0301e7..e78281d07b70 100644
@@ -121,6 +121,7 @@ enum cpuhp_state {
 	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
 	CPUHP_AP_ARM_TWD_STARTING,
 	CPUHP_AP_QCOM_TIMER_STARTING,
+	CPUHP_AP_TEGRA_TIMER_STARTING,
 	CPUHP_AP_ARMADA_TIMER_STARTING,
 	CPUHP_AP_MARCO_TIMER_STARTING,
 	CPUHP_AP_MIPS_GIC_TIMER_STARTING,
Signature · 1 line
2.20.1
maintainer
#3 lore raw

Re: [PATCH V6 2/7] clocksource: tegra: add Tegra210 timer support

Quoted 99 lines · Joseph Lo

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
* refine the timer defines
* add ack tag from Jon.
v5:
* add ack tag from Thierry
v4:
* merge timer-tegra210.c in previous version into timer-tegra20.c
v3:
* use timer-of API
v2:
* add error clean-up code

---
 drivers/clocksource/Kconfig         |   2 +-
 drivers/clocksource/timer-tegra20.c | 371 ++++++++++++++++++++--------
 include/linux/cpuhotplug.h          |   1 +
 3 files changed, 270 insertions(+), 104 deletions(-)
drivers/clocksource/Kconfig +1 -1
index a9e26f6a81a1..6af78534a285 100644
@@ -131,7 +131,7 @@ config SUN5I_HSTIMER
 config TEGRA_TIMER
 	bool "Tegra timer driver" if COMPILE_TEST
 	select CLKSRC_MMIO
-	depends on ARM
+	select TIMER_OF
 	help
 	  Enables support for the Tegra driver.
 
drivers/clocksource/timer-tegra20.c +16 -17
index 4293943f4e2b..f66edd63d7f4 100644
@@ -15,21 +15,24 @@
  *
  */
 
-#include <linux/init.h>
+#include <linux/clk.h>
+#include <linux/clockchips.h>
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+#include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/time.h>
 #include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/clockchips.h>
-#include <linux/clocksource.h>
-#include <linux/clk.h>
-#include <linux/io.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
-#include <linux/sched_clock.h>
-#include <linux/delay.h>
+#include <linux/percpu.h>
+#include <linux/syscore_ops.h>
+#include <linux/time.h>
+
+#include "timer-of.h"
 
+#ifdef CONFIG_ARM
 #include <asm/mach/time.h>
+#endif
 
 #define RTC_SECONDS            0x08
 #define RTC_SHADOW_SECONDS     0x0c
@@ -39,74 +42,145 @@
 #define TIMERUS_USEC_CFG 0x14
 #define TIMERUS_CNTR_FREEZE 0x4c
 
-#define TIMER1_BASE 0x0
-#define TIMER2_BASE 0x8
-#define TIMER3_BASE 0x50
-#define TIMER4_BASE 0x58
-
-#define TIMER_PTV 0x0
-#define TIMER_PCR 0x4
-
+#define TIMER_PTV		0x0
+#define TIMER_PTV_EN		BIT(31)
+#define TIMER_PTV_PER		BIT(30)
+#define TIMER_PCR		0x4

drivers/clocksource/timer-tegra20.c line 58

Quoted 10 lines
drivers/clocksource/timer-tegra20.c +10 -0
+#define TIMER_PCR_INTR_CLR	BIT(30)
+
+#ifdef CONFIG_ARM
+#define TIMER_CPU0		0x50 /* TIMER3 */
+#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)

So maybe I was not being clear, but what I meant was you replace 'IRQ_IDX_FOR_CPU(cpu)' with 'TIMER_FOR_CPU(cpu), because technically, we just need to know the timer index being used for a given CPU to lookup the associated interrupt. And so I was suggesting you make a generic macro that could be used for both 32-bit and 64-bit ARM. However, given that currently we do not need/use this for 32-bit ARM it is really a mute point.

However, don't bother changing this now and you have included my ACK, so we are all good.

Thanks!
Jon

Signature · 1 line
nvpublic
author
#4 lore raw

Re: [PATCH V6 2/7] clocksource: tegra: add Tegra210 timer support

In reply to Joseph Lo

Hi Daniel & Thomas,

Do we have the chance to get this patch merged for K5.1?

Thanks,
Joseph

Quoted 530 lines · Joseph Lo

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
* refine the timer defines
* add ack tag from Jon.
v5:
* add ack tag from Thierry
v4:
* merge timer-tegra210.c in previous version into timer-tegra20.c
v3:
* use timer-of API
v2:
* add error clean-up code

---
  drivers/clocksource/Kconfig         |   2 +-
  drivers/clocksource/timer-tegra20.c | 371 ++++++++++++++++++++--------
  include/linux/cpuhotplug.h          |   1 +
  3 files changed, 270 insertions(+), 104 deletions(-)
drivers/clocksource/Kconfig +1 -1
index a9e26f6a81a1..6af78534a285 100644
@@ -131,7 +131,7 @@ config SUN5I_HSTIMER
  config TEGRA_TIMER
  	bool "Tegra timer driver" if COMPILE_TEST
  	select CLKSRC_MMIO
-	depends on ARM
+	select TIMER_OF
  	help
  	  Enables support for the Tegra driver.
 
drivers/clocksource/timer-tegra20.c +268 -103
index 4293943f4e2b..f66edd63d7f4 100644
@@ -15,21 +15,24 @@
   *
   */
 
-#include <linux/init.h>
+#include <linux/clk.h>
+#include <linux/clockchips.h>
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+#include <linux/delay.h>
  #include <linux/err.h>
-#include <linux/time.h>
  #include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/clockchips.h>
-#include <linux/clocksource.h>
-#include <linux/clk.h>
-#include <linux/io.h>
  #include <linux/of_address.h>
  #include <linux/of_irq.h>
-#include <linux/sched_clock.h>
-#include <linux/delay.h>
+#include <linux/percpu.h>
+#include <linux/syscore_ops.h>
+#include <linux/time.h>
+
+#include "timer-of.h"
 
+#ifdef CONFIG_ARM
  #include <asm/mach/time.h>
+#endif
 
  #define RTC_SECONDS            0x08
  #define RTC_SHADOW_SECONDS     0x0c
@@ -39,74 +42,145 @@
  #define TIMERUS_USEC_CFG 0x14
  #define TIMERUS_CNTR_FREEZE 0x4c
 
-#define TIMER1_BASE 0x0
-#define TIMER2_BASE 0x8
-#define TIMER3_BASE 0x50
-#define TIMER4_BASE 0x58
-
-#define TIMER_PTV 0x0
-#define TIMER_PCR 0x4
-
+#define TIMER_PTV		0x0
+#define TIMER_PTV_EN		BIT(31)
+#define TIMER_PTV_PER		BIT(30)
+#define TIMER_PCR		0x4
+#define TIMER_PCR_INTR_CLR	BIT(30)
+
+#ifdef CONFIG_ARM
+#define TIMER_CPU0		0x50 /* TIMER3 */
+#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)
+
+static u32 usec_config;
  static void __iomem *timer_reg_base;
+#ifdef CONFIG_ARM
  static void __iomem *rtc_base;
-
  static struct timespec64 persistent_ts;
  static u64 persistent_ms, last_persistent_ms;
-
  static struct delay_timer tegra_delay_timer;
-
-#define timer_writel(value, reg) \
-	writel_relaxed(value, timer_reg_base + (reg))
-#define timer_readl(reg) \
-	readl_relaxed(timer_reg_base + (reg))
+#endif
 
  static int tegra_timer_set_next_event(unsigned long cycles,
  					 struct clock_event_device *evt)
  {
-	u32 reg;
+	void __iomem *reg_base = timer_of_base(to_timer_of(evt));
 
-	reg = 0x80000000 | ((cycles > 1) ? (cycles-1) : 0);
-	timer_writel(reg, TIMER3_BASE + TIMER_PTV);
+	writel(TIMER_PTV_EN |
+	       ((cycles > 1) ? (cycles - 1) : 0), /* n+1 scheme */
+	       reg_base + TIMER_PTV);
 
  	return 0;
  }
 
-static inline void timer_shutdown(struct clock_event_device *evt)
+static int tegra_timer_shutdown(struct clock_event_device *evt)
  {
-	timer_writel(0, TIMER3_BASE + TIMER_PTV);
+	void __iomem *reg_base = timer_of_base(to_timer_of(evt));
+
+	writel(0, reg_base + TIMER_PTV);
+
+	return 0;
  }
 
-static int tegra_timer_shutdown(struct clock_event_device *evt)
+static int tegra_timer_set_periodic(struct clock_event_device *evt)
  {
-	timer_shutdown(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);
+
  	return 0;
  }
 
-static int tegra_timer_set_periodic(struct clock_event_device *evt)
+static irqreturn_t tegra_timer_isr(int irq, void *dev_id)
  {
-	u32 reg = 0xC0000000 | ((1000000 / HZ) - 1);
+	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);
+	evt->event_handler(evt);
+
+	return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_ARM64
+static DEFINE_PER_CPU(struct timer_of, tegra_to) = {
+	.flags = TIMER_OF_CLOCK | TIMER_OF_BASE,
+
+	.clkevt = {
+		.name = "tegra_timer",
+		.rating = 460,
+		.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+		.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,
+	},
+};
+
+static int tegra_timer_setup(unsigned int cpu)
+{
+	struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+
+	irq_force_affinity(to->clkevt.irq, cpumask_of(cpu));
+	enable_irq(to->clkevt.irq);
+
+	clockevents_config_and_register(&to->clkevt, timer_of_rate(to),
+					1, /* min */
+					0x1fffffff); /* 29 bits */
 
-	timer_shutdown(evt);
-	timer_writel(reg, TIMER3_BASE + TIMER_PTV);
  	return 0;
  }
 
-static struct clock_event_device tegra_clockevent = {
-	.name			= "timer0",
-	.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,
+static int tegra_timer_stop(unsigned int cpu)
+{
+	struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+
+	to->clkevt.set_state_shutdown(&to->clkevt);
+	disable_irq_nosync(to->clkevt.irq);
+
+	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,
+		.cpumask = cpu_possible_mask,
+	},
+
+	.of_irq = {
+		.index = 2,
+		.flags = IRQF_TIMER | IRQF_TRIGGER_HIGH,
+		.handler = tegra_timer_isr,
+	},
  };
 
  static u64 notrace tegra_read_sched_clock(void)
  {
-	return timer_readl(TIMERUS_CNTR_1US);
+	return readl(timer_reg_base + TIMERUS_CNTR_1US);
+}
+
+static unsigned long tegra_delay_timer_read_counter_long(void)
+{
+	return readl(timer_reg_base + TIMERUS_CNTR_1US);
  }
 
  /*
@@ -143,98 +217,188 @@ static void tegra_read_persistent_clock64(struct timespec64 *ts)
  	timespec64_add_ns(&persistent_ts, delta * NSEC_PER_MSEC);
  	*ts = persistent_ts;
  }
+#endif
 
-static unsigned long tegra_delay_timer_read_counter_long(void)
+static int tegra_timer_suspend(void)
  {
-	return readl(timer_reg_base + TIMERUS_CNTR_1US);
+#ifdef CONFIG_ARM64
+	int cpu;
+
+	for_each_possible_cpu(cpu) {
+		struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+		void __iomem *reg_base = timer_of_base(to);
+
+		writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+	}
+#else
+	void __iomem *reg_base = timer_of_base(&tegra_to);
+
+	writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+#endif
+
+	return 0;
  }
 
-static irqreturn_t tegra_timer_interrupt(int irq, void *dev_id)
+static void tegra_timer_resume(void)
  {
-	struct clock_event_device *evt = (struct clock_event_device *)dev_id;
-	timer_writel(1<<30, TIMER3_BASE + TIMER_PCR);
-	evt->event_handler(evt);
-	return IRQ_HANDLED;
+	writel(usec_config, timer_reg_base + TIMERUS_USEC_CFG);
  }
 
-static struct irqaction tegra_timer_irq = {
-	.name		= "timer0",
-	.flags		= IRQF_TIMER | IRQF_TRIGGER_HIGH,
-	.handler	= tegra_timer_interrupt,
-	.dev_id		= &tegra_clockevent,
+static struct syscore_ops tegra_timer_syscore_ops = {
+	.suspend = tegra_timer_suspend,
+	.resume = tegra_timer_resume,
  };
 
-static int __init tegra20_init_timer(struct device_node *np)
+static int tegra_timer_init(struct device_node *np, struct timer_of *to)
  {
-	struct clk *clk;
-	unsigned long rate;
-	int ret;
+	int ret = 0;
 
-	timer_reg_base = of_iomap(np, 0);
-	if (!timer_reg_base) {
-		pr_err("Can't map timer registers\n");
-		return -ENXIO;
-	}
+	ret = timer_of_init(np, to);
+	if (ret < 0)
+		goto out;
 
-	tegra_timer_irq.irq = irq_of_parse_and_map(np, 2);
-	if (tegra_timer_irq.irq <= 0) {
-		pr_err("Failed to map timer IRQ\n");
-		return -EINVAL;
-	}
+	timer_reg_base = timer_of_base(to);
 
-	clk = of_clk_get(np, 0);
-	if (IS_ERR(clk)) {
-		pr_warn("Unable to get timer clock. Assuming 12Mhz input clock.\n");
-		rate = 12000000;
-	} else {
-		clk_prepare_enable(clk);
-		rate = clk_get_rate(clk);
-	}
-
-	switch (rate) {
+	/*
+	 * Configure microsecond timers to have 1MHz clock
+	 * Config register is 0xqqww, where qq is "dividend", ww is "divisor"
+	 * Uses n+1 scheme
+	 */
+	switch (timer_of_rate(to)) {
  	case 12000000:
-		timer_writel(0x000b, TIMERUS_USEC_CFG);
+		usec_config = 0x000b; /* (11+1)/(0+1) */
+		break;
+	case 12800000:
+		usec_config = 0x043f; /* (63+1)/(4+1) */
  		break;
  	case 13000000:
-		timer_writel(0x000c, TIMERUS_USEC_CFG);
+		usec_config = 0x000c; /* (12+1)/(0+1) */
+		break;
+	case 16800000:
+		usec_config = 0x0453; /* (83+1)/(4+1) */
  		break;
  	case 19200000:
-		timer_writel(0x045f, TIMERUS_USEC_CFG);
+		usec_config = 0x045f; /* (95+1)/(4+1) */
  		break;
  	case 26000000:
-		timer_writel(0x0019, TIMERUS_USEC_CFG);
+		usec_config = 0x0019; /* (25+1)/(0+1) */
+		break;
+	case 38400000:
+		usec_config = 0x04bf; /* (191+1)/(4+1) */
+		break;
+	case 48000000:
+		usec_config = 0x002f; /* (47+1)/(0+1) */
  		break;
  	default:
-		WARN(1, "Unknown clock rate");
+		ret = -EINVAL;
+		goto out;
+	}
+
+	writel(usec_config, timer_of_base(to) + TIMERUS_USEC_CFG);
+
+	register_syscore_ops(&tegra_timer_syscore_ops);
+out:
+	return ret;
+}
+
+#ifdef CONFIG_ARM64
+static int __init tegra210_timer_init(struct device_node *np)
+{
+	int cpu, ret = 0;
+	struct timer_of *to;
+
+	to = this_cpu_ptr(&tegra_to);
+	ret = tegra_timer_init(np, to);
+	if (ret < 0)
+		goto out;
+
+	for_each_possible_cpu(cpu) {
+		struct timer_of *cpu_to;
+
+		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));
+		if (!cpu_to->clkevt.irq) {
+			pr_err("%s: can't map IRQ for CPU%d\n",
+			       __func__, cpu);
+			ret = -EINVAL;
+			goto out;
+		}
+
+		irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN);
+		ret = request_irq(cpu_to->clkevt.irq, tegra_timer_isr,
+				  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);
+			ret = -EINVAL;
+			goto out_irq;
+		}
+	}
+
+	cpuhp_setup_state(CPUHP_AP_TEGRA_TIMER_STARTING,
+			  "AP_TEGRA_TIMER_STARTING", tegra_timer_setup,
+			  tegra_timer_stop);
+
+	return ret;
+
+out_irq:
+	for_each_possible_cpu(cpu) {
+		struct timer_of *cpu_to;
+
+		cpu_to = per_cpu_ptr(&tegra_to, cpu);
+		if (cpu_to->clkevt.irq) {
+			free_irq(cpu_to->clkevt.irq, &cpu_to->clkevt);
+			irq_dispose_mapping(cpu_to->clkevt.irq);
+		}
  	}
+out:
+	timer_of_cleanup(to);
+	return ret;
+}
+TIMER_OF_DECLARE(tegra210_timer, "nvidia,tegra210-timer", tegra210_timer_init);
+#else /* CONFIG_ARM */
+static int __init tegra20_init_timer(struct device_node *np)
+{
+	int ret = 0;
+
+	ret = tegra_timer_init(np, &tegra_to);
+	if (ret < 0)
+		goto out;
 
-	sched_clock_register(tegra_read_sched_clock, 32, 1000000);
+	tegra_to.of_base.base = timer_reg_base + TIMER_BASE_FOR_CPU(0);
+	tegra_to.of_clk.rate = 1000000; /* microsecond timer */
 
+	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", 1000000, 300, 32,
-				    clocksource_mmio_readl_up);
+				    "timer_us", timer_of_rate(&tegra_to),
+				    300, 32, clocksource_mmio_readl_up);
  	if (ret) {
  		pr_err("Failed to register clocksource\n");
-		return ret;
+		goto out;
  	}
 
  	tegra_delay_timer.read_current_timer =
  			tegra_delay_timer_read_counter_long;
-	tegra_delay_timer.freq = 1000000;
+	tegra_delay_timer.freq = timer_of_rate(&tegra_to);
  	register_current_timer_delay(&tegra_delay_timer);
 
-	ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq);
-	if (ret) {
-		pr_err("Failed to register timer IRQ: %d\n", ret);
-		return ret;
-	}
+	clockevents_config_and_register(&tegra_to.clkevt,
+					timer_of_rate(&tegra_to),
+					0x1,
+					0x1fffffff);
 
-	tegra_clockevent.cpumask = cpu_possible_mask;
-	tegra_clockevent.irq = tegra_timer_irq.irq;
-	clockevents_config_and_register(&tegra_clockevent, 1000000,
-					0x1, 0x1fffffff);
+	return ret;
+out:
+	timer_of_cleanup(&tegra_to);
 
-	return 0;
+	return ret;
  }
  TIMER_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer);
 
@@ -261,3 +425,4 @@ static int __init tegra20_init_rtc(struct device_node *np)
  	return register_persistent_clock(tegra_read_persistent_clock64);
  }
  TIMER_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);
+#endif
include/linux/cpuhotplug.h +1 -0
index fd586d0301e7..e78281d07b70 100644
@@ -121,6 +121,7 @@ enum cpuhp_state {
  	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
  	CPUHP_AP_ARM_TWD_STARTING,
  	CPUHP_AP_QCOM_TIMER_STARTING,
+	CPUHP_AP_TEGRA_TIMER_STARTING,
  	CPUHP_AP_ARMADA_TIMER_STARTING,
  	CPUHP_AP_MARCO_TIMER_STARTING,
  	CPUHP_AP_MIPS_GIC_TIMER_STARTING,
#5 lore raw

Re: [PATCH V6 2/7] clocksource: tegra: add Tegra210 timer support

Quoted 3 lines · Joseph Lo

Hi Daniel & Thomas,

Do we have the chance to get this patch merged for K5.1?

Hi Jospeh,

sorry for the delay, I was overbooked these past two weeks.

Overall it looks ok but give me a couple of days to review the driver more deeply.

Quoted 512 lines · Joseph Lo
Quoted 511 lines

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up
source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
  * refine the timer defines
  * add ack tag from Jon.
v5:
  * add ack tag from Thierry
v4:
  * merge timer-tegra210.c in previous version into timer-tegra20.c v3:
  * use timer-of API
v2:
  * add error clean-up code
---
  drivers/clocksource/Kconfig         |   2 +- drivers/clocksource/timer-tegra20.c | 371 ++++++++++++++++++++-------- include/linux/cpuhotplug.h          |   1 +

  3 files changed, 270 insertions(+), 104 deletions(-)
drivers/clocksource/Kconfig +0 -0
index a9e26f6a81a1..6af78534a285 100644
@@ -131,7 +131,7 @@ config SUN5I_HSTIMER

  config TEGRA_TIMER
      bool "Tegra timer driver" if COMPILE_TEST select CLKSRC_MMIO
-    depends on ARM
+    select TIMER_OF
      help
        Enables support for the Tegra driver. diff --git a/drivers/clocksource/timer-tegra20.c b/drivers/clocksource/timer-tegra20.c index 4293943f4e2b..f66edd63d7f4 100644

drivers/clocksource/timer-tegra20.c +0 -0
@@ -15,21 +15,24 @@
    *
    */

  -#include <linux/init.h>

drivers/clocksource/timer-tegra20.c +5 -0
+#include <linux/clk.h>
+#include <linux/clockchips.h>
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+#include <linux/delay.h>

  #include <linux/err.h>
-#include <linux/time.h>
  #include <linux/interrupt.h>

drivers/clocksource/timer-tegra20.c +0 -5
-#include <linux/irq.h>
-#include <linux/clockchips.h>
-#include <linux/clocksource.h>
-#include <linux/clk.h>
-#include <linux/io.h>

  #include <linux/of_address.h>
  #include <linux/of_irq.h>

drivers/clocksource/timer-tegra20.c +5 -2
-#include <linux/sched_clock.h>
-#include <linux/delay.h>
+#include <linux/percpu.h>
+#include <linux/syscore_ops.h>
+#include <linux/time.h>
+
+#include "timer-of.h"

  +#ifdef CONFIG_ARM
  #include <asm/mach/time.h>
+#endif
    #define RTC_SECONDS            0x08
  #define RTC_SHADOW_SECONDS     0x0c

drivers/clocksource/timer-tegra20.c +0 -0
@@ -39,74 +42,145 @@
   #define TIMERUS_USEC_CFG 0x14
   #define TIMERUS_CNTR_FREEZE 0x4c

  -#define TIMER1_BASE 0x0

drivers/clocksource/timer-tegra20.c +16 -7
-#define TIMER2_BASE 0x8
-#define TIMER3_BASE 0x50
-#define TIMER4_BASE 0x58
-
-#define TIMER_PTV 0x0
-#define TIMER_PCR 0x4
-
+#define TIMER_PTV        0x0
+#define TIMER_PTV_EN        BIT(31)
+#define TIMER_PTV_PER        BIT(30)
+#define TIMER_PCR        0x4
+#define TIMER_PCR_INTR_CLR    BIT(30)
+
+#ifdef CONFIG_ARM
+#define TIMER_CPU0        0x50 /* TIMER3 */
+#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)
+
+static u32 usec_config;

  static void __iomem *timer_reg_base;
+#ifdef CONFIG_ARM
  static void __iomem *rtc_base;
-
  static struct timespec64 persistent_ts;
  static u64 persistent_ms, last_persistent_ms;
-
  static struct delay_timer tegra_delay_timer;

drivers/clocksource/timer-tegra20.c +1 -5
-
-#define timer_writel(value, reg) \
-    writel_relaxed(value, timer_reg_base + (reg))
-#define timer_readl(reg) \
-    readl_relaxed(timer_reg_base + (reg))
+#endif

    static int tegra_timer_set_next_event(unsigned long cycles, struct clock_event_device *evt)
  {
-    u32 reg;
+    void __iomem *reg_base = timer_of_base(to_timer_of(evt)); -    reg = 0x80000000 | ((cycles > 1) ? (cycles-1) : 0); -    timer_writel(reg, TIMER3_BASE + TIMER_PTV);
+    writel(TIMER_PTV_EN |
+           ((cycles > 1) ? (cycles - 1) : 0), /* n+1 scheme */ +           reg_base + TIMER_PTV);
        return 0;
  }
  -static inline void timer_shutdown(struct clock_event_device *evt) +static int tegra_timer_shutdown(struct clock_event_device *evt) {
-    timer_writel(0, TIMER3_BASE + TIMER_PTV);
+    void __iomem *reg_base = timer_of_base(to_timer_of(evt));

drivers/clocksource/timer-tegra20.c +4 -0
+
+    writel(0, reg_base + TIMER_PTV);
+
+    return 0;

  }
  -static int tegra_timer_shutdown(struct clock_event_device *evt) +static int tegra_timer_set_periodic(struct clock_event_device *evt) {
-    timer_shutdown(evt);
+    void __iomem *reg_base = timer_of_base(to_timer_of(evt));

drivers/clocksource/timer-tegra20.c +5 -0
+
+    writel(TIMER_PTV_EN | TIMER_PTV_PER |
+           ((timer_of_rate(to_timer_of(evt)) / HZ) - 1),
+           reg_base + TIMER_PTV);
+

      return 0;
  }
  -static int tegra_timer_set_periodic(struct clock_event_device *evt) +static irqreturn_t tegra_timer_isr(int irq, void *dev_id) {
-    u32 reg = 0xC0000000 | ((1000000 / HZ) - 1);
+    struct clock_event_device *evt = (struct clock_event_device *)dev_id;
+    void __iomem *reg_base = timer_of_base(to_timer_of(evt));

drivers/clocksource/timer-tegra20.c +33 -0
+
+    writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+    evt->event_handler(evt);
+
+    return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_ARM64
+static DEFINE_PER_CPU(struct timer_of, tegra_to) = {
+    .flags = TIMER_OF_CLOCK | TIMER_OF_BASE,
+
+    .clkevt = {
+        .name = "tegra_timer",
+        .rating = 460,
+        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+        .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,
+    },
+};
+
+static int tegra_timer_setup(unsigned int cpu)
+{
+    struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+
+    irq_force_affinity(to->clkevt.irq, cpumask_of(cpu));
+    enable_irq(to->clkevt.irq);
+
+    clockevents_config_and_register(&to->clkevt, timer_of_rate(to),
+                    1, /* min */
+                    0x1fffffff); /* 29 bits */

  -    timer_shutdown(evt);
-    timer_writel(reg, TIMER3_BASE + TIMER_PTV); return 0;
  }
  -static struct clock_event_device tegra_clockevent = { -    .name            = "timer0",
-    .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,

drivers/clocksource/timer-tegra20.c +32 -0
+static int tegra_timer_stop(unsigned int cpu)
+{
+    struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+
+    to->clkevt.set_state_shutdown(&to->clkevt);
+    disable_irq_nosync(to->clkevt.irq);
+
+    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,
+        .cpumask = cpu_possible_mask,
+    },
+
+    .of_irq = {
+        .index = 2,
+        .flags = IRQF_TIMER | IRQF_TRIGGER_HIGH,
+        .handler = tegra_timer_isr,
+    },

  };
    static u64 notrace tegra_read_sched_clock(void) {
-    return timer_readl(TIMERUS_CNTR_1US);
+    return readl(timer_reg_base + TIMERUS_CNTR_1US);

drivers/clocksource/timer-tegra20.c +5 -0
+}
+
+static unsigned long tegra_delay_timer_read_counter_long(void)
+{
+    return readl(timer_reg_base + TIMERUS_CNTR_1US);

  }
    /*

drivers/clocksource/timer-tegra20.c +32 -29
@@ -143,98 +217,188 @@ static void
 tegra_read_persistent_clock64(struct timespec64 *ts)
       timespec64_add_ns(&persistent_ts, delta * NSEC_PER_MSEC);
       *ts = persistent_ts;
   }
+#endif
   -static unsigned long tegra_delay_timer_read_counter_long(void)
+static int tegra_timer_suspend(void)
   {
-    return readl(timer_reg_base + TIMERUS_CNTR_1US);
+#ifdef CONFIG_ARM64
+    int cpu;
+
+    for_each_possible_cpu(cpu) {
+        struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+        void __iomem *reg_base = timer_of_base(to);
+
+        writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+    }
+#else
+    void __iomem *reg_base = timer_of_base(&tegra_to);
+
+    writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+#endif
+
+    return 0;
   }
   -static irqreturn_t tegra_timer_interrupt(int irq, void *dev_id)
+static void tegra_timer_resume(void)
   {
-    struct clock_event_device *evt = (struct clock_event_device
 *)dev_id;
-    timer_writel(1<<30, TIMER3_BASE + TIMER_PCR);
-    evt->event_handler(evt);
-    return IRQ_HANDLED;
+    writel(usec_config, timer_reg_base + TIMERUS_USEC_CFG);
   }
   -static struct irqaction tegra_timer_irq = {
-    .name        = "timer0",
-    .flags        = IRQF_TIMER | IRQF_TRIGGER_HIGH,
-    .handler    = tegra_timer_interrupt,
-    .dev_id        = &tegra_clockevent,
+static struct syscore_ops tegra_timer_syscore_ops = {
+    .suspend = tegra_timer_suspend,
+    .resume = tegra_timer_resume,
   };
   -static int __init tegra20_init_timer(struct device_node *np)
+static int tegra_timer_init(struct device_node *np, struct timer_of *to)
   {
-    struct clk *clk;
-    unsigned long rate;
-    int ret;
+    int ret = 0;
   -    timer_reg_base = of_iomap(np, 0);
-    if (!timer_reg_base) {
-        pr_err("Can't map timer registers\n");
-        return -ENXIO;
-    }
+    ret = timer_of_init(np, to);
+    if (ret < 0)
+        goto out;
   -    tegra_timer_irq.irq = irq_of_parse_and_map(np, 2);
-    if (tegra_timer_irq.irq <= 0) {
-        pr_err("Failed to map timer IRQ\n");
-        return -EINVAL;
-    }
+    timer_reg_base = timer_of_base(to);
   -    clk = of_clk_get(np, 0);
-    if (IS_ERR(clk)) {
-        pr_warn("Unable to get timer clock. Assuming 12Mhz input
 clock.\n");
-        rate = 12000000;
-    } else {
-        clk_prepare_enable(clk);
-        rate = clk_get_rate(clk);
-    }
-
-    switch (rate) {
+    /*
+     * Configure microsecond timers to have 1MHz clock
+     * Config register is 0xqqww, where qq is "dividend", ww is

"divisor"
+     * Uses n+1 scheme
+     */
+    switch (timer_of_rate(to)) {
      case 12000000:
-        timer_writel(0x000b, TIMERUS_USEC_CFG); +        usec_config = 0x000b; /* (11+1)/(0+1) */ +        break;
+    case 12800000:
+        usec_config = 0x043f; /* (63+1)/(4+1) */ break;
      case 13000000:
-        timer_writel(0x000c, TIMERUS_USEC_CFG); +        usec_config = 0x000c; /* (12+1)/(0+1) */ +        break;
+    case 16800000:
+        usec_config = 0x0453; /* (83+1)/(4+1) */ break;
      case 19200000:
-        timer_writel(0x045f, TIMERUS_USEC_CFG); +        usec_config = 0x045f; /* (95+1)/(4+1) */ break;
      case 26000000:
-        timer_writel(0x0019, TIMERUS_USEC_CFG); +        usec_config = 0x0019; /* (25+1)/(0+1) */ +        break;
+    case 38400000:
+        usec_config = 0x04bf; /* (191+1)/(4+1) */ +        break;
+    case 48000000:
+        usec_config = 0x002f; /* (47+1)/(0+1) */ break;
      default:
-        WARN(1, "Unknown clock rate");
+        ret = -EINVAL;
+        goto out;
+    }

drivers/clocksource/timer-tegra20.c +63 -0
+
+    writel(usec_config, timer_of_base(to) + TIMERUS_USEC_CFG);
+
+    register_syscore_ops(&tegra_timer_syscore_ops);
+out:
+    return ret;
+}
+
+#ifdef CONFIG_ARM64
+static int __init tegra210_timer_init(struct device_node *np)
+{
+    int cpu, ret = 0;
+    struct timer_of *to;
+
+    to = this_cpu_ptr(&tegra_to);
+    ret = tegra_timer_init(np, to);
+    if (ret < 0)
+        goto out;
+
+    for_each_possible_cpu(cpu) {
+        struct timer_of *cpu_to;
+
+        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));
+        if (!cpu_to->clkevt.irq) {
+            pr_err("%s: can't map IRQ for CPU%d\n",
+                   __func__, cpu);
+            ret = -EINVAL;
+            goto out;
+        }
+
+        irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN);
+        ret = request_irq(cpu_to->clkevt.irq, tegra_timer_isr,
+                  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);
+            ret = -EINVAL;
+            goto out_irq;
+        }
+    }
+
+    cpuhp_setup_state(CPUHP_AP_TEGRA_TIMER_STARTING,
+              "AP_TEGRA_TIMER_STARTING", tegra_timer_setup,
+              tegra_timer_stop);
+
+    return ret;
+
+out_irq:
+    for_each_possible_cpu(cpu) {
+        struct timer_of *cpu_to;
+
+        cpu_to = per_cpu_ptr(&tegra_to, cpu);
+        if (cpu_to->clkevt.irq) {
+            free_irq(cpu_to->clkevt.irq, &cpu_to->clkevt);
+            irq_dispose_mapping(cpu_to->clkevt.irq);
+        }

      }

drivers/clocksource/timer-tegra20.c +5 -0
+out:
+    timer_of_cleanup(to);
+    return ret;
+}
+TIMER_OF_DECLARE(tegra210_timer, "nvidia,tegra210-timer",

tegra210_timer_init);

drivers/clocksource/timer-tegra20.c +8 -0
+#else /* CONFIG_ARM */
+static int __init tegra20_init_timer(struct device_node *np)
+{
+    int ret = 0;
+
+    ret = tegra_timer_init(np, &tegra_to);
+    if (ret < 0)
+        goto out;

  -    sched_clock_register(tegra_read_sched_clock, 32, 1000000); +    tegra_to.of_base.base = timer_reg_base + TIMER_BASE_FOR_CPU(0); +    tegra_to.of_clk.rate = 1000000; /* microsecond timer */ +    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", 1000000, 300, 32,
-                    clocksource_mmio_readl_up);
+                    "timer_us", timer_of_rate(&tegra_to),
+                    300, 32, clocksource_mmio_readl_up);
      if (ret) {
          pr_err("Failed to register clocksource\n");
-        return ret;
+        goto out;
      }
        tegra_delay_timer.read_current_timer = tegra_delay_timer_read_counter_long;
-    tegra_delay_timer.freq = 1000000;
+    tegra_delay_timer.freq = timer_of_rate(&tegra_to); register_current_timer_delay(&tegra_delay_timer);
  -    ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq); -    if (ret) {
-        pr_err("Failed to register timer IRQ: %d\n", ret); -        return ret;
-    }
+    clockevents_config_and_register(&tegra_to.clkevt,
+                    timer_of_rate(&tegra_to),
+                    0x1,
+                    0x1fffffff);
  -    tegra_clockevent.cpumask = cpu_possible_mask;
-    tegra_clockevent.irq = tegra_timer_irq.irq;
-    clockevents_config_and_register(&tegra_clockevent, 1000000, -                    0x1, 0x1fffffff);
+    return ret;
+out:
+    timer_of_cleanup(&tegra_to);
  -    return 0;
+    return ret;
  }
  TIMER_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer);
  @@ -261,3 +425,4 @@ static int __init tegra20_init_rtc(struct device_node *np)
      return register_persistent_clock(tegra_read_persistent_clock64); }
  TIMER_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);

drivers/clocksource/timer-tegra20.c +1 -0
+#endif
include/linux/cpuhotplug.h +1 -0
index fd586d0301e7..e78281d07b70 100644
@@ -121,6 +121,7 @@ enum cpuhp_state {
       CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
       CPUHP_AP_ARM_TWD_STARTING,
       CPUHP_AP_QCOM_TIMER_STARTING,
+    CPUHP_AP_TEGRA_TIMER_STARTING,
       CPUHP_AP_ARMADA_TIMER_STARTING,
       CPUHP_AP_MARCO_TIMER_STARTING,
       CPUHP_AP_MIPS_GIC_TIMER_STARTING,
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
author
#6 lore raw

Re: [PATCH V6 2/7] clocksource: tegra: add Tegra210 timer support

Quoted 11 lines · Daniel Lezcano
Quoted 3 lines · Joseph Lo

Hi Daniel & Thomas,

Do we have the chance to get this patch merged for K5.1?

Hi Jospeh,

sorry for the delay, I was overbooked these past two weeks.

Overall it looks ok but give me a couple of days to review the driver more deeply.

No problem, thanks.

Quoted 516 lines
Quoted 514 lines · Joseph Lo
Quoted 511 lines

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up
source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
  * refine the timer defines
  * add ack tag from Jon.
v5:
  * add ack tag from Thierry
v4:
  * merge timer-tegra210.c in previous version into timer-tegra20.c
v3:
  * use timer-of API
v2:
  * add error clean-up code

---
   drivers/clocksource/Kconfig         |   2 +-
   drivers/clocksource/timer-tegra20.c | 371 ++++++++++++++++++++--------
   include/linux/cpuhotplug.h          |   1 +
   3 files changed, 270 insertions(+), 104 deletions(-)
drivers/clocksource/Kconfig +1 -1
index a9e26f6a81a1..6af78534a285 100644
@@ -131,7 +131,7 @@ config SUN5I_HSTIMER
   config TEGRA_TIMER
       bool "Tegra timer driver" if COMPILE_TEST
       select CLKSRC_MMIO
-    depends on ARM
+    select TIMER_OF
       help
         Enables support for the Tegra driver.
   diff --git a/drivers/clocksource/timer-tegra20.c

b/drivers/clocksource/timer-tegra20.c
index 4293943f4e2b..f66edd63d7f4 100644

drivers/clocksource/timer-tegra20.c +152 -68
@@ -15,21 +15,24 @@
    *
    */
   -#include <linux/init.h>
+#include <linux/clk.h>
+#include <linux/clockchips.h>
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+#include <linux/delay.h>
   #include <linux/err.h>
-#include <linux/time.h>
   #include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/clockchips.h>
-#include <linux/clocksource.h>
-#include <linux/clk.h>
-#include <linux/io.h>
   #include <linux/of_address.h>
   #include <linux/of_irq.h>
-#include <linux/sched_clock.h>
-#include <linux/delay.h>
+#include <linux/percpu.h>
+#include <linux/syscore_ops.h>
+#include <linux/time.h>
+
+#include "timer-of.h"
   +#ifdef CONFIG_ARM
   #include <asm/mach/time.h>
+#endif
     #define RTC_SECONDS            0x08
   #define RTC_SHADOW_SECONDS     0x0c
@@ -39,74 +42,145 @@
   #define TIMERUS_USEC_CFG 0x14
   #define TIMERUS_CNTR_FREEZE 0x4c
   -#define TIMER1_BASE 0x0
-#define TIMER2_BASE 0x8
-#define TIMER3_BASE 0x50
-#define TIMER4_BASE 0x58
-
-#define TIMER_PTV 0x0
-#define TIMER_PCR 0x4
-
+#define TIMER_PTV        0x0
+#define TIMER_PTV_EN        BIT(31)
+#define TIMER_PTV_PER        BIT(30)
+#define TIMER_PCR        0x4
+#define TIMER_PCR_INTR_CLR    BIT(30)
+
+#ifdef CONFIG_ARM
+#define TIMER_CPU0        0x50 /* TIMER3 */
+#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)
+
+static u32 usec_config;
   static void __iomem *timer_reg_base;
+#ifdef CONFIG_ARM
   static void __iomem *rtc_base;
-
   static struct timespec64 persistent_ts;
   static u64 persistent_ms, last_persistent_ms;
-
   static struct delay_timer tegra_delay_timer;
-
-#define timer_writel(value, reg) \
-    writel_relaxed(value, timer_reg_base + (reg))
-#define timer_readl(reg) \
-    readl_relaxed(timer_reg_base + (reg))
+#endif
     static int tegra_timer_set_next_event(unsigned long cycles,
                        struct clock_event_device *evt)
   {
-    u32 reg;
+    void __iomem *reg_base = timer_of_base(to_timer_of(evt));
   -    reg = 0x80000000 | ((cycles > 1) ? (cycles-1) : 0);
-    timer_writel(reg, TIMER3_BASE + TIMER_PTV);
+    writel(TIMER_PTV_EN |
+           ((cycles > 1) ? (cycles - 1) : 0), /* n+1 scheme */
+           reg_base + TIMER_PTV);
         return 0;
   }
   -static inline void timer_shutdown(struct clock_event_device *evt)
+static int tegra_timer_shutdown(struct clock_event_device *evt)
   {
-    timer_writel(0, TIMER3_BASE + TIMER_PTV);
+    void __iomem *reg_base = timer_of_base(to_timer_of(evt));
+
+    writel(0, reg_base + TIMER_PTV);
+
+    return 0;
   }
   -static int tegra_timer_shutdown(struct clock_event_device *evt)
+static int tegra_timer_set_periodic(struct clock_event_device *evt)
   {
-    timer_shutdown(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);
+
       return 0;
   }
   -static int tegra_timer_set_periodic(struct clock_event_device *evt)
+static irqreturn_t tegra_timer_isr(int irq, void *dev_id)
   {
-    u32 reg = 0xC0000000 | ((1000000 / HZ) - 1);
+    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);
+    evt->event_handler(evt);
+
+    return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_ARM64
+static DEFINE_PER_CPU(struct timer_of, tegra_to) = {
+    .flags = TIMER_OF_CLOCK | TIMER_OF_BASE,
+
+    .clkevt = {
+        .name = "tegra_timer",
+        .rating = 460,
+        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+        .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,
+    },
+};
+
+static int tegra_timer_setup(unsigned int cpu)
+{
+    struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+
+    irq_force_affinity(to->clkevt.irq, cpumask_of(cpu));
+    enable_irq(to->clkevt.irq);
+
+    clockevents_config_and_register(&to->clkevt, timer_of_rate(to),
+                    1, /* min */
+                    0x1fffffff); /* 29 bits */
   -    timer_shutdown(evt);
-    timer_writel(reg, TIMER3_BASE + TIMER_PTV);
       return 0;
   }
   -static struct clock_event_device tegra_clockevent = {
-    .name            = "timer0",
-    .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,
+static int tegra_timer_stop(unsigned int cpu)
+{
+    struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+
+    to->clkevt.set_state_shutdown(&to->clkevt);
+    disable_irq_nosync(to->clkevt.irq);
+
+    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,
+        .cpumask = cpu_possible_mask,
+    },
+
+    .of_irq = {
+        .index = 2,
+        .flags = IRQF_TIMER | IRQF_TRIGGER_HIGH,
+        .handler = tegra_timer_isr,
+    },
   };
     static u64 notrace tegra_read_sched_clock(void)
   {
-    return timer_readl(TIMERUS_CNTR_1US);
+    return readl(timer_reg_base + TIMERUS_CNTR_1US);
+}
+
+static unsigned long tegra_delay_timer_read_counter_long(void)
+{
+    return readl(timer_reg_base + TIMERUS_CNTR_1US);
   }
     /*
@@ -143,98 +217,188 @@ static void
 tegra_read_persistent_clock64(struct timespec64 *ts)
       timespec64_add_ns(&persistent_ts, delta * NSEC_PER_MSEC);
       *ts = persistent_ts;
   }
+#endif
   -static unsigned long tegra_delay_timer_read_counter_long(void)
+static int tegra_timer_suspend(void)
   {
-    return readl(timer_reg_base + TIMERUS_CNTR_1US);
+#ifdef CONFIG_ARM64
+    int cpu;
+
+    for_each_possible_cpu(cpu) {
+        struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+        void __iomem *reg_base = timer_of_base(to);
+
+        writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+    }
+#else
+    void __iomem *reg_base = timer_of_base(&tegra_to);
+
+    writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+#endif
+
+    return 0;
   }
   -static irqreturn_t tegra_timer_interrupt(int irq, void *dev_id)
+static void tegra_timer_resume(void)
   {
-    struct clock_event_device *evt = (struct clock_event_device
 *)dev_id;
-    timer_writel(1<<30, TIMER3_BASE + TIMER_PCR);
-    evt->event_handler(evt);
-    return IRQ_HANDLED;
+    writel(usec_config, timer_reg_base + TIMERUS_USEC_CFG);
   }
   -static struct irqaction tegra_timer_irq = {
-    .name        = "timer0",
-    .flags        = IRQF_TIMER | IRQF_TRIGGER_HIGH,
-    .handler    = tegra_timer_interrupt,
-    .dev_id        = &tegra_clockevent,
+static struct syscore_ops tegra_timer_syscore_ops = {
+    .suspend = tegra_timer_suspend,
+    .resume = tegra_timer_resume,
   };
   -static int __init tegra20_init_timer(struct device_node *np)
+static int tegra_timer_init(struct device_node *np, struct timer_of *to)
   {
-    struct clk *clk;
-    unsigned long rate;
-    int ret;
+    int ret = 0;
   -    timer_reg_base = of_iomap(np, 0);
-    if (!timer_reg_base) {
-        pr_err("Can't map timer registers\n");
-        return -ENXIO;
-    }
+    ret = timer_of_init(np, to);
+    if (ret < 0)
+        goto out;
   -    tegra_timer_irq.irq = irq_of_parse_and_map(np, 2);
-    if (tegra_timer_irq.irq <= 0) {
-        pr_err("Failed to map timer IRQ\n");
-        return -EINVAL;
-    }
+    timer_reg_base = timer_of_base(to);
   -    clk = of_clk_get(np, 0);
-    if (IS_ERR(clk)) {
-        pr_warn("Unable to get timer clock. Assuming 12Mhz input
 clock.\n");
-        rate = 12000000;
-    } else {
-        clk_prepare_enable(clk);
-        rate = clk_get_rate(clk);
-    }
-
-    switch (rate) {
+    /*
+     * Configure microsecond timers to have 1MHz clock
+     * Config register is 0xqqww, where qq is "dividend", ww is

"divisor"
+     * Uses n+1 scheme
+     */
+    switch (timer_of_rate(to)) {
      case 12000000:
-        timer_writel(0x000b, TIMERUS_USEC_CFG); +        usec_config = 0x000b; /* (11+1)/(0+1) */ +        break;
+    case 12800000:
+        usec_config = 0x043f; /* (63+1)/(4+1) */
          break;
      case 13000000:
-        timer_writel(0x000c, TIMERUS_USEC_CFG); +        usec_config = 0x000c; /* (12+1)/(0+1) */ +        break;
+    case 16800000:
+        usec_config = 0x0453; /* (83+1)/(4+1) */
          break;
      case 19200000:
-        timer_writel(0x045f, TIMERUS_USEC_CFG); +        usec_config = 0x045f; /* (95+1)/(4+1) */
          break;
      case 26000000:
-        timer_writel(0x0019, TIMERUS_USEC_CFG); +        usec_config = 0x0019; /* (25+1)/(0+1) */ +        break;
+    case 38400000:
+        usec_config = 0x04bf; /* (191+1)/(4+1) */ +        break;
+    case 48000000:
+        usec_config = 0x002f; /* (47+1)/(0+1) */
          break;
      default:
-        WARN(1, "Unknown clock rate");
+        ret = -EINVAL;
+        goto out;
+    }

drivers/clocksource/timer-tegra20.c +68 -0
+
+    writel(usec_config, timer_of_base(to) + TIMERUS_USEC_CFG);
+
+    register_syscore_ops(&tegra_timer_syscore_ops);
+out:
+    return ret;
+}
+
+#ifdef CONFIG_ARM64
+static int __init tegra210_timer_init(struct device_node *np)
+{
+    int cpu, ret = 0;
+    struct timer_of *to;
+
+    to = this_cpu_ptr(&tegra_to);
+    ret = tegra_timer_init(np, to);
+    if (ret < 0)
+        goto out;
+
+    for_each_possible_cpu(cpu) {
+        struct timer_of *cpu_to;
+
+        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));
+        if (!cpu_to->clkevt.irq) {
+            pr_err("%s: can't map IRQ for CPU%d\n",
+                   __func__, cpu);
+            ret = -EINVAL;
+            goto out;
+        }
+
+        irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN);
+        ret = request_irq(cpu_to->clkevt.irq, tegra_timer_isr,
+                  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);
+            ret = -EINVAL;
+            goto out_irq;
+        }
+    }
+
+    cpuhp_setup_state(CPUHP_AP_TEGRA_TIMER_STARTING,
+              "AP_TEGRA_TIMER_STARTING", tegra_timer_setup,
+              tegra_timer_stop);
+
+    return ret;
+
+out_irq:
+    for_each_possible_cpu(cpu) {
+        struct timer_of *cpu_to;
+
+        cpu_to = per_cpu_ptr(&tegra_to, cpu);
+        if (cpu_to->clkevt.irq) {
+            free_irq(cpu_to->clkevt.irq, &cpu_to->clkevt);
+            irq_dispose_mapping(cpu_to->clkevt.irq);
+        }
       }
+out:
+    timer_of_cleanup(to);
+    return ret;
+}
+TIMER_OF_DECLARE(tegra210_timer, "nvidia,tegra210-timer",

tegra210_timer_init);

drivers/clocksource/timer-tegra20.c +23 -11
+#else /* CONFIG_ARM */
+static int __init tegra20_init_timer(struct device_node *np)
+{
+    int ret = 0;
+
+    ret = tegra_timer_init(np, &tegra_to);
+    if (ret < 0)
+        goto out;
   -    sched_clock_register(tegra_read_sched_clock, 32, 1000000);
+    tegra_to.of_base.base = timer_reg_base + TIMER_BASE_FOR_CPU(0);
+    tegra_to.of_clk.rate = 1000000; /* microsecond timer */
   +    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", 1000000, 300, 32,
-                    clocksource_mmio_readl_up);
+                    "timer_us", timer_of_rate(&tegra_to),
+                    300, 32, clocksource_mmio_readl_up);
       if (ret) {
           pr_err("Failed to register clocksource\n");
-        return ret;
+        goto out;
       }
         tegra_delay_timer.read_current_timer =
               tegra_delay_timer_read_counter_long;
-    tegra_delay_timer.freq = 1000000;
+    tegra_delay_timer.freq = timer_of_rate(&tegra_to);
       register_current_timer_delay(&tegra_delay_timer);
   -    ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq);
-    if (ret) {
-        pr_err("Failed to register timer IRQ: %d\n", ret);
-        return ret;
-    }
+    clockevents_config_and_register(&tegra_to.clkevt,
+                    timer_of_rate(&tegra_to),
+                    0x1,
+                    0x1fffffff);
   -    tegra_clockevent.cpumask = cpu_possible_mask;
-    tegra_clockevent.irq = tegra_timer_irq.irq;
-    clockevents_config_and_register(&tegra_clockevent, 1000000,
-                    0x1, 0x1fffffff);
+    return ret;
+out:
+    timer_of_cleanup(&tegra_to);
   -    return 0;
+    return ret;
   }
   TIMER_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer",

tegra20_init_timer);
  @@ -261,3 +425,4 @@ static int __init tegra20_init_rtc(struct
device_node *np)
      return register_persistent_clock(tegra_read_persistent_clock64); }
  TIMER_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);

drivers/clocksource/timer-tegra20.c +1 -0
+#endif
include/linux/cpuhotplug.h +1 -0
index fd586d0301e7..e78281d07b70 100644
@@ -121,6 +121,7 @@ enum cpuhp_state {
       CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
       CPUHP_AP_ARM_TWD_STARTING,
       CPUHP_AP_QCOM_TIMER_STARTING,
+    CPUHP_AP_TEGRA_TIMER_STARTING,
       CPUHP_AP_ARMADA_TIMER_STARTING,
       CPUHP_AP_MARCO_TIMER_STARTING,
       CPUHP_AP_MIPS_GIC_TIMER_STARTING,
#7 lore raw

Re: [PATCH V6 2/7] clocksource: tegra: add Tegra210 timer support

In reply to Joseph Lo
Quoted 37 lines · Joseph Lo

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
* refine the timer defines
* add ack tag from Jon.
v5:
* add ack tag from Thierry
v4:
* merge timer-tegra210.c in previous version into timer-tegra20.c
v3:
* use timer-of API
v2:
* add error clean-up code

---
 drivers/clocksource/Kconfig         |   2 +-
 drivers/clocksource/timer-tegra20.c | 371 ++++++++++++++++++++--------
 include/linux/cpuhotplug.h          |   1 +
 3 files changed, 270 insertions(+), 104 deletions(-)
drivers/clocksource/Kconfig +0 -0
index a9e26f6a81a1..6af78534a285 100644

drivers/clocksource/Kconfig config SUN5I_HSTIMER · line 134

Quoted 4 lines
drivers/clocksource/Kconfig +0 -1
@@ -131,7 +131,7 @@ config SUN5I_HSTIMER
 config TEGRA_TIMER
 	bool "Tegra timer driver" if COMPILE_TEST
 	select CLKSRC_MMIO
-	depends on ARM

This will break because the delay functions are defined in arch/arm/include/asm/delay.h and the 01.org will try to compile the driver on x86.

You may want to add 'depends on ARM && ARM64'

Quoted 66 lines
drivers/clocksource/Kconfig +1 -0
+	select TIMER_OF
 	help
 	  Enables support for the Tegra driver.
 
drivers/clocksource/timer-tegra20.c +24 -17
index 4293943f4e2b..f66edd63d7f4 100644
@@ -15,21 +15,24 @@
  *
  */
 
-#include <linux/init.h>
+#include <linux/clk.h>
+#include <linux/clockchips.h>
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+#include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/time.h>
 #include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/clockchips.h>
-#include <linux/clocksource.h>
-#include <linux/clk.h>
-#include <linux/io.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
-#include <linux/sched_clock.h>
-#include <linux/delay.h>
+#include <linux/percpu.h>
+#include <linux/syscore_ops.h>
+#include <linux/time.h>
+
+#include "timer-of.h"
 
+#ifdef CONFIG_ARM
 #include <asm/mach/time.h>
+#endif
 
 #define RTC_SECONDS            0x08
 #define RTC_SHADOW_SECONDS     0x0c
@@ -39,74 +42,145 @@
 #define TIMERUS_USEC_CFG 0x14
 #define TIMERUS_CNTR_FREEZE 0x4c
 
-#define TIMER1_BASE 0x0
-#define TIMER2_BASE 0x8
-#define TIMER3_BASE 0x50
-#define TIMER4_BASE 0x58
-
-#define TIMER_PTV 0x0
-#define TIMER_PCR 0x4
-
+#define TIMER_PTV		0x0
+#define TIMER_PTV_EN		BIT(31)
+#define TIMER_PTV_PER		BIT(30)
+#define TIMER_PCR		0x4
+#define TIMER_PCR_INTR_CLR	BIT(30)
+
+#ifdef CONFIG_ARM
+#define TIMER_CPU0		0x50 /* TIMER3 */
+#else
+#define TIMER_CPU0		0x90 /* TIMER10 */
+#define TIMER10_IRQ_IDX		10
+#define IRQ_IDX_FOR_CPU(cpu)	(TIMER10_IRQ_IDX + cpu)

drivers/clocksource/timer-tegra20.c line 65

Quoted 10 lines
drivers/clocksource/timer-tegra20.c +5 -1
+#endif
+#define TIMER_BASE_FOR_CPU(cpu) (TIMER_CPU0 + (cpu) * 8)
+
+static u32 usec_config;
 static void __iomem *timer_reg_base;
+#ifdef CONFIG_ARM
 static void __iomem *rtc_base;
-
 static struct timespec64 persistent_ts;
 static u64 persistent_ms, last_persistent_ms;

Did you check the above changes are still relevant after commit 39232ed5a1793f67 and after doing a change similar to commit 1569557549697207e523 ?

Quoted 58 lines
drivers/clocksource/timer-tegra20.c +26 -14
 static struct delay_timer tegra_delay_timer;
-
-#define timer_writel(value, reg) \
-	writel_relaxed(value, timer_reg_base + (reg))
-#define timer_readl(reg) \
-	readl_relaxed(timer_reg_base + (reg))
+#endif
 
 static int tegra_timer_set_next_event(unsigned long cycles,
 					 struct clock_event_device *evt)
 {
-	u32 reg;
+	void __iomem *reg_base = timer_of_base(to_timer_of(evt));
 
-	reg = 0x80000000 | ((cycles > 1) ? (cycles-1) : 0);
-	timer_writel(reg, TIMER3_BASE + TIMER_PTV);
+	writel(TIMER_PTV_EN |
+	       ((cycles > 1) ? (cycles - 1) : 0), /* n+1 scheme */
+	       reg_base + TIMER_PTV);
 
 	return 0;
 }
 
-static inline void timer_shutdown(struct clock_event_device *evt)
+static int tegra_timer_shutdown(struct clock_event_device *evt)
 {
-	timer_writel(0, TIMER3_BASE + TIMER_PTV);
+	void __iomem *reg_base = timer_of_base(to_timer_of(evt));
+
+	writel(0, reg_base + TIMER_PTV);
+
+	return 0;
 }
 
-static int tegra_timer_shutdown(struct clock_event_device *evt)
+static int tegra_timer_set_periodic(struct clock_event_device *evt)
 {
-	timer_shutdown(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);
+
 	return 0;
 }
 
-static int tegra_timer_set_periodic(struct clock_event_device *evt)
+static irqreturn_t tegra_timer_isr(int irq, void *dev_id)
 {
-	u32 reg = 0xC0000000 | ((1000000 / HZ) - 1);
+	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);
+	evt->event_handler(evt);
+
+	return IRQ_HANDLED;

drivers/clocksource/timer-tegra20.c line 119

Quoted 10 lines
drivers/clocksource/timer-tegra20.c +10 -0
+}
+
+#ifdef CONFIG_ARM64
+static DEFINE_PER_CPU(struct timer_of, tegra_to) = {
+	.flags = TIMER_OF_CLOCK | TIMER_OF_BASE,
+
+	.clkevt = {
+		.name = "tegra_timer",
+		.rating = 460,
+		.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

CLOCK_EVT_FEAT_DYNIRQ ?

Quoted 82 lines
drivers/clocksource/timer-tegra20.c +56 -14
+		.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,
+	},
+};
+
+static int tegra_timer_setup(unsigned int cpu)
+{
+	struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+
+	irq_force_affinity(to->clkevt.irq, cpumask_of(cpu));
+	enable_irq(to->clkevt.irq);
+
+	clockevents_config_and_register(&to->clkevt, timer_of_rate(to),
+					1, /* min */
+					0x1fffffff); /* 29 bits */
 
-	timer_shutdown(evt);
-	timer_writel(reg, TIMER3_BASE + TIMER_PTV);
 	return 0;
 }
 
-static struct clock_event_device tegra_clockevent = {
-	.name			= "timer0",
-	.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,
+static int tegra_timer_stop(unsigned int cpu)
+{
+	struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+
+	to->clkevt.set_state_shutdown(&to->clkevt);
+	disable_irq_nosync(to->clkevt.irq);
+
+	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,
+		.cpumask = cpu_possible_mask,
+	},
+
+	.of_irq = {
+		.index = 2,
+		.flags = IRQF_TIMER | IRQF_TRIGGER_HIGH,
+		.handler = tegra_timer_isr,
+	},
 };
 
 static u64 notrace tegra_read_sched_clock(void)
 {
-	return timer_readl(TIMERUS_CNTR_1US);
+	return readl(timer_reg_base + TIMERUS_CNTR_1US);
+}
+
+static unsigned long tegra_delay_timer_read_counter_long(void)
+{
+	return readl(timer_reg_base + TIMERUS_CNTR_1US);
 }
 
 /*

drivers/clocksource/timer-tegra20.c static void tegra_read_persistent_clock64(struct timespec64 *ts) · line 224

Quoted 10 lines
drivers/clocksource/timer-tegra20.c +3 -2
@@ -143,98 +217,188 @@ static void tegra_read_persistent_clock64(struct timespec64 *ts)
 	timespec64_add_ns(&persistent_ts, delta * NSEC_PER_MSEC);
 	*ts = persistent_ts;
 }
+#endif
 
-static unsigned long tegra_delay_timer_read_counter_long(void)
+static int tegra_timer_suspend(void)
 {
-	return readl(timer_reg_base + TIMERUS_CNTR_1US);
+#ifdef CONFIG_ARM64

Please do not add those #ifdef but function stubs.

Quoted 26 lines
drivers/clocksource/timer-tegra20.c +17 -5
+	int cpu;
+
+	for_each_possible_cpu(cpu) {
+		struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+		void __iomem *reg_base = timer_of_base(to);
+
+		writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+	}
+#else
+	void __iomem *reg_base = timer_of_base(&tegra_to);
+
+	writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+#endif
+
+	return 0;
 }
 
-static irqreturn_t tegra_timer_interrupt(int irq, void *dev_id)
+static void tegra_timer_resume(void)
 {
-	struct clock_event_device *evt = (struct clock_event_device *)dev_id;
-	timer_writel(1<<30, TIMER3_BASE + TIMER_PCR);
-	evt->event_handler(evt);
-	return IRQ_HANDLED;
+	writel(usec_config, timer_reg_base + TIMERUS_USEC_CFG);
 }

drivers/clocksource/timer-tegra20.c static void tegra_read_persistent_clock64(struct timespec64 *ts) · line 250

Quoted 10 lines
drivers/clocksource/timer-tegra20.c +3 -5
 
-static struct irqaction tegra_timer_irq = {
-	.name		= "timer0",
-	.flags		= IRQF_TIMER | IRQF_TRIGGER_HIGH,
-	.handler	= tegra_timer_interrupt,
-	.dev_id		= &tegra_clockevent,
+static struct syscore_ops tegra_timer_syscore_ops = {
+	.suspend = tegra_timer_suspend,
+	.resume = tegra_timer_resume,
 };

It will be nicer to use the suspend/resume callbacks defined in the clockevent structure, so you can use generic as there are multiple clockevents defined for the tegra210, thus multiple timer-of encapsulating them. When the suspend/resume callbacks are called, they have the clock_event pointer and you can use it to retrieve the timer-of and then the base address. At the end, the callbacks will end up the same for tegra20 and tegra210.

Quoted 110 lines
drivers/clocksource/timer-tegra20.c +68 -29
-static int __init tegra20_init_timer(struct device_node *np)
+static int tegra_timer_init(struct device_node *np, struct timer_of *to)
 {
-	struct clk *clk;
-	unsigned long rate;
-	int ret;
+	int ret = 0;
 
-	timer_reg_base = of_iomap(np, 0);
-	if (!timer_reg_base) {
-		pr_err("Can't map timer registers\n");
-		return -ENXIO;
-	}
+	ret = timer_of_init(np, to);
+	if (ret < 0)
+		goto out;
 
-	tegra_timer_irq.irq = irq_of_parse_and_map(np, 2);
-	if (tegra_timer_irq.irq <= 0) {
-		pr_err("Failed to map timer IRQ\n");
-		return -EINVAL;
-	}
+	timer_reg_base = timer_of_base(to);
 
-	clk = of_clk_get(np, 0);
-	if (IS_ERR(clk)) {
-		pr_warn("Unable to get timer clock. Assuming 12Mhz input clock.\n");
-		rate = 12000000;
-	} else {
-		clk_prepare_enable(clk);
-		rate = clk_get_rate(clk);
-	}
-
-	switch (rate) {
+	/*
+	 * Configure microsecond timers to have 1MHz clock
+	 * Config register is 0xqqww, where qq is "dividend", ww is "divisor"
+	 * Uses n+1 scheme
+	 */
+	switch (timer_of_rate(to)) {
 	case 12000000:
-		timer_writel(0x000b, TIMERUS_USEC_CFG);
+		usec_config = 0x000b; /* (11+1)/(0+1) */
+		break;
+	case 12800000:
+		usec_config = 0x043f; /* (63+1)/(4+1) */
 		break;
 	case 13000000:
-		timer_writel(0x000c, TIMERUS_USEC_CFG);
+		usec_config = 0x000c; /* (12+1)/(0+1) */
+		break;
+	case 16800000:
+		usec_config = 0x0453; /* (83+1)/(4+1) */
 		break;
 	case 19200000:
-		timer_writel(0x045f, TIMERUS_USEC_CFG);
+		usec_config = 0x045f; /* (95+1)/(4+1) */
 		break;
 	case 26000000:
-		timer_writel(0x0019, TIMERUS_USEC_CFG);
+		usec_config = 0x0019; /* (25+1)/(0+1) */
+		break;
+	case 38400000:
+		usec_config = 0x04bf; /* (191+1)/(4+1) */
+		break;
+	case 48000000:
+		usec_config = 0x002f; /* (47+1)/(0+1) */
 		break;
 	default:
-		WARN(1, "Unknown clock rate");
+		ret = -EINVAL;
+		goto out;
+	}
+
+	writel(usec_config, timer_of_base(to) + TIMERUS_USEC_CFG);
+
+	register_syscore_ops(&tegra_timer_syscore_ops);
+out:
+	return ret;
+}
+
+#ifdef CONFIG_ARM64
+static int __init tegra210_timer_init(struct device_node *np)
+{
+	int cpu, ret = 0;
+	struct timer_of *to;
+
+	to = this_cpu_ptr(&tegra_to);
+	ret = tegra_timer_init(np, to);
+	if (ret < 0)
+		goto out;
+
+	for_each_possible_cpu(cpu) {
+		struct timer_of *cpu_to;
+
+		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));
+		if (!cpu_to->clkevt.irq) {
+			pr_err("%s: can't map IRQ for CPU%d\n",
+			       __func__, cpu);
+			ret = -EINVAL;
+			goto out;
+		}
+
+		irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN);

drivers/clocksource/timer-tegra20.c static void tegra_read_persistent_clock64(struct timespec64 *ts) · line 342

Quoted 10 lines
drivers/clocksource/timer-tegra20.c +10 -0
+		ret = request_irq(cpu_to->clkevt.irq, tegra_timer_isr,
+				  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);
+			ret = -EINVAL;
+			goto out_irq;
+		}
+	}

You should configure the timer in the tegra_timer_setup() function instead of using this cpu loop.

Quoted 13 lines
drivers/clocksource/timer-tegra20.c +13 -0
+
+	cpuhp_setup_state(CPUHP_AP_TEGRA_TIMER_STARTING,
+			  "AP_TEGRA_TIMER_STARTING", tegra_timer_setup,
+			  tegra_timer_stop);
+
+	return ret;
+
+out_irq:
+	for_each_possible_cpu(cpu) {
+		struct timer_of *cpu_to;
+
+		cpu_to = per_cpu_ptr(&tegra_to, cpu);
+		if (cpu_to->clkevt.irq) {

drivers/clocksource/timer-tegra20.c static void tegra_read_persistent_clock64(struct timespec64 *ts) · line 365

Quoted 10 lines
drivers/clocksource/timer-tegra20.c +9 -0
+			free_irq(cpu_to->clkevt.irq, &cpu_to->clkevt);
+			irq_dispose_mapping(cpu_to->clkevt.irq);
+		}
 	}
+out:
+	timer_of_cleanup(to);
+	return ret;
+}
+TIMER_OF_DECLARE(tegra210_timer, "nvidia,tegra210-timer", tegra210_timer_init);
+#else /* CONFIG_ARM */

Don't use the macro to select one or another. Just define the functions and let the init postcalls to free the memory.

Quoted 72 lines
drivers/clocksource/timer-tegra20.c +24 -15
+static int __init tegra20_init_timer(struct device_node *np)
+{
+	int ret = 0;
+
+	ret = tegra_timer_init(np, &tegra_to);
+	if (ret < 0)
+		goto out;
 
-	sched_clock_register(tegra_read_sched_clock, 32, 1000000);
+	tegra_to.of_base.base = timer_reg_base + TIMER_BASE_FOR_CPU(0);
+	tegra_to.of_clk.rate = 1000000; /* microsecond timer */
 
+	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", 1000000, 300, 32,
-				    clocksource_mmio_readl_up);
+				    "timer_us", timer_of_rate(&tegra_to),
+				    300, 32, clocksource_mmio_readl_up);
 	if (ret) {
 		pr_err("Failed to register clocksource\n");
-		return ret;
+		goto out;
 	}
 
 	tegra_delay_timer.read_current_timer =
 			tegra_delay_timer_read_counter_long;
-	tegra_delay_timer.freq = 1000000;
+	tegra_delay_timer.freq = timer_of_rate(&tegra_to);
 	register_current_timer_delay(&tegra_delay_timer);
 
-	ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq);
-	if (ret) {
-		pr_err("Failed to register timer IRQ: %d\n", ret);
-		return ret;
-	}
+	clockevents_config_and_register(&tegra_to.clkevt,
+					timer_of_rate(&tegra_to),
+					0x1,
+					0x1fffffff);
 
-	tegra_clockevent.cpumask = cpu_possible_mask;
-	tegra_clockevent.irq = tegra_timer_irq.irq;
-	clockevents_config_and_register(&tegra_clockevent, 1000000,
-					0x1, 0x1fffffff);
+	return ret;
+out:
+	timer_of_cleanup(&tegra_to);
 
-	return 0;
+	return ret;
 }
 TIMER_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer);
 
@@ -261,3 +425,4 @@ static int __init tegra20_init_rtc(struct device_node *np)
 	return register_persistent_clock(tegra_read_persistent_clock64);
 }
 TIMER_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);
+#endif
include/linux/cpuhotplug.h +1 -0
index fd586d0301e7..e78281d07b70 100644
@@ -121,6 +121,7 @@ enum cpuhp_state {
 	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
 	CPUHP_AP_ARM_TWD_STARTING,
 	CPUHP_AP_QCOM_TIMER_STARTING,
+	CPUHP_AP_TEGRA_TIMER_STARTING,
 	CPUHP_AP_ARMADA_TIMER_STARTING,
 	CPUHP_AP_MARCO_TIMER_STARTING,
 	CPUHP_AP_MIPS_GIC_TIMER_STARTING,
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
author
#8 lore raw

Re: [PATCH V6 2/7] clocksource: tegra: add Tegra210 timer support

Quoted 47 lines · Daniel Lezcano
Quoted 37 lines · Joseph Lo

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
* refine the timer defines
* add ack tag from Jon.
v5:
* add ack tag from Thierry
v4:
* merge timer-tegra210.c in previous version into timer-tegra20.c
v3:
* use timer-of API
v2:
* add error clean-up code

---
  drivers/clocksource/Kconfig         |   2 +-
  drivers/clocksource/timer-tegra20.c | 371 ++++++++++++++++++++--------
  include/linux/cpuhotplug.h          |   1 +
  3 files changed, 270 insertions(+), 104 deletions(-)
drivers/clocksource/Kconfig +0 -0
index a9e26f6a81a1..6af78534a285 100644

drivers/clocksource/Kconfig config SUN5I_HSTIMER · line 134

Quoted 4 lines
drivers/clocksource/Kconfig +0 -1
@@ -131,7 +131,7 @@ config SUN5I_HSTIMER
  config TEGRA_TIMER
  	bool "Tegra timer driver" if COMPILE_TEST
  	select CLKSRC_MMIO
-	depends on ARM

This will break because the delay functions are defined in arch/arm/include/asm/delay.h and the 01.org will try to compile the driver on x86.

Quoted 2 lines

You may want to add 'depends on ARM && ARM64'

OK, I think it's 'depends on ARM || ARM64'.
Will fix.

Quoted 4 lines
Quoted 4 lines
drivers/clocksource/Kconfig +1 -0
+	select TIMER_OF
  	help
  	  Enables support for the Tegra driver.
 

[snip]

Quoted 8 lines
Quoted 3 lines

-
static struct timespec64 persistent_ts;
static u64 persistent_ms, last_persistent_ms;

Did you check the above changes are still relevant after commit 39232ed5a1793f67 and after doing a change similar to commit 1569557549697207e523 ?

Yes, just check both commits. I think it's okay to use the same. But need another patch to do that, this patch only adds new support for Tegra210. Doesn't touch the original code.

Quoted 2 lines
Quoted 2 lines

static struct delay_timer tegra_delay_timer;

[snip]

Quoted 10 lines

drivers/clocksource/Kconfig

Quoted 8 lines
drivers/clocksource/Kconfig +8 -0
+#ifdef CONFIG_ARM64
+static DEFINE_PER_CPU(struct timer_of, tegra_to) = {
+	.flags = TIMER_OF_CLOCK | TIMER_OF_BASE,
+
+	.clkevt = {
+		.name = "tegra_timer",
+		.rating = 460,
+		.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

CLOCK_EVT_FEAT_DYNIRQ ?

Yes, good catch.

Quoted 8 lines
Quoted 8 lines
drivers/clocksource/Kconfig +7 -0
+		.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,
+	},
+};

[snip]

Quoted 45 lines

drivers/clocksource/Kconfig

Quoted 5 lines
drivers/clocksource/Kconfig +2 -2
-static unsigned long tegra_delay_timer_read_counter_long(void)
+static int tegra_timer_suspend(void)
  {
-	return readl(timer_reg_base + TIMERUS_CNTR_1US);
+#ifdef CONFIG_ARM64

Please do not add those #ifdef but function stubs.

Quoted 26 lines
drivers/clocksource/Kconfig +17 -5
+	int cpu;
+
+	for_each_possible_cpu(cpu) {
+		struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+		void __iomem *reg_base = timer_of_base(to);
+
+		writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+	}
+#else
+	void __iomem *reg_base = timer_of_base(&tegra_to);
+
+	writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+#endif
+
+	return 0;
  }
 
-static irqreturn_t tegra_timer_interrupt(int irq, void *dev_id)
+static void tegra_timer_resume(void)
  {
-	struct clock_event_device *evt = (struct clock_event_device *)dev_id;
-	timer_writel(1<<30, TIMER3_BASE + TIMER_PCR);
-	evt->event_handler(evt);
-	return IRQ_HANDLED;
+	writel(usec_config, timer_reg_base + TIMERUS_USEC_CFG);
  }

drivers/clocksource/Kconfig

Quoted 10 lines
drivers/clocksource/Kconfig +3 -5
 
-static struct irqaction tegra_timer_irq = {
-	.name		= "timer0",
-	.flags		= IRQF_TIMER | IRQF_TRIGGER_HIGH,
-	.handler	= tegra_timer_interrupt,
-	.dev_id		= &tegra_clockevent,
+static struct syscore_ops tegra_timer_syscore_ops = {
+	.suspend = tegra_timer_suspend,
+	.resume = tegra_timer_resume,
  };
Quoted 8 lines

It will be nicer to use the suspend/resume callbacks defined in the clockevent structure, so you can use generic as there are multiple clockevents defined for the tegra210, thus multiple timer-of encapsulating them. When the suspend/resume callbacks are called, they have the clock_event pointer and you can use it to retrieve the timer-of and then the base address. At the end, the callbacks will end up the same for tegra20 and tegra210.

Very good suggestion, will follow up.

Quoted 2 lines
Quoted 2 lines
drivers/clocksource/Kconfig +1 -1
-static int __init tegra20_init_timer(struct device_node *np)
+static int tegra_timer_init(struct device_node *np, struct timer_of *to)

[snip]

Quoted 23 lines
Quoted 23 lines
drivers/clocksource/Kconfig +23 -0
+	for_each_possible_cpu(cpu) {
+		struct timer_of *cpu_to;
+
+		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));
+		if (!cpu_to->clkevt.irq) {
+			pr_err("%s: can't map IRQ for CPU%d\n",
+			       __func__, cpu);
+			ret = -EINVAL;
+			goto out;
+		}
+
+		irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN);
+		ret = request_irq(cpu_to->clkevt.irq, tegra_timer_isr,
+				  IRQF_TIMER | IRQF_NOBALANCING,
+				  cpu_to->clkevt.name, &cpu_to->clkevt);
+		if (ret) {
+			pr_err("%s: cannot setup irq %d for CPU%d\n",
Quoted 9 lines

drivers/clocksource/Kconfig

Quoted 5 lines
drivers/clocksource/Kconfig +5 -0
+				__func__, cpu_to->clkevt.irq, cpu);
+			ret = -EINVAL;
+			goto out_irq;
+		}
+	}

You should configure the timer in the tegra_timer_setup() function instead of using this cpu loop.

I think I still need to leave 'irq_of_parse_and_map' and 'request_irq' here. Is that ok?

Quoted 18 lines
Quoted 18 lines
drivers/clocksource/Kconfig +17 -0
+
+	cpuhp_setup_state(CPUHP_AP_TEGRA_TIMER_STARTING,
+			  "AP_TEGRA_TIMER_STARTING", tegra_timer_setup,
+			  tegra_timer_stop);
+
+	return ret;
+
+out_irq:
+	for_each_possible_cpu(cpu) {
+		struct timer_of *cpu_to;
+
+		cpu_to = per_cpu_ptr(&tegra_to, cpu);
+		if (cpu_to->clkevt.irq) {
+			free_irq(cpu_to->clkevt.irq, &cpu_to->clkevt);
+			irq_dispose_mapping(cpu_to->clkevt.irq);
+		}
  	}
+out:
Quoted 9 lines

drivers/clocksource/Kconfig

Quoted 5 lines
drivers/clocksource/Kconfig +5 -0
+	timer_of_cleanup(to);
+	return ret;
+}
+TIMER_OF_DECLARE(tegra210_timer, "nvidia,tegra210-timer", tegra210_timer_init);
+#else /* CONFIG_ARM */

Don't use the macro to select one or another. Just define the functions and let the init postcalls to free the memory.

Okay, I think I can move 'TIMER_OF_DECLARE' out of the ifdef. They will be something like below. And change tegraxxx_init_timer to tegra_init_timer.

TIMER_OF_DECLARE(tegra210_timer, "nvidia,tegra210-timer", tegra_timer_init); TIMER_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra_timer_init);

Is that ok?

Thanks for reviewing,
Joseph

Quoted 74 lines
Quoted 72 lines
drivers/clocksource/Kconfig +24 -15
+static int __init tegra20_init_timer(struct device_node *np)
+{
+	int ret = 0;
+
+	ret = tegra_timer_init(np, &tegra_to);
+	if (ret < 0)
+		goto out;
 
-	sched_clock_register(tegra_read_sched_clock, 32, 1000000);
+	tegra_to.of_base.base = timer_reg_base + TIMER_BASE_FOR_CPU(0);
+	tegra_to.of_clk.rate = 1000000; /* microsecond timer */
 
+	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", 1000000, 300, 32,
-				    clocksource_mmio_readl_up);
+				    "timer_us", timer_of_rate(&tegra_to),
+				    300, 32, clocksource_mmio_readl_up);
  	if (ret) {
  		pr_err("Failed to register clocksource\n");
-		return ret;
+		goto out;
  	}
 
  	tegra_delay_timer.read_current_timer =
  			tegra_delay_timer_read_counter_long;
-	tegra_delay_timer.freq = 1000000;
+	tegra_delay_timer.freq = timer_of_rate(&tegra_to);
  	register_current_timer_delay(&tegra_delay_timer);
 
-	ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq);
-	if (ret) {
-		pr_err("Failed to register timer IRQ: %d\n", ret);
-		return ret;
-	}
+	clockevents_config_and_register(&tegra_to.clkevt,
+					timer_of_rate(&tegra_to),
+					0x1,
+					0x1fffffff);
 
-	tegra_clockevent.cpumask = cpu_possible_mask;
-	tegra_clockevent.irq = tegra_timer_irq.irq;
-	clockevents_config_and_register(&tegra_clockevent, 1000000,
-					0x1, 0x1fffffff);
+	return ret;
+out:
+	timer_of_cleanup(&tegra_to);
 
-	return 0;
+	return ret;
  }
  TIMER_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer);
@@ -261,3 +425,4 @@ static int __init tegra20_init_rtc(struct device_node *np)
  	return register_persistent_clock(tegra_read_persistent_clock64);
  }
  TIMER_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);
+#endif
include/linux/cpuhotplug.h +1 -0
index fd586d0301e7..e78281d07b70 100644
@@ -121,6 +121,7 @@ enum cpuhp_state {
  	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
  	CPUHP_AP_ARM_TWD_STARTING,
  	CPUHP_AP_QCOM_TIMER_STARTING,
+	CPUHP_AP_TEGRA_TIMER_STARTING,
  	CPUHP_AP_ARMADA_TIMER_STARTING,
  	CPUHP_AP_MARCO_TIMER_STARTING,
  	CPUHP_AP_MIPS_GIC_TIMER_STARTING,
#9 lore raw

Re: [PATCH V6 2/7] clocksource: tegra: add Tegra210 timer support

Quoted 49 lines · Joseph Lo
Quoted 48 lines · Daniel Lezcano
Quoted 38 lines · Joseph Lo

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up
source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
  * refine the timer defines
  * add ack tag from Jon.
v5:
  * add ack tag from Thierry
v4:
  * merge timer-tegra210.c in previous version into timer-tegra20.c v3:
  * use timer-of API
v2:
  * add error clean-up code
---
  drivers/clocksource/Kconfig         |   2 +- drivers/clocksource/timer-tegra20.c | 371 ++++++++++++++++++++-------- include/linux/cpuhotplug.h          |   1 +

  3 files changed, 270 insertions(+), 104 deletions(-)
drivers/clocksource/Kconfig +0 -0
index a9e26f6a81a1..6af78534a285 100644
@@ -131,7 +131,7 @@ config SUN5I_HSTIMER
Quoted 4 lines

  config TEGRA_TIMER
      bool "Tegra timer driver" if COMPILE_TEST
      select CLKSRC_MMIO
-    depends on ARM

This will break because the delay functions are defined in arch/arm/include/asm/delay.h and the 01.org will try to compile the driver on x86.

Quoted 4 lines
Quoted 2 lines

You may want to add 'depends on ARM && ARM64'

OK, I think it's 'depends on ARM || ARM64'.

Ah, yes right.

Quoted 11 lines

Will fix.

Quoted 4 lines
Quoted 4 lines

+    select TIMER_OF
      help
        Enables support for the Tegra driver.

[snip]

Quoted 4 lines
Quoted 3 lines

-
  static struct timespec64 persistent_ts;
  static u64 persistent_ms, last_persistent_ms;

Quoted 8 lines
Quoted 4 lines

Did you check the above changes are still relevant after commit 39232ed5a1793f67 and after doing a change similar to commit 1569557549697207e523 ?

Yes, just check both commits. I think it's okay to use the same. But need another patch to do that, this patch only adds new support for Tegra210. Doesn't touch the original code.

Ok, let's do the change later.

Quoted 115 lines
Quoted 1 line
Quoted 1 line

  static struct delay_timer tegra_delay_timer;

[snip]

Quoted 10 lines

drivers/clocksource/Kconfig

Quoted 8 lines
drivers/clocksource/Kconfig +8 -0
+#ifdef CONFIG_ARM64
+static DEFINE_PER_CPU(struct timer_of, tegra_to) = {
+    .flags = TIMER_OF_CLOCK | TIMER_OF_BASE,
+
+    .clkevt = {
+        .name = "tegra_timer",
+        .rating = 460,
+        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

            CLOCK_EVT_FEAT_DYNIRQ ?

Yes, good catch.

Quoted 8 lines
Quoted 8 lines

+        .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,
+    },
+};

[snip]

Quoted 44 lines
Quoted 5 lines
drivers/clocksource/Kconfig +1 -1
-static unsigned long tegra_delay_timer_read_counter_long(void)
+static int tegra_timer_suspend(void)

  {
-    return readl(timer_reg_base + TIMERUS_CNTR_1US); +#ifdef CONFIG_ARM64

Please do not add those #ifdef but function stubs.

Quoted 27 lines

+    int cpu;

drivers/clocksource/Kconfig +14 -0
+
+    for_each_possible_cpu(cpu) {
+        struct timer_of *to = per_cpu_ptr(&tegra_to, cpu);
+        void __iomem *reg_base = timer_of_base(to);
+
+        writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+    }
+#else
+    void __iomem *reg_base = timer_of_base(&tegra_to);
+
+    writel(TIMER_PCR_INTR_CLR, reg_base + TIMER_PCR);
+#endif
+
+    return 0;

  }
  -static irqreturn_t tegra_timer_interrupt(int irq, void *dev_id) +static void tegra_timer_resume(void)
  {
-    struct clock_event_device *evt = (struct clock_event_device *)dev_id;
-    timer_writel(1<<30, TIMER3_BASE + TIMER_PCR);
-    evt->event_handler(evt);
-    return IRQ_HANDLED;
+    writel(usec_config, timer_reg_base + TIMERUS_USEC_CFG); }
  -static struct irqaction tegra_timer_irq = {

Quoted 8 lines

-    .name        = "timer0",
-    .flags        = IRQF_TIMER | IRQF_TRIGGER_HIGH, -    .handler    = tegra_timer_interrupt,
-    .dev_id        = &tegra_clockevent, +static struct syscore_ops tegra_timer_syscore_ops = { +    .suspend = tegra_timer_suspend,
+    .resume = tegra_timer_resume,
  };

Quoted 8 lines

It will be nicer to use the suspend/resume callbacks defined in the clockevent structure, so you can use generic as there are multiple clockevents defined for the tegra210, thus multiple timer-of encapsulating them. When the suspend/resume callbacks are called, they have the clock_event pointer and you can use it to retrieve the timer-of and then the base address. At the end, the callbacks will end up the same for tegra20 and tegra210.

Very good suggestion, will follow up.

Quoted 3 lines
Quoted 3 lines
drivers/clocksource/Kconfig +1 -1
-static int __init tegra20_init_timer(struct device_node *np)
+static int tegra_timer_init(struct device_node *np, struct timer_of

*to)

[snip]

Quoted 24 lines
Quoted 24 lines

+    for_each_possible_cpu(cpu) {
+        struct timer_of *cpu_to;
+
+        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);

drivers/clocksource/Kconfig +16 -0
+
+        cpu_to->clkevt.irq =
+            irq_of_parse_and_map(np, IRQ_IDX_FOR_CPU(cpu));
+        if (!cpu_to->clkevt.irq) {
+            pr_err("%s: can't map IRQ for CPU%d\n",
+                   __func__, cpu);
+            ret = -EINVAL;
+            goto out;
+        }
+
+        irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN);
+        ret = request_irq(cpu_to->clkevt.irq, tegra_timer_isr,
+                  IRQF_TIMER | IRQF_NOBALANCING,
+                  cpu_to->clkevt.name, &cpu_to->clkevt);
+        if (ret) {
+            pr_err("%s: cannot setup irq %d for CPU%d\n",
Quoted 9 lines
Quoted 5 lines

+                __func__, cpu_to->clkevt.irq, cpu); +            ret = -EINVAL;
+            goto out_irq;
+        }
+    }

You should configure the timer in the tegra_timer_setup() function instead of using this cpu loop.

Quoted 2 lines

I think I still need to leave 'irq_of_parse_and_map' and 'request_irq' here. Is that ok?

Perhaps you can store the np pointer in the private data structure of timer-of and let the timer_of API to retrieve the irq in the cpuhp callbacks.

irq_of_parse_and_map will be called by timer-of.

I'm not sure irq_set_status_flags really operates on the irq because it is called after request_irq.

Quoted 33 lines
Quoted 19 lines
Quoted 19 lines
drivers/clocksource/Kconfig +16 -0
+
+    cpuhp_setup_state(CPUHP_AP_TEGRA_TIMER_STARTING,
+              "AP_TEGRA_TIMER_STARTING", tegra_timer_setup,
+              tegra_timer_stop);
+
+    return ret;
+
+out_irq:
+    for_each_possible_cpu(cpu) {
+        struct timer_of *cpu_to;
+
+        cpu_to = per_cpu_ptr(&tegra_to, cpu);
+        if (cpu_to->clkevt.irq) {
+            free_irq(cpu_to->clkevt.irq, &cpu_to->clkevt);
+            irq_dispose_mapping(cpu_to->clkevt.irq);
+        }

      }
+out:
+    timer_of_cleanup(to);

Quoted 9 lines
Quoted 5 lines

+    return ret;

drivers/clocksource/Kconfig +2 -0
+}
+TIMER_OF_DECLARE(tegra210_timer, "nvidia,tegra210-timer",

tegra210_timer_init);
+#else /* CONFIG_ARM */

Don't use the macro to select one or another. Just define the functions and let the init postcalls to free the memory.

Okay, I think I can move 'TIMER_OF_DECLARE' out of the ifdef. They will be something like below. And change tegraxxx_init_timer to tegra_init_timer.

Quoted 5 lines

TIMER_OF_DECLARE(tegra210_timer, "nvidia,tegra210-timer", tegra_timer_init);
TIMER_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra_timer_init);

Is that ok?

Yes, it is fine.

Thanks
-- Daniel

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
author
#10 lore raw

Re: [PATCH V6 2/7] clocksource: tegra: add Tegra210 timer support

Quoted 31 lines · Daniel Lezcano
Quoted 30 lines · Joseph Lo
Quoted 29 lines · Daniel Lezcano
Quoted 28 lines · Joseph Lo

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up
source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
  * refine the timer defines
  * add ack tag from Jon.
v5:
  * add ack tag from Thierry
v4:
  * merge timer-tegra210.c in previous version into timer-tegra20.c
v3:
  * use timer-of API
v2:
  * add error clean-up code
---

[snip]

Quoted 37 lines
Quoted 34 lines
Quoted 24 lines
Quoted 24 lines

+    for_each_possible_cpu(cpu) {
+        struct timer_of *cpu_to;
+
+        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);

drivers/clocksource/timer-tegra20.c +16 -0
+
+        cpu_to->clkevt.irq =
+            irq_of_parse_and_map(np, IRQ_IDX_FOR_CPU(cpu));
+        if (!cpu_to->clkevt.irq) {
+            pr_err("%s: can't map IRQ for CPU%d\n",
+                   __func__, cpu);
+            ret = -EINVAL;
+            goto out;
+        }
+
+        irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN);
+        ret = request_irq(cpu_to->clkevt.irq, tegra_timer_isr,
+                  IRQF_TIMER | IRQF_NOBALANCING,
+                  cpu_to->clkevt.name, &cpu_to->clkevt);
+        if (ret) {
+            pr_err("%s: cannot setup irq %d for CPU%d\n",
Quoted 9 lines
Quoted 5 lines

+                __func__, cpu_to->clkevt.irq, cpu); +            ret = -EINVAL;
+            goto out_irq;
+        }
+    }

You should configure the timer in the tegra_timer_setup() function instead of using this cpu loop.

Quoted 2 lines

I think I still need to leave 'irq_of_parse_and_map' and 'request_irq' here. Is that ok?

Quoted 9 lines

Perhaps you can store the np pointer in the private data structure of timer-of and let the timer_of API to retrieve the irq in the cpuhp callbacks.

irq_of_parse_and_map will be called by timer-of.

I'm not sure irq_set_status_flags really operates on the irq because it is called after request_irq.

I did some experiments today. The 'irq_of_parse_and_map', 'request_irq' and 'setup_irq' are not able to run in the atomic section that tegra_timer_setup would be triggered in.

So I think I still need to leave the IRQ configuration code here in the loop. Should I move others to 'tegra_timer_setup' or just keep as the same in this patch?

Thanks,
Joseph

#11 lore raw

Re: [PATCH V6 2/7] clocksource: tegra: add Tegra210 timer support

Quoted 77 lines · Joseph Lo
Quoted 32 lines · Daniel Lezcano
Quoted 31 lines · Joseph Lo
Quoted 30 lines · Daniel Lezcano
Quoted 29 lines · Joseph Lo

Add support for the Tegra210 timer that runs at oscillator clock (TMR10-TMR13). We need these timers to work as clock event device and to
replace the ARMv8 architected timer due to it can't survive across the power cycle of the CPU core or CPUPORESET signal. So it can't be a wake-up
source when CPU suspends in power down state.

Also convert the original driver to use timer-of API.

---
v6:
   * refine the timer defines
   * add ack tag from Jon.
v5:
   * add ack tag from Thierry
v4:
   * merge timer-tegra210.c in previous version into timer-tegra20.c v3:
   * use timer-of API
v2:
   * add error clean-up code
---

[snip]

Quoted 43 lines
Quoted 34 lines
Quoted 24 lines
Quoted 24 lines

+    for_each_possible_cpu(cpu) {
+        struct timer_of *cpu_to;
+
+        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);

drivers/clocksource/timer-tegra20.c +16 -0
+
+        cpu_to->clkevt.irq =
+            irq_of_parse_and_map(np, IRQ_IDX_FOR_CPU(cpu));
+        if (!cpu_to->clkevt.irq) {
+            pr_err("%s: can't map IRQ for CPU%d\n",
+                   __func__, cpu);
+            ret = -EINVAL;
+            goto out;
+        }
+
+        irq_set_status_flags(cpu_to->clkevt.irq, IRQ_NOAUTOEN);
+        ret = request_irq(cpu_to->clkevt.irq, tegra_timer_isr,
+                  IRQF_TIMER | IRQF_NOBALANCING,
+                  cpu_to->clkevt.name, &cpu_to->clkevt);
+        if (ret) {
+            pr_err("%s: cannot setup irq %d for CPU%d\n",
Quoted 9 lines
Quoted 5 lines

+                __func__, cpu_to->clkevt.irq, cpu); +            ret = -EINVAL;
+            goto out_irq;
+        }
+    }

You should configure the timer in the tegra_timer_setup() function instead of using this cpu loop.

Quoted 2 lines

I think I still need to leave 'irq_of_parse_and_map' and 'request_irq' here. Is that ok?

Perhaps you can store the np pointer in the private data structure of timer-of and let the timer_of API to retrieve the irq in the cpuhp callbacks.

irq_of_parse_and_map will be called by timer-of.

Quoted 7 lines
Quoted 3 lines

I'm not sure irq_set_status_flags really operates on the irq because it is called after request_irq.

I did some experiments today. The 'irq_of_parse_and_map', 'request_irq' and 'setup_irq' are not able to run in the atomic section that tegra_timer_setup would be triggered in.

Oh ... right

Quoted 3 lines

So I think I still need to leave the IRQ configuration code here in the loop. Should I move others to 'tegra_timer_setup' or just keep as the same in this patch?

For the moment, I suggest you keep it as it was initially.

A side note, not related to this comment but about the DYNIRQ flag. Actually it is not needed because the timers are per-cpu.

Thanks

-- Daniel

Signature · 11 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


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author
#12 lore raw

PATCH v6 3/7 soc/tegra: default select TEGRA_TIMER for Tegra210

In reply to Joseph Lo

The tegra timer is necessary for Tegra210 to support CPU idle power-down state. So select it by default.

---
v6:
* add ack tag from Jon.
v5:
* add ack tag from Thierry.
v4:
* new added in this version

---
 drivers/soc/tegra/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/soc/tegra/Kconfig +1 -0
index fe4481676da6..a0b03443d8c1 100644
@@ -76,6 +76,7 @@ config ARCH_TEGRA_210_SOC
 	select PINCTRL_TEGRA210
 	select SOC_TEGRA_FLOWCTRL
 	select SOC_TEGRA_PMC
+	select TEGRA_TIMER
 	help
 	  Enable support for the NVIDIA Tegra210 SoC. Also known as Tegra X1,
 	  the Tegra210 has four Cortex-A57 cores paired with four Cortex-A53
Signature · 1 line
2.20.1
author
#13 lore raw

PATCH v6 4/7 arm64: dts: tegra210: fix timer node

In reply to Joseph Lo

Fix timer node to make it work with Tegra210 timer driver.

---
v6:
* add ack tag from Jon.
v5:
* no change
v4:
* no change
v3:
* no change
v2:
* list all the IRQs per each timer channels 0 through 13
* remove compatible string of "nvidia,tegra30-timer"

---
 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/nvidia/tegra210.dtsi +11 -3
index b5858b5ea052..2b387364afc3 100644
@@ -384,14 +384,22 @@
 	};
 
 	timer@60005000 {
-		compatible = "nvidia,tegra210-timer", "nvidia,tegra20-timer";
+		compatible = "nvidia,tegra210-timer";
 		reg = <0x0 0x60005000 0x0 0x400>;
-		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+		interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
+			     <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 179 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA210_CLK_TIMER>;
 		clock-names = "timer";
 	};
Signature · 1 line
2.20.1
author
#14 lore raw

PATCH v6 5/7 arm64: dts: tegra210: add CPU idle states properties

In reply to Joseph Lo

Add idle states properties for generic ARM CPU idle driver. This includes a C7 state which is the power down state of CPU cores.

---
v6:
* add ack tag from Jon.
v5:
* no change
v4:
* no change
v3:
* no change
v2:
* add entry-latency-us and exit-latency-us properties

Note:
This dt patch depends on the DT changes in below series.
http://patchwork.ozlabs.org/project/linux-tegra/list/?series=84380

---
 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
arch/arm64/boot/dts/nvidia/tegra210.dtsi +19 -0
index 2b387364afc3..75534692604c 100644
@@ -1318,24 +1318,43 @@
 				 <&dfll>;
 			clock-names = "cpu_g", "pll_x", "pll_p", "dfll";
 			clock-latency = <300000>;
+			cpu-idle-states = <&C7>;
 		};
 
 		cpu@1 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a57";
 			reg = <1>;
+			cpu-idle-states = <&C7>;
 		};
 
 		cpu@2 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a57";
 			reg = <2>;
+			cpu-idle-states = <&C7>;
 		};
 
 		cpu@3 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a57";
 			reg = <3>;
+			cpu-idle-states = <&C7>;
+		};
+
+		idle-states {
+			entry-method = "psci";
+
+			C7: c7 {
+				compatible = "arm,idle-state";
+				arm,psci-suspend-param = <0x40000007>;
+				entry-latency-us = <250>;
+				exit-latency-us = <100>;
+				min-residency-us = <1000>;
+				wakeup-latency-us = <130>;
+				idle-state-name = "c7-cpu-powergated";
+				status = "disabled";
+			};
 		};
 	};
 
Signature · 1 line
2.20.1
#15 lore raw

Re: [PATCH V6 5/7] arm64: dts: tegra210: add CPU idle states properties

Quoted 29 lines · Joseph Lo

Add idle states properties for generic ARM CPU idle driver. This includes a C7 state which is the power down state of CPU cores.

---
v6:
* add ack tag from Jon.
v5:
* no change
v4:
* no change
v3:
* no change
v2:
* add entry-latency-us and exit-latency-us properties

Note:
This dt patch depends on the DT changes in below series.
http://patchwork.ozlabs.org/project/linux-tegra/list/?series=84380

---
 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
arch/arm64/boot/dts/nvidia/tegra210.dtsi +0 -0
index 2b387364afc3..75534692604c 100644

arch/arm64/boot/dts/nvidia/tegra210.dtsi line 1321

Quoted 4 lines
arch/arm64/boot/dts/nvidia/tegra210.dtsi +1 -0
@@ -1318,24 +1318,43 @@
 				 <&dfll>;
 			clock-names = "cpu_g", "pll_x", "pll_p", "dfll";
 			clock-latency = <300000>;
+			cpu-idle-states = <&C7>;

Please change the C7 name, that will be confusing with the C-state.

CPU_SLEEP would be nice and consistent with other drivers.

Quoted 23 lines
arch/arm64/boot/dts/nvidia/tegra210.dtsi +5 -0
 		};
 
 		cpu@1 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a57";
 			reg = <1>;
+			cpu-idle-states = <&C7>;
 		};
 
 		cpu@2 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a57";
 			reg = <2>;
+			cpu-idle-states = <&C7>;
 		};
 
 		cpu@3 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a57";
 			reg = <3>;
+			cpu-idle-states = <&C7>;
+		};
+

arch/arm64/boot/dts/nvidia/tegra210.dtsi line 1354

Quoted 10 lines
arch/arm64/boot/dts/nvidia/tegra210.dtsi +10 -0
+		idle-states {
+			entry-method = "psci";
+
+			C7: c7 {
+				compatible = "arm,idle-state";
+				arm,psci-suspend-param = <0x40000007>;
+				entry-latency-us = <250>;
+				exit-latency-us = <100>;
+				min-residency-us = <1000>;
+				wakeup-latency-us = <130>;

Regarding the entry and the exit latency, the wakeup latency sounds a bit small.

./devicetree/bindings/arm/idle-states.txt

arch/arm64/boot/dts/nvidia/tegra210.dtsi line 1355

Quoted 1 line
arch/arm64/boot/dts/nvidia/tegra210.dtsi +1 -0
+				idle-state-name = "c7-cpu-powergated";

"cpu-sleep"

Quoted 6 lines
arch/arm64/boot/dts/nvidia/tegra210.dtsi +2 -0
+				status = "disabled";
+			};
 		};
 	};
 
Signature · 11 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


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author
#16 lore raw

Re: [PATCH V6 5/7] arm64: dts: tegra210: add CPU idle states properties

Quoted 76 lines · Daniel Lezcano
Quoted 29 lines · Joseph Lo

Add idle states properties for generic ARM CPU idle driver. This includes a C7 state which is the power down state of CPU cores.

---
v6:
* add ack tag from Jon.
v5:
* no change
v4:
* no change
v3:
* no change
v2:
* add entry-latency-us and exit-latency-us properties

Note:
This dt patch depends on the DT changes in below series.
http://patchwork.ozlabs.org/project/linux-tegra/list/?series=84380

---
  arch/arm64/boot/dts/nvidia/tegra210.dtsi | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
arch/arm64/boot/dts/nvidia/tegra210.dtsi +0 -0
index 2b387364afc3..75534692604c 100644

arch/arm64/boot/dts/nvidia/tegra210.dtsi line 1321

Quoted 4 lines
arch/arm64/boot/dts/nvidia/tegra210.dtsi +1 -0
@@ -1318,24 +1318,43 @@
  				 <&dfll>;
  			clock-names = "cpu_g", "pll_x", "pll_p", "dfll";
  			clock-latency = <300000>;
+			cpu-idle-states = <&C7>;

Please change the C7 name, that will be confusing with the C-state.

CPU_SLEEP would be nice and consistent with other drivers.

Quoted 23 lines
arch/arm64/boot/dts/nvidia/tegra210.dtsi +5 -0
  		};
 
  		cpu@1 {
  			device_type = "cpu";
  			compatible = "arm,cortex-a57";
  			reg = <1>;
+			cpu-idle-states = <&C7>;
  		};
 
  		cpu@2 {
  			device_type = "cpu";
  			compatible = "arm,cortex-a57";
  			reg = <2>;
+			cpu-idle-states = <&C7>;
  		};
 
  		cpu@3 {
  			device_type = "cpu";
  			compatible = "arm,cortex-a57";
  			reg = <3>;
+			cpu-idle-states = <&C7>;
+		};
+

arch/arm64/boot/dts/nvidia/tegra210.dtsi line 1354

Quoted 10 lines
arch/arm64/boot/dts/nvidia/tegra210.dtsi +10 -0
+		idle-states {
+			entry-method = "psci";
+
+			C7: c7 {
+				compatible = "arm,idle-state";
+				arm,psci-suspend-param = <0x40000007>;
+				entry-latency-us = <250>;
+				exit-latency-us = <100>;
+				min-residency-us = <1000>;
+				wakeup-latency-us = <130>;

Regarding the entry and the exit latency, the wakeup latency sounds a bit small.

Quoted 6 lines

./devicetree/bindings/arm/idle-states.txt

arch/arm64/boot/dts/nvidia/tegra210.dtsi line 1355

Quoted 1 line
arch/arm64/boot/dts/nvidia/tegra210.dtsi +1 -0
+				idle-state-name = "c7-cpu-powergated";

"cpu-sleep"

Will fix them.

Thanks for reviewing,
Joseph

Quoted 8 lines
Quoted 6 lines
arch/arm64/boot/dts/nvidia/tegra210.dtsi +2 -0
+				status = "disabled";
+			};
  		};
  	};
 
author
#17 lore raw

PATCH v6 6/7 arm64: dts: tegra210-p2180: Enable CPU idle support

In reply to Joseph Lo

Enable CPU idle support for Jetson TX1 platform.

---
v6:
* add ack tag from Jon.
v5:
* no change
v4:
* no change
v3:
* no change
v2:
* no change

---
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +6 -0
index 053458a5db55..d1a492c63e96 100644
@@ -305,6 +305,12 @@
 		cpu@3 {
 			enable-method = "psci";
 		};
+
+		idle-states {
+			c7 {
+				status = "okay";
+			};
+		};
 	};
 
 	psci {
Signature · 1 line
2.20.1
author
#18 lore raw

PATCH v6 7/7 arm64: dts: tegra210-smaug: Enable CPU idle support

In reply to Joseph Lo

Enable CPU idle support for Smaug platform.

---
v6:
* add ack tag from Jon.
v5:
* no change
v4:
* no change
v3:
* no change
v2:
* no change

---
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +7 -0
index 5a67890cfb7a..da0eb4530acf 100644
@@ -1751,6 +1751,13 @@
 		cpu@3 {
 			enable-method = "psci";
 		};
+
+		idle-states {
+			c7 {
+				arm,psci-suspend-param = <0x00010007>;
+				status = "okay";
+			};
+		};
 	};
 
 	gpio-keys {
Signature · 1 line
2.20.1