clocksource: owl: Improve owl_timer_init fail messages
Subsystems (2)
PATCH 1/1 clocksource: owl: Improve owl_timer_init fail messages
Adding error messages, in case of not having a defined clock property and in case of an error in clocksource_mmio_init, which may not be fatal, so just adding a pr_err to notify that it failed.
---
Tested on my Caninos Labrador s500 based board. If the clock property is not set this message would help debug:
...
[ 0.000000] Failed to get OF clock for clocksource [ 0.000000] Failed to initialize '/soc/timer@b0168000': -2 [ 0.000000] timer_probe: no matching timers found
...
drivers/clocksource/timer-owl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/clocksource/timer-owl.c +8 -3
@@ -135,8 +135,10 @@ static int __init owl_timer_init(struct device_node *node) } clk =of_clk_get (node,0 ); -if (IS_ERR (clk)) +if (IS_ERR (clk)) { +pr_err ("Failed to get OF clock for clocksource\n" );return PTR_ERR (clk); + } rate =clk_get_rate (clk);
@@ -144,8 +146,11 @@ static int __init owl_timer_init(struct device_node *node)owl_timer_set_enabled (owl_clksrc_base, true);sched_clock_register (owl_timer_sched_read,32 , rate); -clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, - rate,200 ,32 , clocksource_mmio_readl_up); + ret =clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, + rate,200 ,32 , clocksource_mmio_readl_up); + +if (ret) +pr_err ("Failed to register clocksource %d\n" , ret);owl_timer_reset (owl_clkevt_base);
--
2.25.0
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi,
Thanks for the patch!
Quoted 24 lines · Matheus Castello
Adding error messages, in case of not having a defined clock property and in case of an error in
clocksource_mmio_init, which may not be fatal, so just adding apr_errto notify that it failed.Signed-off-by Matheus Castello <[email protected]>---
Tested on my Caninos Labrador s500 based board. If the clock property is not set this message would help debug:
...
[ 0.000000] Failed to get OF clock for clocksource [ 0.000000] Failed to initialize '/soc/timer@b0168000': -2 [ 0.000000] timer_probe: no matching timers found...
drivers/clocksource/timer-owl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)drivers/clocksource/timer-owl.c +0
-0
drivers/clocksource/timer-owl.c static int __init owl_timer_init(struct device_node *node) · line 139
Quoted 6 lines
drivers/clocksource/timer-owl.c +2
-1@@ -135,8 +135,10 @@ static int __init owl_timer_init(struct device_node *node) } clk =of_clk_get (node,0 ); -if (IS_ERR (clk)) +if (IS_ERR (clk)) { +pr_err ("Failed to get OF clock for clocksource\n" );
No need to mention OF here. Just, "Failed to get clock for clocksource" is good enough.
Quoted 7 lines
drivers/clocksource/timer-owl.c +1
-0return PTR_ERR (clk); + } rate =clk_get_rate (clk);@@ -144,8 +146,11 @@ static int __init owl_timer_init(struct device_node *node)owl_timer_set_enabled (owl_clksrc_base, true);
drivers/clocksource/timer-owl.c static int __init owl_timer_init(struct device_node *node) · line 154
Quoted 10 lines
drivers/clocksource/timer-owl.c +5
-2sched_clock_register (owl_timer_sched_read,32 , rate); -clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, - rate,200 ,32 , clocksource_mmio_readl_up); + ret =clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, + rate,200 ,32 , clocksource_mmio_readl_up); + +if (ret) +pr_err ("Failed to register clocksource %d\n" , ret);
Do you want to continue if it fails? I'd bail out.
Thanks,
Mani
Quoted 5 lines
drivers/clocksource/timer-owl.c +0
-1owl_timer_reset (owl_clkevt_base); --2.25.0
Andreas Färber
maintainerHi,
Am Freitag, den 14.02.2020, 19:47 +0530 schrieb Manivannan Sadhasivam:
Quoted 31 lines · Matheus Castello
Quoted 30 lines
Adding error messages, in case of not having a defined clock property
and in case of an error inclocksource_mmio_init, which may not be fatal, so just adding apr_errto notify that it failed.Signed-off-by Matheus Castello <[email protected]>---
Tested on my Caninos Labrador s500 based board. If the clock property is not
set this message would help debug:...
[ 0.000000] Failed to get OF clock for clocksource [ 0.000000] Failed to initialize '/soc/timer@b0168000': -2 [ 0.000000] timer_probe: no matching timers found...
drivers/clocksource/timer-owl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)drivers/clocksource/timer-owl.c +0
-0@@ -135,8 +135,10 @@ static int __init owl_timer_init(struct device_node *node) }
Quoted 8 lines
drivers/clocksource/timer-owl.c static int __init owl_timer_init(struct device_node *node) · line 139
Quoted 4 lines
drivers/clocksource/timer-owl.c +2
-1clk =of_clk_get (node,0 ); -if (IS_ERR (clk)) +if (IS_ERR (clk)) { +pr_err ("Failed to get OF clock for clocksource\n" );No need to mention OF here. Just, "Failed to get clock for clocksource"
is good enough.
We should be consistent then and output PTR_ERR(clk), too.
i.e., "Failed to get clock for clocksource (%d)\n"
Quoted 15 lines
Quoted 15 lines
drivers/clocksource/timer-owl.c +2
-2return PTR_ERR (clk); + } rate =clk_get_rate (clk);@@ -144,8 +146,11 @@ static int __init owl_timer_init(struct device_node *node)owl_timer_set_enabled (owl_clksrc_base ,true );sched_clock_register (owl_timer_sched_read,32 , rate); -clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, - rate,200 ,32 , clocksource_mmio_readl_up); + ret = clocksource_mmio_init(owl_clksrc_base + OWL_Tx_VAL, node-
Quoted 6 lines
drivers/clocksource/timer-owl.c static int __init owl_timer_init(struct device_node *node) · line 153
Quoted 6 lines
drivers/clocksource/timer-owl.c +1
-0>name, + rate, 200, 32,
clocksource_mmio_readl_up);drivers/clocksource/timer-owl.c +3
-0+ +if (ret) +pr_err ("Failed to register clocksource %d\n" , ret);
It's not a numeric clocksource, so for humans please use "... (%d)\n".
Quoted 3 lines
Quoted 1 line
Do you want to continue if it fails? I'd bail out.
Agreed, but I'd suggest to check under which circumstances this can actually fail and how other drivers handle it, given that it was not checked before. Was this missed during original review, or is the return value new?
Cheers,
Andreas
Signature · 4 lines
SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer HRB 36809 (AG Nürnberg)
PATCH v2 1/1 clocksource: owl: Improve owl_timer_init fail messages
Check the return from clocksource_mmio_init, add messages in case of an error and in case of not having a defined clock property.
---
Thanks Manivannan and Andreas for the review.
Tested on my Caninos Labrador s500 based board.
Changes since v1:
(suggested by maintainers)
- Maintains consistency output PTR_ERR(clk)
- Returning in case of error on clocksource_mmio_init
- Use parentheses between the error code
- Remove OF mention
drivers/clocksource/timer-owl.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/clocksource/timer-owl.c +11 -4
@@ -135,8 +135,11 @@ static int __init owl_timer_init(struct device_node *node) } clk =of_clk_get (node,0 ); -if (IS_ERR (clk)) -return PTR_ERR (clk); +if (IS_ERR (clk)) { + ret =PTR_ERR (clk); +pr_err ("Failed to get clock for clocksource (%d)\n" , ret); +return ret; + } rate =clk_get_rate (clk);
@@ -144,8 +147,12 @@ static int __init owl_timer_init(struct device_node *node)owl_timer_set_enabled (owl_clksrc_base, true);sched_clock_register (owl_timer_sched_read,32 , rate); -clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, - rate,200 ,32 , clocksource_mmio_readl_up); + ret =clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, + rate,200 ,32 , clocksource_mmio_readl_up); +if (ret) { +pr_err ("Failed to register clocksource (%d)\n" , ret); +return ret; + }owl_timer_reset (owl_clkevt_base);
--
2.25.0
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
[tip: timers/core] clocksource/drivers/owl: Improve owl_timer_init fail messages
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: ad1ded9d2e3d1eb452ff58d325aadf237e187bd9 Gitweb: https://git.kernel.org/tip/ad1ded9d2e3d1eb452ff58d325aadf237e187bd9 Author: Matheus Castello <[email protected]> AuthorDate: Tue, 18 Feb 2020 21:48:10 -03:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 27 Feb 2020 09:42:00 +01:00
clocksource/drivers/owl: Improve owl_timer_init fail messages
Check the return from clocksource_mmio_init, add messages in case of an error and in case of not having a defined clock property.
--- drivers/clocksource/timer-owl.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/clocksource/timer-owl.c +11 -4
@@ -135,8 +135,11 @@ static int __init owl_timer_init(struct device_node *node) } clk =of_clk_get (node,0 ); -if (IS_ERR (clk)) -return PTR_ERR (clk); +if (IS_ERR (clk)) { + ret =PTR_ERR (clk); +pr_err ("Failed to get clock for clocksource (%d)\n" , ret); +return ret; + } rate =clk_get_rate (clk);
@@ -144,8 +147,12 @@ static int __init owl_timer_init(struct device_node *node)owl_timer_set_enabled (owl_clksrc_base, true);sched_clock_register (owl_timer_sched_read,32 , rate); -clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, - rate,200 ,32 , clocksource_mmio_readl_up); + ret =clocksource_mmio_init (owl_clksrc_base + OWL_Tx_VAL, node->name, + rate,200 ,32 , clocksource_mmio_readl_up); +if (ret) { +pr_err ("Failed to register clocksource (%d)\n" , ret); +return ret; + }owl_timer_reset (owl_clkevt_base);