Skip to contentSkip to conversation

clocksource: dw_apb: add reset control

PATCH In review Dinh Nguyen 2 participants 7 messages Sep 17, 2018 – Sep 27, 2018 Clocksource, clockevent drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clocksource: dw_apb: add reset control

Add code to retrieve the reset property for the dw-apb timers.

---
 drivers/clocksource/dw_apb_timer_of.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/clocksource/dw_apb_timer_of.c +9 -0
index 69866cd..24bc073 100644
@@ -22,6 +22,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/clk.h>
+#include <linux/reset.h>
 #include <linux/sched_clock.h>
 
 static void __init timer_get_base_and_rate(struct device_node *np,
@@ -29,12 +30,20 @@ static void __init timer_get_base_and_rate(struct device_node *np,
 {
 	struct clk *timer_clk;
 	struct clk *pclk;
+	struct reset_control *rstc;
 
 	*base = of_iomap(np, 0);
 
 	if (!*base)
 		panic("Unable to map regs for %s", np->name);
 
+	/* Unreset the timer if applicable */
+	rstc = of_reset_control_get(np, NULL);
+	if (!IS_ERR(rstc)) {
+		reset_control_assert(rstc);
+		reset_control_deassert(rstc);
+	}
+
 	/*
 	 * Not all implementations use a periphal clock, so don't panic
 	 * if it's not present
Signature · 1 line
2.7.4
#1 lore raw

Ping?

Quoted 42 lines · Dinh Nguyen

Add code to retrieve the reset property for the dw-apb timers.

---
 drivers/clocksource/dw_apb_timer_of.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/clocksource/dw_apb_timer_of.c +9 -0
index 69866cd..24bc073 100644
@@ -22,6 +22,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/clk.h>
+#include <linux/reset.h>
 #include <linux/sched_clock.h>
 
 static void __init timer_get_base_and_rate(struct device_node *np,
@@ -29,12 +30,20 @@ static void __init timer_get_base_and_rate(struct device_node *np,
 {
 	struct clk *timer_clk;
 	struct clk *pclk;
+	struct reset_control *rstc;
 
 	*base = of_iomap(np, 0);
 
 	if (!*base)
 		panic("Unable to map regs for %s", np->name);
 
+	/* Unreset the timer if applicable */
+	rstc = of_reset_control_get(np, NULL);
+	if (!IS_ERR(rstc)) {
+		reset_control_assert(rstc);
+		reset_control_deassert(rstc);
+	}
+
 	/*
 	 * Not all implementations use a periphal clock, so don't panic
 	 * if it's not present
#2 lore raw
In reply to Dinh Nguyen
Quoted 1 line · Dinh Nguyen

Add code to retrieve the reset property for the dw-apb timers.

The patch does more than that. Can you explain why the assert/deassert ?

Quoted 40 lines
---
 drivers/clocksource/dw_apb_timer_of.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/clocksource/dw_apb_timer_of.c +9 -0
index 69866cd..24bc073 100644
@@ -22,6 +22,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/clk.h>
+#include <linux/reset.h>
 #include <linux/sched_clock.h>
 
 static void __init timer_get_base_and_rate(struct device_node *np,
@@ -29,12 +30,20 @@ static void __init timer_get_base_and_rate(struct device_node *np,
 {
 	struct clk *timer_clk;
 	struct clk *pclk;
+	struct reset_control *rstc;
 
 	*base = of_iomap(np, 0);
 
 	if (!*base)
 		panic("Unable to map regs for %s", np->name);
 
+	/* Unreset the timer if applicable */
+	rstc = of_reset_control_get(np, NULL);
+	if (!IS_ERR(rstc)) {
+		reset_control_assert(rstc);
+		reset_control_deassert(rstc);
+	}
+
 	/*
 	 * Not all implementations use a periphal clock, so don't panic
 	 * if it's not present
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
#3 lore raw
Quoted 4 lines · Daniel Lezcano
Quoted 1 line · Dinh Nguyen

Add code to retrieve the reset property for the dw-apb timers.

The patch does more than that. Can you explain why the assert/deassert ?

Can I update the commit message to this?

Add code to retrieve the reset property from the dw-apb timers and if the property is available, the safe operation is to assert the timer into reset, and followed by a deassert of the timer reset(brings the timer out of reset).

This patch is needed for systems where the bootloader has left the timer not used in reset.

Dinh

#4 lore raw
Quoted 7 lines · Dinh Nguyen

Add code to retrieve the reset property from the dw-apb timers and if the property is available, the safe operation is to assert the timer into reset, and followed by a deassert of the timer reset(brings the timer out of reset).

This patch is needed for systems where the bootloader has left the timer not used in reset.

Ok, I have updated the commit log.

I had to fix a trivial conflict. Let me know if you are all right with the change.

-- 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
#5 lore raw

PATCH 1/1 clocksource/drivers/dw_apb: Add reset control

From: Dinh Nguyen <[email protected]>

Add code to retrieve the reset property from the dw-apb timers and if the property is available, the safe operation is to assert the timer into reset, and followed by a deassert of the timer reset (brings the timer out of reset).

This patch is needed for systems where the bootloader has left the timer not used in reset.

- Trivial conflict with commit a74bd1ad7a:
"Convert to using %pOFn instead of device_node.name"

---
 drivers/clocksource/dw_apb_timer_of.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/clocksource/dw_apb_timer_of.c +12 -0
index fabaa29..db410ac 100644
@@ -22,6 +22,7 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/clk.h>
+#include <linux/reset.h>
 #include <linux/sched_clock.h>
 
 static void __init timer_get_base_and_rate(struct device_node *np,
@@ -29,6 +30,7 @@ static void __init timer_get_base_and_rate(struct device_node *np,
 {
 	struct clk *timer_clk;
 	struct clk *pclk;
+	struct reset_control *rstc;
 
 	*base = of_iomap(np, 0);
 
@@ -36,6 +38,16 @@ static void __init timer_get_base_and_rate(struct device_node *np,
 		panic("Unable to map regs for %pOFn", np);
 
 	/*
+	 * Reset the timer if the reset control is available, wiping
+	 * out the state the firmware may have left it
+	 */
+	rstc = of_reset_control_get(np, NULL);
+	if (!IS_ERR(rstc)) {
+		reset_control_assert(rstc);
+		reset_control_deassert(rstc);
+	}
+
+	/*
 	 * Not all implementations use a periphal clock, so don't panic
 	 * if it's not present
 	 */
Signature · 1 line
2.7.4
#6 lore raw
In reply to Daniel Lezcano
Quoted 6 lines · Daniel Lezcano
Quoted 5 lines · Dinh Nguyen

Add code to retrieve the reset property from the dw-apb timers and if the property is available, the safe operation is to assert the timer into reset, and followed by a deassert of the timer reset(brings the timer out of reset).

Quoted 8 lines
Quoted 2 lines

This patch is needed for systems where the bootloader has left the timer not used in reset.

Ok, I have updated the commit log.

I had to fix a trivial conflict. Let me know if you are all right with the change.

Thanks, I'm fine with the change.

Dinh