* [PATCH v2] clocksource/drivers/sp804: avoid error on multiple instances
@ 2022-05-06 16:25 Andre Przywara
2022-05-06 16:41 ` Robin Murphy
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andre Przywara @ 2022-05-06 16:25 UTC (permalink / raw)
To: Daniel Lezcano, Thomas Gleixner
Cc: Russell King, Kefeng Wang, Zhen Lei, Robin Murphy,
linux-arm-kernel, linux-kernel
When a machine sports more than one SP804 timer instance, we only bring
up the first one, since multiple timers of the same kind are not useful
to Linux. As this is intentional behaviour, we should not return an
error message, as we do today:
===============
[ 0.000800] Failed to initialize '/bus@8000000/motherboard-bus@8000000/iofpga-bus@300000000/timer@120000': -22
===============
Replace the -EINVAL return with a debug message and return 0 instead.
Also we do not reach the init function anymore if the DT node is
disabled (as this is now handled by OF_DECLARE), so remove the explicit
check for that case.
This fixes a long standing bogus error when booting ARM's fastmodels.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
Changelog v1 .. v2:
- demote pr_info() to pr_debug(), to avoid output at all
- use %pOF and reword message
drivers/clocksource/timer-sp804.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
index 401d592e85f5a..e6a87f4af2b50 100644
--- a/drivers/clocksource/timer-sp804.c
+++ b/drivers/clocksource/timer-sp804.c
@@ -259,6 +259,11 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
struct clk *clk1, *clk2;
const char *name = of_get_property(np, "compatible", NULL);
+ if (initialized) {
+ pr_debug("%pOF: skipping further SP804 timer device\n", np);
+ return 0;
+ }
+
base = of_iomap(np, 0);
if (!base)
return -ENXIO;
@@ -270,11 +275,6 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
writel(0, timer1_base + timer->ctrl);
writel(0, timer2_base + timer->ctrl);
- if (initialized || !of_device_is_available(np)) {
- ret = -EINVAL;
- goto err;
- }
-
clk1 = of_clk_get(np, 0);
if (IS_ERR(clk1))
clk1 = NULL;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] clocksource/drivers/sp804: avoid error on multiple instances
2022-05-06 16:25 [PATCH v2] clocksource/drivers/sp804: avoid error on multiple instances Andre Przywara
@ 2022-05-06 16:41 ` Robin Murphy
2022-05-09 11:46 ` Daniel Lezcano
2022-05-27 8:36 ` [tip: timers/core] clocksource/drivers/sp804: Avoid " tip-bot2 for Andre Przywara
2 siblings, 0 replies; 4+ messages in thread
From: Robin Murphy @ 2022-05-06 16:41 UTC (permalink / raw)
To: Andre Przywara, Daniel Lezcano, Thomas Gleixner
Cc: Russell King, Kefeng Wang, Zhen Lei, linux-arm-kernel, linux-kernel
On 2022-05-06 17:25, Andre Przywara wrote:
> When a machine sports more than one SP804 timer instance, we only bring
> up the first one, since multiple timers of the same kind are not useful
> to Linux. As this is intentional behaviour, we should not return an
> error message, as we do today:
> ===============
> [ 0.000800] Failed to initialize '/bus@8000000/motherboard-bus@8000000/iofpga-bus@300000000/timer@120000': -22
> ===============
>
> Replace the -EINVAL return with a debug message and return 0 instead.
>
> Also we do not reach the init function anymore if the DT node is
> disabled (as this is now handled by OF_DECLARE), so remove the explicit
> check for that case.
>
> This fixes a long standing bogus error when booting ARM's fastmodels.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> ---
> Changelog v1 .. v2:
> - demote pr_info() to pr_debug(), to avoid output at all
> - use %pOF and reword message
>
> drivers/clocksource/timer-sp804.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
> index 401d592e85f5a..e6a87f4af2b50 100644
> --- a/drivers/clocksource/timer-sp804.c
> +++ b/drivers/clocksource/timer-sp804.c
> @@ -259,6 +259,11 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
> struct clk *clk1, *clk2;
> const char *name = of_get_property(np, "compatible", NULL);
>
> + if (initialized) {
> + pr_debug("%pOF: skipping further SP804 timer device\n", np);
> + return 0;
> + }
> +
> base = of_iomap(np, 0);
> if (!base)
> return -ENXIO;
> @@ -270,11 +275,6 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
> writel(0, timer1_base + timer->ctrl);
> writel(0, timer2_base + timer->ctrl);
>
> - if (initialized || !of_device_is_available(np)) {
> - ret = -EINVAL;
> - goto err;
> - }
> -
> clk1 = of_clk_get(np, 0);
> if (IS_ERR(clk1))
> clk1 = NULL;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] clocksource/drivers/sp804: avoid error on multiple instances
2022-05-06 16:25 [PATCH v2] clocksource/drivers/sp804: avoid error on multiple instances Andre Przywara
2022-05-06 16:41 ` Robin Murphy
@ 2022-05-09 11:46 ` Daniel Lezcano
2022-05-27 8:36 ` [tip: timers/core] clocksource/drivers/sp804: Avoid " tip-bot2 for Andre Przywara
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Lezcano @ 2022-05-09 11:46 UTC (permalink / raw)
To: Andre Przywara, Thomas Gleixner
Cc: Russell King, Kefeng Wang, Zhen Lei, Robin Murphy,
linux-arm-kernel, linux-kernel
On 06/05/2022 18:25, Andre Przywara wrote:
> When a machine sports more than one SP804 timer instance, we only bring
> up the first one, since multiple timers of the same kind are not useful
> to Linux. As this is intentional behaviour, we should not return an
> error message, as we do today:
> ===============
> [ 0.000800] Failed to initialize '/bus@8000000/motherboard-bus@8000000/iofpga-bus@300000000/timer@120000': -22
> ===============
>
> Replace the -EINVAL return with a debug message and return 0 instead.
>
> Also we do not reach the init function anymore if the DT node is
> disabled (as this is now handled by OF_DECLARE), so remove the explicit
> check for that case.
>
> This fixes a long standing bogus error when booting ARM's fastmodels.
>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> ---
Applied, thanks
--
<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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: timers/core] clocksource/drivers/sp804: Avoid error on multiple instances
2022-05-06 16:25 [PATCH v2] clocksource/drivers/sp804: avoid error on multiple instances Andre Przywara
2022-05-06 16:41 ` Robin Murphy
2022-05-09 11:46 ` Daniel Lezcano
@ 2022-05-27 8:36 ` tip-bot2 for Andre Przywara
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Andre Przywara @ 2022-05-27 8:36 UTC (permalink / raw)
To: linux-tip-commits
Cc: Andre Przywara, Robin Murphy, Daniel Lezcano, x86, linux-kernel
The following commit has been merged into the timers/core branch of tip:
Commit-ID: a98399cbc1e05f7b977419f03905501d566cf54e
Gitweb: https://git.kernel.org/tip/a98399cbc1e05f7b977419f03905501d566cf54e
Author: Andre Przywara <andre.przywara@arm.com>
AuthorDate: Fri, 06 May 2022 17:25:22 +01:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Wed, 18 May 2022 11:08:52 +02:00
clocksource/drivers/sp804: Avoid error on multiple instances
When a machine sports more than one SP804 timer instance, we only bring
up the first one, since multiple timers of the same kind are not useful
to Linux. As this is intentional behaviour, we should not return an
error message, as we do today:
===============
[ 0.000800] Failed to initialize '/bus@8000000/motherboard-bus@8000000/iofpga-bus@300000000/timer@120000': -22
===============
Replace the -EINVAL return with a debug message and return 0 instead.
Also we do not reach the init function anymore if the DT node is
disabled (as this is now handled by OF_DECLARE), so remove the explicit
check for that case.
This fixes a long standing bogus error when booting ARM's fastmodels.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/20220506162522.3675399-1-andre.przywara@arm.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/timer-sp804.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
index 401d592..e6a87f4 100644
--- a/drivers/clocksource/timer-sp804.c
+++ b/drivers/clocksource/timer-sp804.c
@@ -259,6 +259,11 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
struct clk *clk1, *clk2;
const char *name = of_get_property(np, "compatible", NULL);
+ if (initialized) {
+ pr_debug("%pOF: skipping further SP804 timer device\n", np);
+ return 0;
+ }
+
base = of_iomap(np, 0);
if (!base)
return -ENXIO;
@@ -270,11 +275,6 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time
writel(0, timer1_base + timer->ctrl);
writel(0, timer2_base + timer->ctrl);
- if (initialized || !of_device_is_available(np)) {
- ret = -EINVAL;
- goto err;
- }
-
clk1 = of_clk_get(np, 0);
if (IS_ERR(clk1))
clk1 = NULL;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-27 8:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-06 16:25 [PATCH v2] clocksource/drivers/sp804: avoid error on multiple instances Andre Przywara
2022-05-06 16:41 ` Robin Murphy
2022-05-09 11:46 ` Daniel Lezcano
2022-05-27 8:36 ` [tip: timers/core] clocksource/drivers/sp804: Avoid " tip-bot2 for Andre Przywara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).