timer: Return a u64 directly
Subsystems (6)
v2 cover timer: Return a u64 directly
This series will conflict with [1]. One could be rebased on the other, depending on what order they are merged.
[1] https://patchwork.ozlabs.org/project/uboot/list/?series=205908
Changes in v2:
- Document timer API with kerneldoc
- mchp-pit64b was added since v1, so convert it
- Document when get_count may be called, and what assumptions the timer subsystem makes about drivers
Sean Anderson (2):
doc: Document timer API
timer: Return count from timer_ops.get_count
arch/riscv/lib/andes_plmt.c | 6 ++-- arch/riscv/lib/sifive_clint.c | 6 ++-- doc/api/index.rst | 1 + doc/api/timer.rst | 8 +++++ drivers/timer/ag101p_timer.c | 5 ++- drivers/timer/altera_timer.c | 6 ++-- drivers/timer/arc_timer.c | 6 ++-- drivers/timer/ast_timer.c | 6 ++-- drivers/timer/atcpit100_timer.c | 5 ++- drivers/timer/atmel_pit_timer.c | 6 ++-- drivers/timer/cadence-ttc.c | 6 ++-- drivers/timer/dw-apb-timer.c | 6 ++-- drivers/timer/mchp-pit64b-timer.c | 6 ++-- drivers/timer/mpc83xx_timer.c | 6 ++-- drivers/timer/mtk_timer.c | 6 ++-- drivers/timer/nomadik-mtu-timer.c | 6 ++-- drivers/timer/omap-timer.c | 6 ++-- drivers/timer/ostm_timer.c | 6 ++-- drivers/timer/riscv_timer.c | 21 ++++++------ drivers/timer/rockchip_timer.c | 5 ++- drivers/timer/sandbox_timer.c | 6 ++-- drivers/timer/sti-timer.c | 6 ++-- drivers/timer/stm32_timer.c | 6 ++-- drivers/timer/timer-uclass.c | 3 +- drivers/timer/tsc_timer.c | 6 ++-- include/timer.h | 53 +++++++++++++++++-------------- 26 files changed, 91 insertions(+), 118 deletions(-) create mode 100644 doc/api/timer.rst
Signature · 1 line
2.28.0
PATCH v2 1/2 doc: Document timer API
This adds kerneldocs for <timer.h>.
I don't know who should maintain doc/api/timer.rst, since the timer subsystem seems to be maintained by SoC maintainers. MAINTAINERS is left un-updated for the moment.
---
Changes in v2:
- New
doc/api/index.rst | 1 + doc/api/timer.rst | 8 ++++++++ include/timer.h | 46 ++++++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 doc/api/timer.rst
doc/api/index.rst +1 -0
@@ -11,4 +11,5 @@ U-Boot API documentation linker_lists rng serial + timer unicode
doc/api/timer.rst new file +8 -0
@@ -0,0 +1,8 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2020 Sean Anderson <[email protected]> + +Timer Subsystem +=============== + +.. kernel-doc:: include/timer.h + :internal:
include/timer.h +24 -22
99 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v2 1/2 doc: Document timer API
Quoted 10 lines · Sean Anderson
This adds kerneldocs for <
timer.h>.I don't know who should maintain
doc/api/timer.rst, since the timer subsystem seems to be maintained by SoC maintainers.MAINTAINERSis left un-updated for the moment.Signed-off-by Sean Anderson <[email protected]>---
Quoted 8 lines
Changes in v2:
- Newdoc/api/index.rst | 1 + doc/api/timer.rst | 8 ++++++++ include/timer.h | 46 ++++++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 doc/api/timer.rst
PATCH v2 1/2 doc: Document timer API
In reply to Sean AndersonQuoted 8 lines · Sean Anderson
This adds kerneldocs for <
timer.h>.I don't know who should maintain
doc/api/timer.rst, since the timer subsystem seems to be maintained by SoC maintainers.MAINTAINERSis left un-updated for the moment.Signed-off-by Sean Anderson <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/dba11bc6/attachment.sig>
PATCH v2 2/2 timer: Return count from timer_ops.get_count
In reply to Sean AndersonNo timer drivers return an error from get_count. Instead of possibly returning an error, just return the count directly.
---
Changes in v2:
- mchp-pit64b was added since v1, so convert it
- Document when get_count may be called, and what assumptions the timer subsystem makes about drivers
arch/riscv/lib/andes_plmt.c | 6 ++---- arch/riscv/lib/sifive_clint.c | 6 ++---- drivers/timer/ag101p_timer.c | 5 ++--- drivers/timer/altera_timer.c | 6 ++---- drivers/timer/arc_timer.c | 6 ++---- drivers/timer/ast_timer.c | 6 ++---- drivers/timer/atcpit100_timer.c | 5 ++--- drivers/timer/atmel_pit_timer.c | 6 ++---- drivers/timer/cadence-ttc.c | 6 ++---- drivers/timer/dw-apb-timer.c | 6 ++---- drivers/timer/mchp-pit64b-timer.c | 6 ++---- drivers/timer/mpc83xx_timer.c | 6 ++---- drivers/timer/mtk_timer.c | 6 ++---- drivers/timer/nomadik-mtu-timer.c | 6 ++---- drivers/timer/omap-timer.c | 6 ++---- drivers/timer/ostm_timer.c | 6 ++---- drivers/timer/riscv_timer.c | 21 +++++++++------------ drivers/timer/rockchip_timer.c | 5 ++--- drivers/timer/sandbox_timer.c | 6 ++---- drivers/timer/sti-timer.c | 6 ++---- drivers/timer/stm32_timer.c | 6 ++---- drivers/timer/timer-uclass.c | 3 ++- drivers/timer/tsc_timer.c | 6 ++---- include/timer.h | 9 ++++++--- 24 files changed, 59 insertions(+), 97 deletions(-)
arch/riscv/lib/andes_plmt.c +2 -4
@@ -17,11 +17,9 @@/* mtime register */ #define MTIME_REG (base) ((ulong)(base)) -static int andes_plmt_get_count (struct udevice *dev,u64 *count) +static u64 andes_plmt_get_count (struct udevice *dev) { - *count =readq ((void __iomem *)MTIME_REG (dev->priv)); - -return 0 ; +return readq ((void __iomem *)MTIME_REG (dev->priv)); }static const struct timer_ops andes_plmt_ops = {
arch/riscv/lib/sifive_clint.c +2 -4
@@ -62,11 +62,9 @@ int riscv_get_ipi(int hart, int *pending)return 0 ; } -static int sifive_clint_get_count (struct udevice *dev,u64 *count) +static u64 sifive_clint_get_count (struct udevice *dev) { - *count =readq ((void __iomem *)MTIME_REG (dev->priv)); - -return 0 ; +return readq ((void __iomem *)MTIME_REG (dev->priv)); }static const struct timer_ops sifive_clint_ops = {
drivers/timer/ag101p_timer.c +2 -3
@@ -62,14 +62,13 @@ struct atftmr_timer_platdata {struct atftmr_timer_regs *regs; }; -static int atftmr_timer_get_count (struct udevice *dev,u64 *count) +static u64 atftmr_timer_get_count (struct udevice *dev) {struct atftmr_timer_platdata *plat = dev->platdata;struct atftmr_timer_regs *const regs = plat->regs;u32 val; val =readl (®s->t3_counter); - *count =timer_conv_64 (val); -return 0 ; +return timer_conv_64 (val); }static int atftmr_timer_probe (struct udevice *dev)
drivers/timer/altera_timer.c +2 -4
@@ -32,7 +32,7 @@ struct altera_timer_platdata {struct altera_timer_regs *regs; }; -static int altera_timer_get_count (struct udevice *dev,u64 *count) +static u64 altera_timer_get_count (struct udevice *dev) {struct altera_timer_platdata *plat = dev->platdata;struct altera_timer_regs *const regs = plat->regs;
@@ -44,9 +44,7 @@ static int altera_timer_get_count(struct udevice *dev, u64 *count)/* Read timer value */ val =readl (®s->snapl) &0xffff ; val |= (readl (®s->snaph) &0xffff ) <<16 ; - *count =timer_conv_64 (~val); - -return 0 ; +return timer_conv_64 (~val); }static int altera_timer_probe (struct udevice *dev)
drivers/timer/arc_timer.c +2 -4
@@ -26,7 +26,7 @@ struct arc_timer_priv {uint timer_id; }; -static int arc_timer_get_count (struct udevice *dev,u64 *count) +static u64 arc_timer_get_count (struct udevice *dev) {u32 val =0 ;struct arc_timer_priv *priv =dev_get_priv (dev);
@@ -39,9 +39,7 @@ static int arc_timer_get_count(struct udevice *dev, u64 *count) val =read_aux_reg (ARC_AUX_TIMER1_CNT );break ; } - *count =timer_conv_64 (val); - -return 0 ; +return timer_conv_64 (val); }static int arc_timer_probe (struct udevice *dev)
drivers/timer/ast_timer.c +2 -4
@@ -51,13 +51,11 @@ static int ast_timer_probe(struct udevice *dev)return 0 ; } -static int ast_timer_get_count (struct udevice *dev,u64 *count) +static u64 ast_timer_get_count (struct udevice *dev) {struct ast_timer_priv *priv =dev_get_priv (dev); - *count =AST_TMC_RELOAD_VAL -readl (&priv->tmc->status); - -return 0 ; +return AST_TMC_RELOAD_VAL -readl (&priv->tmc->status); }static int ast_timer_ofdata_to_platdata (struct udevice *dev)
drivers/timer/atcpit100_timer.c +2 -3
@@ -68,13 +68,12 @@ struct atcpit_timer_platdata {u32 *regs; }; -static int atcpit_timer_get_count (struct udevice *dev,u64 *count) +static u64 atcpit_timer_get_count (struct udevice *dev) {struct atcpit_timer_platdata *plat =dev_get_platdata (dev);u32 val; val = ~(REG32_TMR (CH_CNT (1 ))+0xffffffff ); - *count =timer_conv_64 (val); -return 0 ; +return timer_conv_64 (val); }static int atcpit_timer_probe (struct udevice *dev)
drivers/timer/atmel_pit_timer.c +2 -4
@@ -25,15 +25,13 @@ struct atmel_pit_platdata {struct atmel_pit_regs *regs; }; -static int atmel_pit_get_count (struct udevice *dev,u64 *count) +static u64 atmel_pit_get_count (struct udevice *dev) {struct atmel_pit_platdata *plat =dev_get_platdata (dev);struct atmel_pit_regs *const regs = plat->regs;u32 val =readl (®s->value_image); - *count =timer_conv_64 (val); - -return 0 ; +return timer_conv_64 (val); }static int atmel_pit_probe (struct udevice *dev)
drivers/timer/cadence-ttc.c +2 -4
@@ -57,13 +57,11 @@ ulong timer_get_boot_us(void) }#endif -static int cadence_ttc_get_count (struct udevice *dev,u64 *count) +static u64 cadence_ttc_get_count (struct udevice *dev) {struct cadence_ttc_priv *priv =dev_get_priv (dev); - *count =readl (&priv->regs->counter_val1); - -return 0 ; +return readl (&priv->regs->counter_val1); }static int cadence_ttc_probe (struct udevice *dev)
drivers/timer/dw-apb-timer.c +2 -4
@@ -25,7 +25,7 @@ struct dw_apb_timer_priv {struct reset_ctl_bulk resets; }; -static int dw_apb_timer_get_count (struct udevice *dev,u64 *count) +static u64 dw_apb_timer_get_count (struct udevice *dev) {struct dw_apb_timer_priv *priv =dev_get_priv (dev);
@@ -34,9 +34,7 @@ static int dw_apb_timer_get_count(struct udevice *dev, u64 *count)* requires the count to be incrementing. Invert the * result. */ - *count =timer_conv_64 (~readl (priv->regs +DW_APB_CURR_VAL )); - -return 0 ; +return timer_conv_64 (~readl (priv->regs +DW_APB_CURR_VAL )); }static int dw_apb_timer_probe (struct udevice *dev)
drivers/timer/mchp-pit64b-timer.c +2 -4
@@ -27,16 +27,14 @@ struct mchp_pit64b_priv {void __iomem *base; }; -static int mchp_pit64b_get_count (struct udevice *dev,u64 *count) +static u64 mchp_pit64b_get_count (struct udevice *dev) {struct mchp_pit64b_priv *priv =dev_get_priv (dev);u32 lsb =readl (priv->base +MCHP_PIT64B_TLSBR );u32 msb =readl (priv->base +MCHP_PIT64B_TMSBR ); - *count = ((u64 )msb <<32 ) | lsb; - -return 0 ; +return ((u64 )msb <<32 ) | lsb; }static int mchp_pit64b_probe (struct udevice *dev)
drivers/timer/mpc83xx_timer.c +2 -4
@@ -187,7 +187,7 @@ void wait_ticks(ulong ticks)WATCHDOG_RESET (); } -static int mpc83xx_timer_get_count (struct udevice *dev,u64 *count) +static u64 mpc83xx_timer_get_count (struct udevice *dev) {u32 tbu, tbl;
@@ -201,9 +201,7 @@ static int mpc83xx_timer_get_count(struct udevice *dev, u64 *count) tbl =mftb (); }while (tbu !=mftbu ()); - *count = (tbu *0x10000ULL ) + tbl; - -return 0 ; +return (tbu *0x10000ULL ) + tbl; }static int mpc83xx_timer_probe (struct udevice *dev)
drivers/timer/mtk_timer.c +2 -4
@@ -27,14 +27,12 @@ struct mtk_timer_priv {void __iomem *base; }; -static int mtk_timer_get_count (struct udevice *dev,u64 *count) +static u64 mtk_timer_get_count (struct udevice *dev) {struct mtk_timer_priv *priv =dev_get_priv (dev);u32 val =readl (priv->base +MTK_GPT4_CNT ); - *count =timer_conv_64 (val); - -return 0 ; +return timer_conv_64 (val); }static int mtk_timer_probe (struct udevice *dev)
drivers/timer/nomadik-mtu-timer.c +2 -4
@@ -54,14 +54,12 @@ struct nomadik_mtu_priv {struct nomadik_mtu_timer_regs *timer; }; -static int nomadik_mtu_get_count (struct udevice *dev,u64 *count) +static u64 nomadik_mtu_get_count (struct udevice *dev) {struct nomadik_mtu_priv *priv =dev_get_priv (dev);/* Decrementing counter: invert the value */ - *count =timer_conv_64 (~readl (&priv->timer->cv)); - -return 0 ; +return timer_conv_64 (~readl (&priv->timer->cv)); }static int nomadik_mtu_probe (struct udevice *dev)
drivers/timer/omap-timer.c +2 -4
@@ -48,13 +48,11 @@ struct omap_timer_priv {struct omap_gptimer_regs *regs; }; -static int omap_timer_get_count (struct udevice *dev,u64 *count) +static u64 omap_timer_get_count (struct udevice *dev) {struct omap_timer_priv *priv =dev_get_priv (dev); - *count =timer_conv_64 (readl (&priv->regs->tcrr)); - -return 0 ; +return timer_conv_64 (readl (&priv->regs->tcrr)); }static int omap_timer_probe (struct udevice *dev)
drivers/timer/ostm_timer.c +2 -4
@@ -27,13 +27,11 @@ struct ostm_priv {fdt_addr_t regs; }; -static int ostm_get_count (struct udevice *dev,u64 *count) +static u64 ostm_get_count (struct udevice *dev) {struct ostm_priv *priv =dev_get_priv (dev); - *count =timer_conv_64 (readl (priv->regs +OSTM_CNT )); - -return 0 ; +return timer_conv_64 (readl (priv->regs +OSTM_CNT )); }static int ostm_probe (struct udevice *dev)
drivers/timer/riscv_timer.c +9 -12
@@ -16,22 +16,19 @@#include <timer.h> #include <asm/csr.h> -static int riscv_timer_get_count (struct udevice *dev,u64 *count) +static u64 riscv_timer_get_count (struct udevice *dev) { -if (IS_ENABLED (CONFIG_64BIT )) { - *count =csr_read (CSR_TIME ); - }else { -u32 hi, lo; +__maybe_unused u32 hi, lo; -do { - hi =csr_read (CSR_TIMEH ); - lo =csr_read (CSR_TIME ); - }while (hi !=csr_read (CSR_TIMEH )); +if (IS_ENABLED (CONFIG_64BIT )) +return csr_read (CSR_TIME ); - *count = ((u64 )hi <<32 ) | lo; - } +do { + hi =csr_read (CSR_TIMEH ); + lo =csr_read (CSR_TIME ); + }while (hi !=csr_read (CSR_TIMEH )); -return 0 ; +return ((u64 )hi <<32 ) | lo; }static int riscv_timer_probe (struct udevice *dev)
drivers/timer/rockchip_timer.c +2 -3
@@ -88,14 +88,13 @@ ulong timer_get_boot_us(void) }#endif -static int rockchip_timer_get_count (struct udevice *dev,u64 *count) +static u64 rockchip_timer_get_count (struct udevice *dev) {struct rockchip_timer_priv *priv =dev_get_priv (dev);uint64_t cntr =rockchip_timer_get_curr_value (priv->timer);/* timers are down-counting */ - *count = ~0ull - cntr; -return 0 ; +return ~0ull - cntr; }static int rockchip_clk_ofdata_to_platdata (struct udevice *dev)
drivers/timer/sandbox_timer.c +2 -4
@@ -29,11 +29,9 @@ unsigned long notrace timer_early_get_rate(void)return SANDBOX_TIMER_RATE ; } -static notrace int sandbox_timer_get_count(struct udevice *dev, u64 *count) +static notrace u64 sandbox_timer_get_count(struct udevice *dev) { - *count =timer_early_get_count (); - -return 0 ; +return timer_early_get_count (); }static int sandbox_timer_probe (struct udevice *dev)
drivers/timer/sti-timer.c +2 -4
@@ -17,7 +17,7 @@ struct sti_timer_priv {struct globaltimer *global_timer; }; -static int sti_timer_get_count (struct udevice *dev,u64 *count) +static u64 sti_timer_get_count (struct udevice *dev) {struct sti_timer_priv *priv =dev_get_priv (dev);struct globaltimer *global_timer = priv->global_timer;
@@ -34,9 +34,7 @@ static int sti_timer_get_count(struct udevice *dev, u64 *count) old = high; } timer = high; - *count = (u64)((timer <<32 ) | low); - -return 0 ; +return (u64)((timer <<32 ) | low); }static int sti_timer_probe (struct udevice *dev)
drivers/timer/stm32_timer.c +2 -4
@@ -52,14 +52,12 @@ struct stm32_timer_priv {struct stm32_timer_regs *base; }; -static int stm32_timer_get_count (struct udevice *dev,u64 *count) +static u64 stm32_timer_get_count (struct udevice *dev) {struct stm32_timer_priv *priv =dev_get_priv (dev);struct stm32_timer_regs *regs = priv->base; - *count =readl (®s->cnt); - -return 0 ; +return readl (®s->cnt); }static int stm32_timer_probe (struct udevice *dev)
drivers/timer/timer-uclass.c +2 -1
@@ -33,7 +33,8 @@ int notrace timer_get_count(struct udevice *dev, u64 *count)if (!ops->get_count)return -ENOSYS ; -return ops->get_count (dev, count); + *count = ops->get_count (dev); +return 0 ; }unsigned long notrace timer_get_rate (struct udevice *dev)
drivers/timer/tsc_timer.c +2 -4
@@ -386,13 +386,11 @@ void __udelay(unsigned long usec)#endif } -static int tsc_timer_get_count (struct udevice *dev,u64 *count) +static u64 tsc_timer_get_count (struct udevice *dev) {u64 now_tick =rdtsc (); - *count = now_tick - gd->arch.tsc_base; - -return 0 ; +return now_tick - gd->arch.tsc_base; }static void tsc_timer_ensure_setup (bool early)
include/timer.h +6 -3
@@ -67,11 +67,14 @@ struct timer_ops {* * @dev: The timer device * -* @count: pointer that returns the current 64-bit timer count +* This function may be called at any time after the driver is probed. +* All necessary initialization must be completed by the time probe() +* returns. The count returned by this functions should be monotonic. +* This function must succeed. * -* Return: 0 if OK, -ve on error +* Return: The current 64-bit timer count */ -int (*get_count)(struct udevice *dev,u64 *count); +u64 (*get_count)(struct udevice *dev); };/**
Signature · 1 line
2.28.0
PATCH v2 2/2 timer: Return count from timer_ops.get_count
Quoted 6 lines · Sean Anderson
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
No timer drivers return an error from
get_count. Instead of possibly returning an error, just return the count directly.Signed-off-by Sean Anderson <[email protected]>
For mchp-pit64b-timer:
Quoted 552 lines
---
Changes in v2:
- mchp-pit64b was added since v1, so convert it
- Document whenget_countmay be called, and what assumptions the timer subsystem makes about driversarch/riscv/lib/andes_plmt.c | 6 ++---- arch/riscv/lib/sifive_clint.c | 6 ++---- drivers/timer/ag101p_timer.c | 5 ++--- drivers/timer/altera_timer.c | 6 ++---- drivers/timer/arc_timer.c | 6 ++---- drivers/timer/ast_timer.c | 6 ++---- drivers/timer/atcpit100_timer.c | 5 ++--- drivers/timer/atmel_pit_timer.c | 6 ++---- drivers/timer/cadence-ttc.c | 6 ++---- drivers/timer/dw-apb-timer.c | 6 ++---- drivers/timer/mchp-pit64b-timer.c | 6 ++---- drivers/timer/mpc83xx_timer.c | 6 ++---- drivers/timer/mtk_timer.c | 6 ++---- drivers/timer/nomadik-mtu-timer.c | 6 ++---- drivers/timer/omap-timer.c | 6 ++---- drivers/timer/ostm_timer.c | 6 ++---- drivers/timer/riscv_timer.c | 21 +++++++++------------ drivers/timer/rockchip_timer.c | 5 ++--- drivers/timer/sandbox_timer.c | 6 ++---- drivers/timer/sti-timer.c | 6 ++---- drivers/timer/stm32_timer.c | 6 ++---- drivers/timer/timer-uclass.c | 3 ++- drivers/timer/tsc_timer.c | 6 ++---- include/timer.h | 9 ++++++--- 24 files changed, 59 insertions(+), 97 deletions(-)arch/riscv/lib/andes_plmt.c +2
-4@@ -17,11 +17,9 @@/* mtime register */ #define MTIME_REG (base) ((ulong)(base)) -static int andes_plmt_get_count (struct udevice *dev,u64 *count) +static u64 andes_plmt_get_count (struct udevice *dev) { - *count =readq ((void __iomem *)MTIME_REG (dev->priv)); - -return 0 ; +return readq ((void __iomem *)MTIME_REG (dev->priv)); }static const struct timer_ops andes_plmt_ops = {arch/riscv/lib/sifive_clint.c +2
-4@@ -62,11 +62,9 @@ int riscv_get_ipi(int hart, int *pending)return 0 ; } -static int sifive_clint_get_count (struct udevice *dev,u64 *count) +static u64 sifive_clint_get_count (struct udevice *dev) { - *count =readq ((void __iomem *)MTIME_REG (dev->priv)); - -return 0 ; +return readq ((void __iomem *)MTIME_REG (dev->priv)); }static const struct timer_ops sifive_clint_ops = {drivers/timer/ag101p_timer.c +2
-3@@ -62,14 +62,13 @@ struct atftmr_timer_platdata {struct atftmr_timer_regs *regs; }; -static int atftmr_timer_get_count (struct udevice *dev,u64 *count) +static u64 atftmr_timer_get_count (struct udevice *dev) {struct atftmr_timer_platdata *plat = dev->platdata;struct atftmr_timer_regs *const regs = plat->regs;u32 val; val =readl (®s->t3_counter); - *count =timer_conv_64 (val); -return 0 ; +return timer_conv_64 (val); }static int atftmr_timer_probe (struct udevice *dev)drivers/timer/altera_timer.c +2
-4@@ -32,7 +32,7 @@ struct altera_timer_platdata {struct altera_timer_regs *regs; }; -static int altera_timer_get_count (struct udevice *dev,u64 *count) +static u64 altera_timer_get_count (struct udevice *dev) {struct altera_timer_platdata *plat = dev->platdata;struct altera_timer_regs *const regs = plat->regs;@@ -44,9 +44,7 @@ static int altera_timer_get_count(struct udevice *dev, u64 *count)/* Read timer value */ val =readl (®s->snapl) &0xffff ; val |= (readl (®s->snaph) &0xffff ) <<16 ; - *count =timer_conv_64 (~val); - -return 0 ; +return timer_conv_64 (~val); }static int altera_timer_probe (struct udevice *dev)drivers/timer/arc_timer.c +2
-4@@ -26,7 +26,7 @@ struct arc_timer_priv {uint timer_id; }; -static int arc_timer_get_count (struct udevice *dev,u64 *count) +static u64 arc_timer_get_count (struct udevice *dev) {u32 val =0 ;struct arc_timer_priv *priv =dev_get_priv (dev);@@ -39,9 +39,7 @@ static int arc_timer_get_count(struct udevice *dev, u64 *count) val =read_aux_reg (ARC_AUX_TIMER1_CNT );break ; } - *count =timer_conv_64 (val); - -return 0 ; +return timer_conv_64 (val); }static int arc_timer_probe (struct udevice *dev)drivers/timer/ast_timer.c +2
-4@@ -51,13 +51,11 @@ static int ast_timer_probe(struct udevice *dev)return 0 ; } -static int ast_timer_get_count (struct udevice *dev,u64 *count) +static u64 ast_timer_get_count (struct udevice *dev) {struct ast_timer_priv *priv =dev_get_priv (dev); - *count =AST_TMC_RELOAD_VAL -readl (&priv->tmc->status); - -return 0 ; +return AST_TMC_RELOAD_VAL -readl (&priv->tmc->status); }static int ast_timer_ofdata_to_platdata (struct udevice *dev)drivers/timer/atcpit100_timer.c +2
-3@@ -68,13 +68,12 @@ struct atcpit_timer_platdata {u32 *regs; }; -static int atcpit_timer_get_count (struct udevice *dev,u64 *count) +static u64 atcpit_timer_get_count (struct udevice *dev) {struct atcpit_timer_platdata *plat =dev_get_platdata (dev);u32 val; val = ~(REG32_TMR (CH_CNT (1 ))+0xffffffff ); - *count =timer_conv_64 (val); -return 0 ; +return timer_conv_64 (val); }static int atcpit_timer_probe (struct udevice *dev)drivers/timer/atmel_pit_timer.c +2
-4@@ -25,15 +25,13 @@ struct atmel_pit_platdata {struct atmel_pit_regs *regs; }; -static int atmel_pit_get_count (struct udevice *dev,u64 *count) +static u64 atmel_pit_get_count (struct udevice *dev) {struct atmel_pit_platdata *plat =dev_get_platdata (dev);struct atmel_pit_regs *const regs = plat->regs;u32 val =readl (®s->value_image); - *count =timer_conv_64 (val); - -return 0 ; +return timer_conv_64 (val); }static int atmel_pit_probe (struct udevice *dev)drivers/timer/cadence-ttc.c +2
-4@@ -57,13 +57,11 @@ ulong timer_get_boot_us(void) }#endif -static int cadence_ttc_get_count (struct udevice *dev,u64 *count) +static u64 cadence_ttc_get_count (struct udevice *dev) {struct cadence_ttc_priv *priv =dev_get_priv (dev); - *count =readl (&priv->regs->counter_val1); - -return 0 ; +return readl (&priv->regs->counter_val1); }static int cadence_ttc_probe (struct udevice *dev)drivers/timer/dw-apb-timer.c +2
-4@@ -25,7 +25,7 @@ struct dw_apb_timer_priv {struct reset_ctl_bulk resets; }; -static int dw_apb_timer_get_count (struct udevice *dev,u64 *count) +static u64 dw_apb_timer_get_count (struct udevice *dev) {struct dw_apb_timer_priv *priv =dev_get_priv (dev);@@ -34,9 +34,7 @@ static int dw_apb_timer_get_count(struct udevice *dev, u64 *count)* requires the count to be incrementing. Invert the * result. */ - *count =timer_conv_64 (~readl (priv->regs +DW_APB_CURR_VAL )); - -return 0 ; +return timer_conv_64 (~readl (priv->regs +DW_APB_CURR_VAL )); }static int dw_apb_timer_probe (struct udevice *dev)drivers/timer/mchp-pit64b-timer.c +2
-4@@ -27,16 +27,14 @@ struct mchp_pit64b_priv {void __iomem *base; }; -static int mchp_pit64b_get_count (struct udevice *dev,u64 *count) +static u64 mchp_pit64b_get_count (struct udevice *dev) {struct mchp_pit64b_priv *priv =dev_get_priv (dev);u32 lsb =readl (priv->base +MCHP_PIT64B_TLSBR );u32 msb =readl (priv->base +MCHP_PIT64B_TMSBR ); - *count = ((u64 )msb <<32 ) | lsb; - -return 0 ; +return ((u64 )msb <<32 ) | lsb; }static int mchp_pit64b_probe (struct udevice *dev)drivers/timer/mpc83xx_timer.c +2
-4@@ -187,7 +187,7 @@ void wait_ticks(ulong ticks)WATCHDOG_RESET (); } -static int mpc83xx_timer_get_count (struct udevice *dev,u64 *count) +static u64 mpc83xx_timer_get_count (struct udevice *dev) {u32 tbu, tbl;@@ -201,9 +201,7 @@ static int mpc83xx_timer_get_count(struct udevice *dev, u64 *count) tbl =mftb (); }while (tbu !=mftbu ()); - *count = (tbu *0x10000ULL ) + tbl; - -return 0 ; +return (tbu *0x10000ULL ) + tbl; }static int mpc83xx_timer_probe (struct udevice *dev)drivers/timer/mtk_timer.c +2
-4@@ -27,14 +27,12 @@ struct mtk_timer_priv {void __iomem *base; }; -static int mtk_timer_get_count (struct udevice *dev,u64 *count) +static u64 mtk_timer_get_count (struct udevice *dev) {struct mtk_timer_priv *priv =dev_get_priv (dev);u32 val =readl (priv->base +MTK_GPT4_CNT ); - *count =timer_conv_64 (val); - -return 0 ; +return timer_conv_64 (val); }static int mtk_timer_probe (struct udevice *dev)drivers/timer/nomadik-mtu-timer.c +2
-4@@ -54,14 +54,12 @@ struct nomadik_mtu_priv {struct nomadik_mtu_timer_regs *timer; }; -static int nomadik_mtu_get_count (struct udevice *dev,u64 *count) +static u64 nomadik_mtu_get_count (struct udevice *dev) {struct nomadik_mtu_priv *priv =dev_get_priv (dev);/* Decrementing counter: invert the value */ - *count =timer_conv_64 (~readl (&priv->timer->cv)); - -return 0 ; +return timer_conv_64 (~readl (&priv->timer->cv)); }static int nomadik_mtu_probe (struct udevice *dev)drivers/timer/omap-timer.c +2
-4@@ -48,13 +48,11 @@ struct omap_timer_priv {struct omap_gptimer_regs *regs; }; -static int omap_timer_get_count (struct udevice *dev,u64 *count) +static u64 omap_timer_get_count (struct udevice *dev) {struct omap_timer_priv *priv =dev_get_priv (dev); - *count =timer_conv_64 (readl (&priv->regs->tcrr)); - -return 0 ; +return timer_conv_64 (readl (&priv->regs->tcrr)); }static int omap_timer_probe (struct udevice *dev)drivers/timer/ostm_timer.c +2
-4@@ -27,13 +27,11 @@ struct ostm_priv {fdt_addr_t regs; }; -static int ostm_get_count (struct udevice *dev,u64 *count) +static u64 ostm_get_count (struct udevice *dev) {struct ostm_priv *priv =dev_get_priv (dev); - *count =timer_conv_64 (readl (priv->regs +OSTM_CNT )); - -return 0 ; +return timer_conv_64 (readl (priv->regs +OSTM_CNT )); }static int ostm_probe (struct udevice *dev)drivers/timer/riscv_timer.c +9
-12@@ -16,22 +16,19 @@#include <timer.h> #include <asm/csr.h> -static int riscv_timer_get_count (struct udevice *dev,u64 *count) +static u64 riscv_timer_get_count (struct udevice *dev) { -if (IS_ENABLED (CONFIG_64BIT )) { - *count =csr_read (CSR_TIME ); - }else { -u32 hi, lo; +__maybe_unused u32 hi, lo; -do { - hi =csr_read (CSR_TIMEH ); - lo =csr_read (CSR_TIME ); - }while (hi !=csr_read (CSR_TIMEH )); +if (IS_ENABLED (CONFIG_64BIT )) +return csr_read (CSR_TIME ); - *count = ((u64 )hi <<32 ) | lo; - } +do { + hi =csr_read (CSR_TIMEH ); + lo =csr_read (CSR_TIME ); + }while (hi !=csr_read (CSR_TIMEH )); -return 0 ; +return ((u64 )hi <<32 ) | lo; }static int riscv_timer_probe (struct udevice *dev)drivers/timer/rockchip_timer.c +2
-3@@ -88,14 +88,13 @@ ulong timer_get_boot_us(void) }#endif -static int rockchip_timer_get_count (struct udevice *dev,u64 *count) +static u64 rockchip_timer_get_count (struct udevice *dev) {struct rockchip_timer_priv *priv =dev_get_priv (dev);uint64_t cntr =rockchip_timer_get_curr_value (priv->timer);/* timers are down-counting */ - *count = ~0ull - cntr; -return 0 ; +return ~0ull - cntr; }static int rockchip_clk_ofdata_to_platdata (struct udevice *dev)drivers/timer/sandbox_timer.c +2
-4@@ -29,11 +29,9 @@ unsigned long notrace timer_early_get_rate(void)return SANDBOX_TIMER_RATE ; } -static notrace int sandbox_timer_get_count(struct udevice *dev, u64 *count) +static notrace u64 sandbox_timer_get_count(struct udevice *dev) { - *count =timer_early_get_count (); - -return 0 ; +return timer_early_get_count (); }static int sandbox_timer_probe (struct udevice *dev)drivers/timer/sti-timer.c +2
-4@@ -17,7 +17,7 @@ struct sti_timer_priv {struct globaltimer *global_timer; }; -static int sti_timer_get_count (struct udevice *dev,u64 *count) +static u64 sti_timer_get_count (struct udevice *dev) {struct sti_timer_priv *priv =dev_get_priv (dev);struct globaltimer *global_timer = priv->global_timer;@@ -34,9 +34,7 @@ static int sti_timer_get_count(struct udevice *dev, u64 *count) old = high; } timer = high; - *count = (u64)((timer <<32 ) | low); - -return 0 ; +return (u64)((timer <<32 ) | low); }static int sti_timer_probe (struct udevice *dev)drivers/timer/stm32_timer.c +2
-4@@ -52,14 +52,12 @@ struct stm32_timer_priv {struct stm32_timer_regs *base; }; -static int stm32_timer_get_count (struct udevice *dev,u64 *count) +static u64 stm32_timer_get_count (struct udevice *dev) {struct stm32_timer_priv *priv =dev_get_priv (dev);struct stm32_timer_regs *regs = priv->base; - *count =readl (®s->cnt); - -return 0 ; +return readl (®s->cnt); }static int stm32_timer_probe (struct udevice *dev)drivers/timer/timer-uclass.c +2
-1@@ -33,7 +33,8 @@ int notrace timer_get_count(struct udevice *dev, u64 *count)if (!ops->get_count)return -ENOSYS ; -return ops->get_count (dev, count); + *count = ops->get_count (dev); +return 0 ; }unsigned long notrace timer_get_rate (struct udevice *dev)drivers/timer/tsc_timer.c +2
-4@@ -386,13 +386,11 @@ void __udelay(unsigned long usec)#endif } -static int tsc_timer_get_count (struct udevice *dev,u64 *count) +static u64 tsc_timer_get_count (struct udevice *dev) {u64 now_tick =rdtsc (); - *count = now_tick - gd->arch.tsc_base; - -return 0 ; +return now_tick - gd->arch.tsc_base; }static void tsc_timer_ensure_setup (bool early)include/timer.h +6
-4@@ -67,11 +67,14 @@ struct timer_ops {* * @dev: The timer device * -* @count: pointer that returns the current 64-bit timer count +* This function may be called at any time after the driver is probed. +* All necessary initialization must be completed by the time probe() +* returns. The count returned by this functions should be monotonic. +* This function must succeed. * -* Return: 0 if OK, -ve on error +* Return: The current 64-bit timer count */ -int (*get_count)(struct udevice *dev,u64 *count); +u64 (*get_count)(struct udevice *dev); };/** -- 2.28.0
PATCH v2 2/2 timer: Return count from timer_ops.get_count
In reply to Sean AndersonHi Sean,
Quoted 38 lines · Sean Anderson
No timer drivers return an error from
get_count. Instead of possibly returning an error, just return the count directly.Signed-off-by Sean Anderson <[email protected]>---
Changes in v2:
- mchp-pit64b was added since v1, so convert it
- Document whenget_countmay be called, and what assumptions the timer subsystem makes about driversarch/riscv/lib/andes_plmt.c | 6 ++---- arch/riscv/lib/sifive_clint.c | 6 ++---- drivers/timer/ag101p_timer.c | 5 ++--- drivers/timer/altera_timer.c | 6 ++---- drivers/timer/arc_timer.c | 6 ++---- drivers/timer/ast_timer.c | 6 ++---- drivers/timer/atcpit100_timer.c | 5 ++--- drivers/timer/atmel_pit_timer.c | 6 ++---- drivers/timer/cadence-ttc.c | 6 ++---- drivers/timer/dw-apb-timer.c | 6 ++---- drivers/timer/mchp-pit64b-timer.c | 6 ++---- drivers/timer/mpc83xx_timer.c | 6 ++---- drivers/timer/mtk_timer.c | 6 ++---- drivers/timer/nomadik-mtu-timer.c | 6 ++---- drivers/timer/omap-timer.c | 6 ++---- drivers/timer/ostm_timer.c | 6 ++---- drivers/timer/riscv_timer.c | 21 +++++++++------------ drivers/timer/rockchip_timer.c | 5 ++--- drivers/timer/sandbox_timer.c | 6 ++---- drivers/timer/sti-timer.c | 6 ++---- drivers/timer/stm32_timer.c | 6 ++---- drivers/timer/timer-uclass.c | 3 ++- drivers/timer/tsc_timer.c | 6 ++---- include/timer.h | 9 ++++++--- 24 files changed, 59 insertions(+), 97 deletions(-)
[..]
Quoted 9 lines
include/timer.h +0
-1@@ -67,11 +67,14 @@ struct timer_ops {* * @dev: The timer device * -* @count: pointer that returns the current 64-bit timer count
include/timer.h struct timer_ops { · line 77
Quoted 10 lines
include/timer.h +6
-2+* This function may be called at any time after the driver is probed. +* All necessary initialization must be completed by the time probe() +* returns. The count returned by this functions should be monotonic. +* This function must succeed. * -* Return: 0 if OK, -ve on error +* Return: The current 64-bit timer count */ -int (*get_count)(struct udevice *dev,u64 *count); +u64 (*get_count)(struct udevice *dev);
We can require this the driver be probed before this is called. We have the early timer for the pre-DM case.
Regards,
Simon
PATCH v2 2/2 timer: Return count from timer_ops.get_count
In reply to Sean AndersonQuoted 6 lines · Sean Anderson
No timer drivers return an error from
get_count. Instead of possibly returning an error, just return the count directly.Signed-off-by Sean Anderson <[email protected]>Reviewed-by Claudiu Beznea <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/c4cffd48/attachment-0001.sig>