Skip to contentSkip to conversation

clocksource: timer-of: Support getting clock frequency from DT

PATCH RESEND In review [email protected] 2 participants 12 messages Jul 2, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND v4 1/5 clocksource: timer-of: Support getting clock frequency from DT

From: Anson Huang <[email protected]>

More and more platforms use platform driver model for clock driver, so the clock driver is NOT ready during timer initialization phase, it will cause timer initialization failed.

To support those platforms with upper scenario, introducing a new flag TIMER_OF_CLOCK_FREQUENCY which is mutually exclusive with TIMER_OF_CLOCK flag to support getting timer clock frequency from DT's timer node, the property name should be "clock-frequency", then of_clk operations can be skipped.

User needs to select either TIMER_OF_CLOCK_FREQUENCY or TIMER_OF_CLOCK flag if want to use timer-of driver to initialize the clock rate.

---
Changes since V3:
- use hardcoded "clock-frequency" instead of adding new variable prop_name;
- add pre-condition check for TIMER_OF_CLOCK and TIMER_OF_CLOCK_FREQUENCY, they MUST be exclusive.

---
 drivers/clocksource/timer-of.c | 29 +++++++++++++++++++++++++++++
 drivers/clocksource/timer-of.h |  7 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
drivers/clocksource/timer-of.c +29 -0
index 8054228..858f684 100644
@@ -161,11 +161,30 @@ static __init int timer_of_base_init(struct device_node *np,
 	return 0;
 }
 
+static __init int timer_of_clk_frequency_init(struct device_node *np,
+					      struct of_timer_clk *of_clk)
+{
+	int ret;
+	u32 rate;
+
+	ret = of_property_read_u32(np, "clock-frequency", &rate);
+	if (!ret) {
+		of_clk->rate = rate;
+		of_clk->period = DIV_ROUND_UP(rate, HZ);
+	}
+
+	return ret;
+}
+
 int __init timer_of_init(struct device_node *np, struct timer_of *to)
 {
+	unsigned long clock_flags = TIMER_OF_CLOCK | TIMER_OF_CLOCK_FREQUENCY;
 	int ret = -EINVAL;
 	int flags = 0;
 
+	if ((to->flags & clock_flags) == clock_flags)
+		return ret;
+
 	if (to->flags & TIMER_OF_BASE) {
 		ret = timer_of_base_init(np, &to->of_base);
 		if (ret)
@@ -180,6 +199,13 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to)
 		flags |= TIMER_OF_CLOCK;
 	}
 
+	if (to->flags & TIMER_OF_CLOCK_FREQUENCY) {
+		ret = timer_of_clk_frequency_init(np, &to->of_clk);
+		if (ret)
+			goto out_fail;
+		flags |= TIMER_OF_CLOCK_FREQUENCY;
+	}
+
 	if (to->flags & TIMER_OF_IRQ) {
 		ret = timer_of_irq_init(np, &to->of_irq);
 		if (ret)
@@ -201,6 +227,9 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to)
 	if (flags & TIMER_OF_CLOCK)
 		timer_of_clk_exit(&to->of_clk);
 
+	if (flags & TIMER_OF_CLOCK_FREQUENCY)
+		to->of_clk.rate = 0;
+
 	if (flags & TIMER_OF_BASE)
 		timer_of_base_exit(&to->of_base);
 	return ret;
drivers/clocksource/timer-of.h +4 -3
index a5478f3..a08e108 100644
@@ -4,9 +4,10 @@
 
 #include <linux/clockchips.h>
 
