Skip to contentSkip to conversation

timer-uclass: add timer_get_ops() macro

PATCH In review Ovidiu Panait 3 participants 8 messages Oct 12, 2022 – Oct 25, 2022 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 timer-uclass: add timer_get_ops() macro

Align timer uclass with the other subsystems and provide a timer_get_ops() convenience macro.

Using this instead of the generic device_get_ops() also prevents -Wdiscarded-qualifiers warnings when used with non-const variables.

---

 drivers/timer/timer-uclass.c | 2 +-
 include/timer.h              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/timer/timer-uclass.c +1 -1
index cbc3647698..bdc77b3822 100644
@@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int notrace timer_get_count(struct udevice *dev, u64 *count)
 {
-	const struct timer_ops *ops = device_get_ops(dev);
+	struct timer_ops *ops = timer_get_ops(dev);
 
 	if (!ops->get_count)
 		return -ENOSYS;
include/timer.h +2 -0
index a044cb034e..d33a26e28f 100644
@@ -6,6 +6,8 @@
 #ifndef _TIMER_H_
 #define _TIMER_H_
 
+#define timer_get_ops(dev)	((struct timer_ops *)(dev)->driver->ops)
+
 /**
  * dm_timer_init() - initialize a timer for time keeping. On success
  * initializes gd->timer so that lib/timer can use it for future
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/3 timer-uclass: relocate ops pointers for CONFIG_NEEDS_MANUAL_RELOC

Relocate timer_ops pointers when CONFIG_NEEDS_MANUAL_RELOC is enabled.

The (gd->flags & GD_FLG_RELOC) check was added to make sure the reloc_done logic works for drivers that use DM_FLAG_PRE_RELOC.

---

 drivers/timer/timer-uclass.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/timer/timer-uclass.c +14 -0
index bdc77b3822..bb71979213 100644
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <timer.h>
 #include <linux/err.h>
+#include <relocate.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -50,6 +51,19 @@ unsigned long notrace timer_get_rate(struct udevice *dev)
 
 static int timer_pre_probe(struct udevice *dev)
 {
+	if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) &&
+	    (gd->flags & GD_FLG_RELOC)) {
+		struct timer_ops *ops = timer_get_ops(dev);
+		static int reloc_done;
+
+		if (!reloc_done) {
+			if (ops->get_count)
+				MANUAL_RELOC(ops->get_count);
+
+			reloc_done++;
+		}
+	}
+
 	if (CONFIG_IS_ENABLED(OF_REAL)) {
 		struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
 		struct clk timer_clk;
Signature · 1 line
2.25.1
Reviewed-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] timer-uclass: relocate ops pointers for CONFIG_NEEDS_MANUAL_RELOC

Quoted 11 lines · Ovidiu Panait

Relocate timer_ops pointers when CONFIG_NEEDS_MANUAL_RELOC is enabled.

The (gd->flags & GD_FLG_RELOC) check was added to make sure the reloc_done logic works for drivers that use DM_FLAG_PRE_RELOC.

---

 drivers/timer/timer-uclass.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

Which (broken) toolchain are you using?

#3 lore raw

Re: [PATCH 2/3] timer-uclass: relocate ops pointers for CONFIG_NEEDS_MANUAL_RELOC

Hi Simon,

Quoted 6 lines · Simon Glass
Quoted 5 lines · Ovidiu Panait

Relocate timer_ops pointers when CONFIG_NEEDS_MANUAL_RELOC is enabled.

The (gd->flags & GD_FLG_RELOC) check was added to make sure the reloc_done logic works for drivers that use DM_FLAG_PRE_RELOC.

Quoted 8 lines
Quoted 5 lines

---

  drivers/timer/timer-uclass.c | 14 ++++++++++++++
  1 file changed, 14 insertions(+)

Which (broken) toolchain are you using?

Microblaze and m68k still use CONFIG_NEEDS_MANUAL_RELOC=y by default. I was testing on microblaze.

Ovidiu

#4 lore raw

PATCH 3/3 timer: xilinx-timer: use timer_conv_64() to fix timer wrap around

In reply to Ovidiu Panait

Current xilinx_timer_get_count() implementation does not take into account the periodic 32-bit wrap arounds, as it directly returns the 32-bit counter register value. The roll-overs cause problems in the upper timer layers, as generic timer code expects an incrementing 64-bit value from get_count() to work correctly.

Add the missing 64-bit up-conversion to fix random hangs/delays in __udelay().

Fixes a36d86720f ("microblaze: Convert axi timer to DM driver")

---

 drivers/timer/xilinx-timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/timer/xilinx-timer.c +1 -1
index 75b4473b63..172fd9f929 100644
@@ -40,7 +40,7 @@ static u64 xilinx_timer_get_count(struct udevice *dev)
 
 	regmap_read(priv->regs, TIMER_COUNTER_OFFSET, &value);
 
-	return value;
+	return timer_conv_64(value);
 }
 
 static int xilinx_timer_probe(struct udevice *dev)
Signature · 1 line
2.25.1
maintainer Reviewed-by on v1 3/3
#5 lore raw

Re: [PATCH 3/3] timer: xilinx-timer: use timer_conv_64() to fix timer wrap around

Quoted 21 lines · Ovidiu Panait

Current xilinx_timer_get_count() implementation does not take into account the periodic 32-bit wrap arounds, as it directly returns the 32-bit counter register value. The roll-overs cause problems in the upper timer layers, as generic timer code expects an incrementing 64-bit value from get_count() to work correctly.

Add the missing 64-bit up-conversion to fix random hangs/delays in __udelay().

Fixes a36d86720f ("microblaze: Convert axi timer to DM driver")

---

  drivers/timer/xilinx-timer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/timer/xilinx-timer.c +0 -0
index 75b4473b63..172fd9f929 100644

drivers/timer/xilinx-timer.c static u64 xilinx_timer_get_count(struct udevice *dev) · line 46

Quoted 8 lines
drivers/timer/xilinx-timer.c +1 -1
@@ -40,7 +40,7 @@ static u64 xilinx_timer_get_count(struct udevice *dev)
 
  	regmap_read(priv->regs, TIMER_COUNTER_OFFSET, &value);
 
-	return value;
+	return timer_conv_64(value);
  }
 
  static int xilinx_timer_probe(struct udevice *dev)

Good catch.

I will let Simon to comment other two patches.

Thanks,
Michal

maintainer
#6 lore raw

Re: [PATCH 3/3] timer: xilinx-timer: use timer_conv_64() to fix timer wrap around

In reply to Ovidiu Panait
Quoted 21 lines · Ovidiu Panait

Current xilinx_timer_get_count() implementation does not take into account the periodic 32-bit wrap arounds, as it directly returns the 32-bit counter register value. The roll-overs cause problems in the upper timer layers, as generic timer code expects an incrementing 64-bit value from get_count() to work correctly.

Add the missing 64-bit up-conversion to fix random hangs/delays in __udelay().

Fixes a36d86720f ("microblaze: Convert axi timer to DM driver")

---

  drivers/timer/xilinx-timer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/timer/xilinx-timer.c +0 -0
index 75b4473b63..172fd9f929 100644

drivers/timer/xilinx-timer.c static u64 xilinx_timer_get_count(struct udevice *dev) · line 46

Quoted 8 lines
drivers/timer/xilinx-timer.c +1 -1
@@ -40,7 +40,7 @@ static u64 xilinx_timer_get_count(struct udevice *dev)
 
  	regmap_read(priv->regs, TIMER_COUNTER_OFFSET, &value);
 
-	return value;
+	return timer_conv_64(value);
  }
 
  static int xilinx_timer_probe(struct udevice *dev)

Applied all.
M

Reviewed-by on v1 1/3
#7 lore raw
In reply to Ovidiu Panait
Quoted 7 lines · Ovidiu Panait

Align timer uclass with the other subsystems and provide a timer_get_ops() convenience macro.

Using this instead of the generic device_get_ops() also prevents -Wdiscarded-qualifiers warnings when used with non-const variables.

Quoted 6 lines

---

 drivers/timer/timer-uclass.c | 2 +-
 include/timer.h              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)