-#define TIMER_OF_BASE	0x1
-#define TIMER_OF_CLOCK	0x2
-#define TIMER_OF_IRQ	0x4
+#define TIMER_OF_BASE			0x1
+#define TIMER_OF_CLOCK			0x2
+#define TIMER_OF_IRQ			0x4
+#define TIMER_OF_CLOCK_FREQUENCY	0x8
 
 struct of_timer_irq {
 	int irq;
Signature · 1 line
2.7.4
#1 lore raw

PATCH RESEND v4 2/5 clocksource/drivers/sysctr: Add clock-frequency property

From: Anson Huang <[email protected]>

Systems which use platform driver model for clock driver require the clock frequency to be supplied via device tree when system counter driver is enabled.

This is necessary as in the platform driver model the of_clk operations do not work correctly because system counter driver is initialized in early phase of system boot up, and clock driver using platform driver model is NOT ready at that time, it will cause system counter driver initialization failed.

Add clock-frequency property to the device tree bindings of the NXP system counter, so the driver can tell timer-of driver to get clock frequency from DT directly instead of doing of_clk operations via clk APIs.

---
No changes.

---
 .../devicetree/bindings/timer/nxp,sysctr-timer.txt        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/timer/nxp,sysctr-timer.txt +9 -6
index d576599..7088a0e 100644
@@ -11,15 +11,18 @@ Required properties:
 - reg :             Specifies the base physical address and size of the comapre
                     frame and the counter control, read & compare.
 - interrupts :      should be the first compare frames' interrupt
-- clocks : 	    Specifies the counter clock.
-- clock-names: 	    Specifies the clock's name of this module
+- clocks :          Specifies the counter clock, mutually exclusive with clock-frequency.
+- clock-names :     Specifies the clock's name of this module, mutually exclusive with
+		    clock-frequency.
+- clock-frequency : Specifies system counter clock frequency, mutually exclusive with
+		    clocks/clock-names.
 
 Example:
 
 	system_counter: timer@306a0000 {
 		compatible = "nxp,sysctr-timer";
-		reg = <0x306a0000 0x20000>;/* system-counter-rd & compare */
-		clocks = <&clk_8m>;
-		clock-names = "per";
-		interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
+		reg = <0x306a0000 0x30000>;
+		interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+		clock-frequency = <8333333>;
 	};
Signature · 1 line
2.7.4
#2 lore raw

PATCH RESEND v4 3/5 clocksource: imx-sysctr: Make timer work with clock driver using platform driver model

In reply to [email protected]

From: Anson Huang <[email protected]>

On some i.MX8M platforms, clock driver uses platform driver model and it is NOT ready during timer initialization phase, the clock operations will fail and system counter driver will fail too. As all the i.MX8M platforms' system counter clock are from OSC which is always enabled, so it is no need to enable clock for system counter driver, the ONLY thing is to pass clock frequence to driver.

To make system counter driver work for upper scenario, if DT's system counter node has property "clock-frequency" present, setting TIMER_OF_CLOCK_FREQUENCY flag to indicate timer-of driver to get clock frequency from DT directly instead of of_clk operation via clk APIs.

---
Changes since V3:
- remove the .prop_name initialization acording to timer-of changes in V4.

---
 drivers/clocksource/timer-imx-sysctr.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clocksource/timer-imx-sysctr.c +4 -1
index fd7d680..b82a549 100644
@@ -98,7 +98,7 @@ static irqreturn_t sysctr_timer_interrupt(int irq, void *dev_id)
 }
 
 static struct timer_of to_sysctr = {
-	.flags = TIMER_OF_IRQ | TIMER_OF_CLOCK | TIMER_OF_BASE,
+	.flags = TIMER_OF_IRQ | TIMER_OF_BASE,
 	.clkevt = {
 		.name			= "i.MX system counter timer",
 		.features		= CLOCK_EVT_FEAT_ONESHOT |
@@ -130,6 +130,9 @@ static int __init sysctr_timer_init(struct device_node *np)
 {
 	int ret = 0;
 
+	to_sysctr.flags |= of_find_property(np, "clock-frequency", NULL) ?
+			   TIMER_OF_CLOCK_FREQUENCY : TIMER_OF_CLOCK;
+
 	ret = timer_of_init(np, &to_sysctr);
 	if (ret)
 		return ret;
Signature · 1 line
2.7.4
#3 lore raw

PATCH RESEND v4 4/5 arm64: dts: imx8mq: Add system counter node

In reply to [email protected]

From: Anson Huang <[email protected]>

Add i.MX8MQ system counter node to enable timer-imx-sysctr broadcast timer driver.

---
No changes.

---
 arch/arm64/boot/dts/freescale/imx8mq.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/freescale/imx8mq.dtsi +8 -0
index 50931da..3187428 100644
@@ -639,6 +639,14 @@
 				#pwm-cells = <2>;
 				status = "disabled";
 			};
+
+			system_counter: timer@306a0000 {
+				compatible = "nxp,sysctr-timer";
+				reg = <0x306a0000 0x30000>;
+				interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+				clock-frequency = <8333333>;
+			};
 		};
 
 		bus@30800000 { /* AIPS3 */
Signature · 1 line
2.7.4
#4 lore raw

PATCH RESEND v4 5/5 arm64: dts: imx8mm: Add system counter node

In reply to [email protected]

From: Anson Huang <[email protected]>

Add i.MX8MM system counter node to enable timer-imx-sysctr broadcast timer driver.

---
No changes.

---
 arch/arm64/boot/dts/freescale/imx8mm.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/freescale/imx8mm.dtsi +8 -0
index b726712..b11fc5e 100644
@@ -532,6 +532,14 @@
 				#pwm-cells = <2>;
 				status = "disabled";
 			};
+
+			system_counter: timer@306a0000 {
+				compatible = "nxp,sysctr-timer";
+				reg = <0x306a0000 0x30000>;
+				interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+				clock-frequency = <8000000>;
+			};
 		};
 
 		aips3: bus@30800000 {
Signature · 1 line
2.7.4
#5 lore raw
In reply to [email protected]

Hi Anson,

why did you resend the series?

Quoted 103 lines · On 02/07/2019 09:55, [email protected] wrote:

From: Anson Huang <[email protected]>

More and more platforms use platform driver model for clock driver, so the clock driver is NOT ready during timer initialization phase, it will cause timer initialization failed.

To support those platforms with upper scenario, introducing a new flag TIMER_OF_CLOCK_FREQUENCY which is mutually exclusive with TIMER_OF_CLOCK flag to support getting timer clock frequency from DT's timer node, the property name should be "clock-frequency", then of_clk operations can be skipped.

User needs to select either TIMER_OF_CLOCK_FREQUENCY or TIMER_OF_CLOCK flag if want to use timer-of driver to initialize the clock rate.

---
Changes since V3:
- use hardcoded "clock-frequency" instead of adding new variable prop_name;
- add pre-condition check for TIMER_OF_CLOCK and TIMER_OF_CLOCK_FREQUENCY, they MUST be exclusive.

---
 drivers/clocksource/timer-of.c | 29 +++++++++++++++++++++++++++++
 drivers/clocksource/timer-of.h |  7 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
drivers/clocksource/timer-of.c +29 -0
index 8054228..858f684 100644
@@ -161,11 +161,30 @@ static __init int timer_of_base_init(struct device_node *np,
 	return 0;
 }
 
+static __init int timer_of_clk_frequency_init(struct device_node *np,
+					      struct of_timer_clk *of_clk)
+{
+	int ret;
+	u32 rate;
+
+	ret = of_property_read_u32(np, "clock-frequency", &rate);
+	if (!ret) {
+		of_clk->rate = rate;
+		of_clk->period = DIV_ROUND_UP(rate, HZ);
+	}
+
+	return ret;
+}
+
 int __init timer_of_init(struct device_node *np, struct timer_of *to)
 {
+	unsigned long clock_flags = TIMER_OF_CLOCK | TIMER_OF_CLOCK_FREQUENCY;
 	int ret = -EINVAL;
 	int flags = 0;
 
+	if ((to->flags & clock_flags) == clock_flags)
+		return ret;
+
 	if (to->flags & TIMER_OF_BASE) {
 		ret = timer_of_base_init(np, &to->of_base);
 		if (ret)
@@ -180,6 +199,13 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to)
 		flags |= TIMER_OF_CLOCK;
 	}
 
+	if (to->flags & TIMER_OF_CLOCK_FREQUENCY) {
+		ret = timer_of_clk_frequency_init(np, &to->of_clk);
+		if (ret)
+			goto out_fail;
+		flags |= TIMER_OF_CLOCK_FREQUENCY;
+	}
+
 	if (to->flags & TIMER_OF_IRQ) {
 		ret = timer_of_irq_init(np, &to->of_irq);
 		if (ret)
@@ -201,6 +227,9 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to)
 	if (flags & TIMER_OF_CLOCK)
 		timer_of_clk_exit(&to->of_clk);
 
+	if (flags & TIMER_OF_CLOCK_FREQUENCY)
+		to->of_clk.rate = 0;
+
 	if (flags & TIMER_OF_BASE)
 		timer_of_base_exit(&to->of_base);
 	return ret;
drivers/clocksource/timer-of.h +4 -3
index a5478f3..a08e108 100644
@@ -4,9 +4,10 @@
 
 #include <linux/clockchips.h>
 
-#define TIMER_OF_BASE	0x1
-#define TIMER_OF_CLOCK	0x2
-#define TIMER_OF_IRQ	0x4
+#define TIMER_OF_BASE			0x1
+#define TIMER_OF_CLOCK			0x2
+#define TIMER_OF_IRQ			0x4
+#define TIMER_OF_CLOCK_FREQUENCY	0x8
 
 struct of_timer_irq {
 	int irq;
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
#6 lore raw

Hi, Daniel

Quoted 3 lines

Hi Anson,

why did you resend the series?

Previous patch series has build warning and I did NOT notice, sorry for that,

drivers/clocksource/timer-of.c: In function ‘timer_of_init’:
drivers/clocksource/timer-of.c:185:30: warning: suggest parentheses around comparison in operand of ‘&’ [-Wparentheses]
if (to->flags & clock_flags == clock_flags)

                              ^

so I resend the patch series with below, sorry for missing mention of the changes in resent patch series.

+ if ((to->flags & clock_flags) == clock_flags)

Sorry for mail storm...

Thanks,
Anson

Quoted 111 lines · On 02/07/2019 09:55, [email protected] wrote:
Quoted 6 lines

From: Anson Huang <[email protected]>

More and more platforms use platform driver model for clock driver, so the clock driver is NOT ready during timer initialization phase, it will cause timer initialization failed.

Quoted 7 lines

To support those platforms with upper scenario, introducing a new flag TIMER_OF_CLOCK_FREQUENCY which is mutually exclusive with TIMER_OF_CLOCK flag to support getting timer clock frequency from DT's timer node, the property name should be "clock-frequency", then of_clk operations can be skipped.

User needs to select either TIMER_OF_CLOCK_FREQUENCY or

TIMER_OF_CLOCK

Quoted 6 lines

flag if want to use timer-of driver to initialize the clock rate.

---
Changes since V3:
- use hardcoded "clock-frequency" instead of adding new variable

prop_name;

Quoted 1 line

- add pre-condition check for TIMER_OF_CLOCK and

TIMER_OF_CLOCK_FREQUENCY, they MUST be exclusive.

drivers/clocksource/timer-of.c static __init int timer_of_base_init(struct

Quoted 10 lines
---
 drivers/clocksource/timer-of.c | 29 +++++++++++++++++++++++++++++
drivers/clocksource/timer-of.h |  7 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/clocksource/timer-of.c index 8054228..858f684 100644

drivers/clocksource/timer-of.c +0 -0
@@ -161,11 +161,30 @@ static __init int timer_of_base_init(struct

device_node *np,

drivers/clocksource/timer-of.c int __init timer_of_init(struct device_node *np,

Quoted 31 lines
drivers/clocksource/timer-of.c +19 -0
 	return 0;
 }
 
+static __init int timer_of_clk_frequency_init(struct device_node *np,
+					      struct of_timer_clk *of_clk) {
+	int ret;
+	u32 rate;
+
+	ret = of_property_read_u32(np, "clock-frequency", &rate);
+	if (!ret) {
+		of_clk->rate = rate;
+		of_clk->period = DIV_ROUND_UP(rate, HZ);
+	}
+
+	return ret;
+}
+
 int __init timer_of_init(struct device_node *np, struct timer_of *to)
 {
+	unsigned long clock_flags = TIMER_OF_CLOCK |
+TIMER_OF_CLOCK_FREQUENCY;
 	int ret = -EINVAL;
 	int flags = 0;
 
+	if ((to->flags & clock_flags) == clock_flags)
+		return ret;
+
 	if (to->flags & TIMER_OF_BASE) {
 		ret = timer_of_base_init(np, &to->of_base);
 		if (ret)
@@ -180,6 +199,13 @@ int __init timer_of_init(struct device_node *np,

struct timer_of *to)

drivers/clocksource/timer-of.c int __init timer_of_init(struct device_node *np,

Quoted 14 lines
drivers/clocksource/timer-of.c +7 -0
 		flags |= TIMER_OF_CLOCK;
 	}
 
+	if (to->flags & TIMER_OF_CLOCK_FREQUENCY) {
+		ret = timer_of_clk_frequency_init(np, &to->of_clk);
+		if (ret)
+			goto out_fail;
+		flags |= TIMER_OF_CLOCK_FREQUENCY;
+	}
+
 	if (to->flags & TIMER_OF_IRQ) {
 		ret = timer_of_irq_init(np, &to->of_irq);
 		if (ret)
@@ -201,6 +227,9 @@ int __init timer_of_init(struct device_node *np,

struct timer_of *to)

Quoted 27 lines
drivers/clocksource/timer-of.c +3 -0
 	if (flags & TIMER_OF_CLOCK)
 		timer_of_clk_exit(&to->of_clk);
 
+	if (flags & TIMER_OF_CLOCK_FREQUENCY)
+		to->of_clk.rate = 0;
+
 	if (flags & TIMER_OF_BASE)
 		timer_of_base_exit(&to->of_base);
 	return ret;
(quoted diff) +0 -0

b/drivers/clocksource/timer-of.h index a5478f3..a08e108 100644

drivers/clocksource/timer-of.h +4 -3
@@ -4,9 +4,10 @@
 
 #include <linux/clockchips.h>
 
-#define TIMER_OF_BASE	0x1
-#define TIMER_OF_CLOCK	0x2
-#define TIMER_OF_IRQ	0x4
+#define TIMER_OF_BASE			0x1
+#define TIMER_OF_CLOCK			0x2
+#define TIMER_OF_IRQ			0x4
+#define TIMER_OF_CLOCK_FREQUENCY	0x8
 
 struct of_timer_irq {
 	int irq;
#7 lore raw
Quoted 11 lines · Anson Huang

Hi, Daniel

Quoted 3 lines

Hi Anson,

why did you resend the series?

Previous patch series has build warning and I did NOT notice, sorry for that,

drivers/clocksource/timer-of.c: In function ‘timer_of_init’:
drivers/clocksource/timer-of.c:185:30: warning: suggest parentheses around comparison in operand of ‘&’ [-Wparentheses]
if (to->flags & clock_flags == clock_flags)

Quoted 7 lines
                              ^

so I resend the patch series with below, sorry for missing mention of the changes in resent patch series.

+ if ((to->flags & clock_flags) == clock_flags)

Sorry for mail storm...

No problem at all, I prefer this caught and fixed early :)

Next time just send a V5 because 'resend' means there is no change but there was a problem with the email (could be also interpreted as a gentle ping).

Quoted 109 lines
Quoted 109 lines · On 02/07/2019 09:55, [email protected] wrote:
Quoted 6 lines

From: Anson Huang <[email protected]>

More and more platforms use platform driver model for clock driver, so the clock driver is NOT ready during timer initialization phase, it will cause timer initialization failed.

Quoted 7 lines

To support those platforms with upper scenario, introducing a new flag TIMER_OF_CLOCK_FREQUENCY which is mutually exclusive with TIMER_OF_CLOCK flag to support getting timer clock frequency from DT's timer node, the property name should be "clock-frequency", then of_clk operations can be skipped.

User needs to select either TIMER_OF_CLOCK_FREQUENCY or

TIMER_OF_CLOCK

Quoted 6 lines

flag if want to use timer-of driver to initialize the clock rate.

---
Changes since V3:
- use hardcoded "clock-frequency" instead of adding new variable

prop_name;

Quoted 1 line

- add pre-condition check for TIMER_OF_CLOCK and

TIMER_OF_CLOCK_FREQUENCY, they MUST be exclusive.

drivers/clocksource/timer-of.c static __init int timer_of_base_init(struct

Quoted 10 lines
---
 drivers/clocksource/timer-of.c | 29 +++++++++++++++++++++++++++++
drivers/clocksource/timer-of.h |  7 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/clocksource/timer-of.c index 8054228..858f684 100644

drivers/clocksource/timer-of.c +0 -0
@@ -161,11 +161,30 @@ static __init int timer_of_base_init(struct

device_node *np,

drivers/clocksource/timer-of.c int __init timer_of_init(struct device_node *np,

Quoted 31 lines
drivers/clocksource/timer-of.c +19 -0
 	return 0;
 }
 
+static __init int timer_of_clk_frequency_init(struct device_node *np,
+					      struct of_timer_clk *of_clk) {
+	int ret;
+	u32 rate;
+
+	ret = of_property_read_u32(np, "clock-frequency", &rate);
+	if (!ret) {
+		of_clk->rate = rate;
+		of_clk->period = DIV_ROUND_UP(rate, HZ);
+	}
+
+	return ret;
+}
+
 int __init timer_of_init(struct device_node *np, struct timer_of *to)
 {
+	unsigned long clock_flags = TIMER_OF_CLOCK |
+TIMER_OF_CLOCK_FREQUENCY;
 	int ret = -EINVAL;
 	int flags = 0;
 
+	if ((to->flags & clock_flags) == clock_flags)
+		return ret;
+
 	if (to->flags & TIMER_OF_BASE) {
 		ret = timer_of_base_init(np, &to->of_base);
 		if (ret)
@@ -180,6 +199,13 @@ int __init timer_of_init(struct device_node *np,

struct timer_of *to)

drivers/clocksource/timer-of.c int __init timer_of_init(struct device_node *np,

Quoted 14 lines
drivers/clocksource/timer-of.c +7 -0
 		flags |= TIMER_OF_CLOCK;
 	}
 
+	if (to->flags & TIMER_OF_CLOCK_FREQUENCY) {
+		ret = timer_of_clk_frequency_init(np, &to->of_clk);
+		if (ret)
+			goto out_fail;
+		flags |= TIMER_OF_CLOCK_FREQUENCY;
+	}
+
 	if (to->flags & TIMER_OF_IRQ) {
 		ret = timer_of_irq_init(np, &to->of_irq);
 		if (ret)
@@ -201,6 +227,9 @@ int __init timer_of_init(struct device_node *np,

struct timer_of *to)

Quoted 27 lines
drivers/clocksource/timer-of.c +3 -0
 	if (flags & TIMER_OF_CLOCK)
 		timer_of_clk_exit(&to->of_clk);
 
+	if (flags & TIMER_OF_CLOCK_FREQUENCY)
+		to->of_clk.rate = 0;
+
 	if (flags & TIMER_OF_BASE)
 		timer_of_base_exit(&to->of_base);
 	return ret;
(quoted diff) +0 -0

b/drivers/clocksource/timer-of.h index a5478f3..a08e108 100644

drivers/clocksource/timer-of.h +4 -3
@@ -4,9 +4,10 @@
 
 #include <linux/clockchips.h>
 
-#define TIMER_OF_BASE	0x1
-#define TIMER_OF_CLOCK	0x2
-#define TIMER_OF_IRQ	0x4
+#define TIMER_OF_BASE			0x1
+#define TIMER_OF_CLOCK			0x2
+#define TIMER_OF_IRQ			0x4
+#define TIMER_OF_CLOCK_FREQUENCY	0x8
 
 struct of_timer_irq {
 	int irq;
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
#8 lore raw

Hi, Daniel

Quoted 21 lines · Anson Huang
Quoted 11 lines

Hi, Daniel

Quoted 3 lines

Hi Anson,

why did you resend the series?

Previous patch series has build warning and I did NOT notice, sorry for that,

drivers/clocksource/timer-of.c: In function ‘timer_of_init’:
drivers/clocksource/timer-of.c:185:30: warning: suggest parentheses

around comparison in operand of ‘&’ [-Wparentheses]

Quoted 4 lines

if (to->flags & clock_flags == clock_flags)

                              ^

so I resend the patch series with below, sorry for missing mention of the

changes in resent patch series.

Quoted 3 lines

+ if ((to->flags & clock_flags) == clock_flags)

Quoted 7 lines
Quoted 1 line

Sorry for mail storm...

No problem at all, I prefer this caught and fixed early :)

Next time just send a V5 because 'resend' means there is no change but there was a problem with the email (could be also interpreted as a gentle ping).

OK, will keep it in mind, thanks for sharing useful experience!

Thanks,
Anson

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

#9 lore raw
In reply to Daniel Lezcano

Hi, Daniel

Quoted 21 lines · Anson Huang
Quoted 11 lines

Hi, Daniel

Quoted 3 lines

Hi Anson,

why did you resend the series?

Previous patch series has build warning and I did NOT notice, sorry for that,

drivers/clocksource/timer-of.c: In function ‘timer_of_init’:
drivers/clocksource/timer-of.c:185:30: warning: suggest parentheses

around comparison in operand of ‘&’ [-Wparentheses]

Quoted 4 lines

if (to->flags & clock_flags == clock_flags)

                              ^

so I resend the patch series with below, sorry for missing mention of the

changes in resent patch series.

Quoted 3 lines

+ if ((to->flags & clock_flags) == clock_flags)

Quoted 7 lines
Quoted 1 line

Sorry for mail storm...

No problem at all, I prefer this caught and fixed early :)

Next time just send a V5 because 'resend' means there is no change but there was a problem with the email (could be also interpreted as a gentle ping).

OK, will keep it in mind, thanks for sharing useful experience!

Thanks,
Anson

#10 lore raw
In reply to Anson Huang
Quoted 11 lines · Anson Huang

Hi, Daniel

Quoted 3 lines

Hi Anson,

why did you resend the series?

Previous patch series has build warning and I did NOT notice, sorry for that,

drivers/clocksource/timer-of.c: In function ‘timer_of_init’:
drivers/clocksource/timer-of.c:185:30: warning: suggest parentheses around comparison in operand of ‘&’ [-Wparentheses]
if (to->flags & clock_flags == clock_flags)

Quoted 7 lines
                              ^

so I resend the patch series with below, sorry for missing mention of the changes in resent patch series.

+ if ((to->flags & clock_flags) == clock_flags)

Sorry for mail storm...

No problem at all, I prefer this caught and fixed early :)

Next time just send a V5 because 'resend' means there is no change but there was a problem with the email (could be also interpreted as a gentle ping).

Quoted 109 lines
Quoted 109 lines · On 02/07/2019 09:55, [email protected] wrote:
Quoted 6 lines

From: Anson Huang <[email protected]>

More and more platforms use platform driver model for clock driver, so the clock driver is NOT ready during timer initialization phase, it will cause timer initialization failed.

Quoted 7 lines

To support those platforms with upper scenario, introducing a new flag TIMER_OF_CLOCK_FREQUENCY which is mutually exclusive with TIMER_OF_CLOCK flag to support getting timer clock frequency from DT's timer node, the property name should be "clock-frequency", then of_clk operations can be skipped.

User needs to select either TIMER_OF_CLOCK_FREQUENCY or

TIMER_OF_CLOCK

Quoted 6 lines

flag if want to use timer-of driver to initialize the clock rate.

---
Changes since V3:
- use hardcoded "clock-frequency" instead of adding new variable

prop_name;

Quoted 1 line

- add pre-condition check for TIMER_OF_CLOCK and

TIMER_OF_CLOCK_FREQUENCY, they MUST be exclusive.

drivers/clocksource/timer-of.c static __init int timer_of_base_init(struct

Quoted 10 lines
---
 drivers/clocksource/timer-of.c | 29 +++++++++++++++++++++++++++++
drivers/clocksource/timer-of.h |  7 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/clocksource/timer-of.c index 8054228..858f684 100644

drivers/clocksource/timer-of.c +0 -0
@@ -161,11 +161,30 @@ static __init int timer_of_base_init(struct

device_node *np,

drivers/clocksource/timer-of.c int __init timer_of_init(struct device_node *np,

Quoted 31 lines
drivers/clocksource/timer-of.c +19 -0
 	return 0;
 }
 
+static __init int timer_of_clk_frequency_init(struct device_node *np,
+					      struct of_timer_clk *of_clk) {
+	int ret;
+	u32 rate;
+
+	ret = of_property_read_u32(np, "clock-frequency", &rate);
+	if (!ret) {
+		of_clk->rate = rate;
+		of_clk->period = DIV_ROUND_UP(rate, HZ);
+	}
+
+	return ret;
+}
+
 int __init timer_of_init(struct device_node *np, struct timer_of *to)
 {
+	unsigned long clock_flags = TIMER_OF_CLOCK |
+TIMER_OF_CLOCK_FREQUENCY;
 	int ret = -EINVAL;
 	int flags = 0;
 
+	if ((to->flags & clock_flags) == clock_flags)
+		return ret;
+
 	if (to->flags & TIMER_OF_BASE) {
 		ret = timer_of_base_init(np, &to->of_base);
 		if (ret)
@@ -180,6 +199,13 @@ int __init timer_of_init(struct device_node *np,

struct timer_of *to)

drivers/clocksource/timer-of.c int __init timer_of_init(struct device_node *np,

Quoted 14 lines
drivers/clocksource/timer-of.c +7 -0
 		flags |= TIMER_OF_CLOCK;
 	}
 
+	if (to->flags & TIMER_OF_CLOCK_FREQUENCY) {
+		ret = timer_of_clk_frequency_init(np, &to->of_clk);
+		if (ret)
+			goto out_fail;
+		flags |= TIMER_OF_CLOCK_FREQUENCY;
+	}
+
 	if (to->flags & TIMER_OF_IRQ) {
 		ret = timer_of_irq_init(np, &to->of_irq);
 		if (ret)
@@ -201,6 +227,9 @@ int __init timer_of_init(struct device_node *np,

struct timer_of *to)

Quoted 27 lines
drivers/clocksource/timer-of.c +3 -0
 	if (flags & TIMER_OF_CLOCK)
 		timer_of_clk_exit(&to->of_clk);
 
+	if (flags & TIMER_OF_CLOCK_FREQUENCY)
+		to->of_clk.rate = 0;
+
 	if (flags & TIMER_OF_BASE)
 		timer_of_base_exit(&to->of_base);
 	return ret;
(quoted diff) +0 -0

b/drivers/clocksource/timer-of.h index a5478f3..a08e108 100644

drivers/clocksource/timer-of.h +4 -3
@@ -4,9 +4,10 @@
 
 #include <linux/clockchips.h>
 
-#define TIMER_OF_BASE	0x1
-#define TIMER_OF_CLOCK	0x2
-#define TIMER_OF_IRQ	0x4
+#define TIMER_OF_BASE			0x1
+#define TIMER_OF_CLOCK			0x2
+#define TIMER_OF_IRQ			0x4
+#define TIMER_OF_CLOCK_FREQUENCY	0x8
 
 struct of_timer_irq {
 	int irq;
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
#11 lore raw
In reply to Daniel Lezcano

Hi, Daniel

Quoted 3 lines

Hi Anson,

why did you resend the series?

Previous patch series has build warning and I did NOT notice, sorry for that,

drivers/clocksource/timer-of.c: In function ‘timer_of_init’:
drivers/clocksource/timer-of.c:185:30: warning: suggest parentheses around comparison in operand of ‘&’ [-Wparentheses]
if (to->flags & clock_flags == clock_flags)

                              ^

so I resend the patch series with below, sorry for missing mention of the changes in resent patch series.

+ if ((to->flags & clock_flags) == clock_flags)

Sorry for mail storm...

Thanks,
Anson

Quoted 109 lines · On 02/07/2019 09:55, [email protected] wrote:
Quoted 6 lines

From: Anson Huang <[email protected]>

More and more platforms use platform driver model for clock driver, so the clock driver is NOT ready during timer initialization phase, it will cause timer initialization failed.

Quoted 7 lines

To support those platforms with upper scenario, introducing a new flag TIMER_OF_CLOCK_FREQUENCY which is mutually exclusive with TIMER_OF_CLOCK flag to support getting timer clock frequency from DT's timer node, the property name should be "clock-frequency", then of_clk operations can be skipped.

User needs to select either TIMER_OF_CLOCK_FREQUENCY or

TIMER_OF_CLOCK

Quoted 6 lines

flag if want to use timer-of driver to initialize the clock rate.

---
Changes since V3:
- use hardcoded "clock-frequency" instead of adding new variable

prop_name;

Quoted 1 line

- add pre-condition check for TIMER_OF_CLOCK and

TIMER_OF_CLOCK_FREQUENCY, they MUST be exclusive.

drivers/clocksource/timer-of.c static __init int timer_of_base_init(struct

Quoted 10 lines
---
 drivers/clocksource/timer-of.c | 29 +++++++++++++++++++++++++++++
drivers/clocksource/timer-of.h |  7 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/clocksource/timer-of.c index 8054228..858f684 100644

drivers/clocksource/timer-of.c +0 -0
@@ -161,11 +161,30 @@ static __init int timer_of_base_init(struct

device_node *np,

drivers/clocksource/timer-of.c int __init timer_of_init(struct device_node *np,

Quoted 31 lines
drivers/clocksource/timer-of.c +19 -0
 	return 0;
 }
 
+static __init int timer_of_clk_frequency_init(struct device_node *np,
+					      struct of_timer_clk *of_clk) {
+	int ret;
+	u32 rate;
+
+	ret = of_property_read_u32(np, "clock-frequency", &rate);
+	if (!ret) {
+		of_clk->rate = rate;
+		of_clk->period = DIV_ROUND_UP(rate, HZ);
+	}
+
+	return ret;
+}
+
 int __init timer_of_init(struct device_node *np, struct timer_of *to)
 {
+	unsigned long clock_flags = TIMER_OF_CLOCK |
+TIMER_OF_CLOCK_FREQUENCY;
 	int ret = -EINVAL;
 	int flags = 0;
 
+	if ((to->flags & clock_flags) == clock_flags)
+		return ret;
+
 	if (to->flags & TIMER_OF_BASE) {
 		ret = timer_of_base_init(np, &to->of_base);
 		if (ret)
@@ -180,6 +199,13 @@ int __init timer_of_init(struct device_node *np,

struct timer_of *to)

drivers/clocksource/timer-of.c int __init timer_of_init(struct device_node *np,

Quoted 14 lines
drivers/clocksource/timer-of.c +7 -0
 		flags |= TIMER_OF_CLOCK;
 	}
 
+	if (to->flags & TIMER_OF_CLOCK_FREQUENCY) {
+		ret = timer_of_clk_frequency_init(np, &to->of_clk);
+		if (ret)
+			goto out_fail;
+		flags |= TIMER_OF_CLOCK_FREQUENCY;
+	}
+
 	if (to->flags & TIMER_OF_IRQ) {
 		ret = timer_of_irq_init(np, &to->of_irq);
 		if (ret)
@@ -201,6 +227,9 @@ int __init timer_of_init(struct device_node *np,

struct timer_of *to)

Quoted 25 lines
drivers/clocksource/timer-of.c +3 -0
 	if (flags & TIMER_OF_CLOCK)
 		timer_of_clk_exit(&to->of_clk);
 
+	if (flags & TIMER_OF_CLOCK_FREQUENCY)
+		to->of_clk.rate = 0;
+
 	if (flags & TIMER_OF_BASE)
 		timer_of_base_exit(&to->of_base);
 	return ret;
(quoted diff) +0 -0

b/drivers/clocksource/timer-of.h index a5478f3..a08e108 100644

drivers/clocksource/timer-of.h +4 -3
@@ -4,9 +4,10 @@
 
 #include <linux/clockchips.h>
 
-#define TIMER_OF_BASE	0x1
-#define TIMER_OF_CLOCK	0x2
-#define TIMER_OF_IRQ	0x4
+#define TIMER_OF_BASE			0x1
+#define TIMER_OF_CLOCK			0x2
+#define TIMER_OF_IRQ			0x4
+#define TIMER_OF_CLOCK_FREQUENCY	0x8
 
Quoted 2 lines

drivers/clocksource/timer-of.h line 13

Quoted 2 lines
drivers/clocksource/timer-of.h +0 -0
 struct of_timer_irq {
 	int irq;

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