* [PATCH net-next RESEND] net: fec: Do proper error checking for enet_out clk
@ 2022-05-20 6:26 Uwe Kleine-König
2022-05-20 20:20 ` Andrew Lunn
2022-05-22 21:00 ` [PATCH net-next RESEND] net: fec: Do proper error checking for enet_out clk patchwork-bot+netdevbpf
0 siblings, 2 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2022-05-20 6:26 UTC (permalink / raw)
To: Joakim Zhang, David S. Miller, Jakub Kicinski
Cc: netdev, NXP Linux Team, kernel
An error code returned by devm_clk_get() might have other meanings than
"This clock doesn't exist". So use devm_clk_get_optional() and handle
all remaining errors as fatal.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello,
I sent this back in March and was asked to resend after the merge window
closed. Actually I intended to do this earlier, but it got lost in my
todo list and I found it just now. (And after all it is still after the
merge window and http://vger.kernel.org/~davem/net-next.html claims it's
still time ... :-)
Best regards
Uwe
drivers/net/ethernet/freescale/fec_main.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 11227f51404c..2512b68d8545 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3866,9 +3866,11 @@ fec_probe(struct platform_device *pdev)
fep->itr_clk_rate = clk_get_rate(fep->clk_ahb);
/* enet_out is optional, depends on board */
- fep->clk_enet_out = devm_clk_get(&pdev->dev, "enet_out");
- if (IS_ERR(fep->clk_enet_out))
- fep->clk_enet_out = NULL;
+ fep->clk_enet_out = devm_clk_get_optional(&pdev->dev, "enet_out");
+ if (IS_ERR(fep->clk_enet_out)) {
+ ret = PTR_ERR(fep->clk_enet_out);
+ goto failed_clk;
+ }
fep->ptp_clk_on = false;
mutex_init(&fep->ptp_clk_mutex);
base-commit: 3123109284176b1532874591f7c81f3837bbdc17
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH net-next RESEND] net: fec: Do proper error checking for enet_out clk
2022-05-20 6:26 [PATCH net-next RESEND] net: fec: Do proper error checking for enet_out clk Uwe Kleine-König
@ 2022-05-20 20:20 ` Andrew Lunn
2022-05-21 8:34 ` [PATCH v2] net: fec: Do proper error checking for optional clks Uwe Kleine-König
2022-05-22 21:00 ` [PATCH net-next RESEND] net: fec: Do proper error checking for enet_out clk patchwork-bot+netdevbpf
1 sibling, 1 reply; 6+ messages in thread
From: Andrew Lunn @ 2022-05-20 20:20 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Joakim Zhang, David S. Miller, Jakub Kicinski, netdev,
NXP Linux Team, kernel
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index 11227f51404c..2512b68d8545 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -3866,9 +3866,11 @@ fec_probe(struct platform_device *pdev)
> fep->itr_clk_rate = clk_get_rate(fep->clk_ahb);
>
> /* enet_out is optional, depends on board */
> - fep->clk_enet_out = devm_clk_get(&pdev->dev, "enet_out");
> - if (IS_ERR(fep->clk_enet_out))
> - fep->clk_enet_out = NULL;
> + fep->clk_enet_out = devm_clk_get_optional(&pdev->dev, "enet_out");
> + if (IS_ERR(fep->clk_enet_out)) {
> + ret = PTR_ERR(fep->clk_enet_out);
> + goto failed_clk;
> + }
>
> fep->ptp_clk_on = false;
> mutex_init(&fep->ptp_clk_mutex);
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
This is O.K, as far as it goes. But directly after this we have:
/* clk_ref is optional, depends on board */
fep->clk_ref = devm_clk_get(&pdev->dev, "enet_clk_ref");
if (IS_ERR(fep->clk_ref))
fep->clk_ref = NULL;
fep->clk_ref_rate = clk_get_rate(fep->clk_ref);
It would be good to do the same to this clock as well.
Andrew
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2] net: fec: Do proper error checking for optional clks
2022-05-20 20:20 ` Andrew Lunn
@ 2022-05-21 8:34 ` Uwe Kleine-König
2022-05-21 14:26 ` Andrew Lunn
2022-05-22 20:50 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2022-05-21 8:34 UTC (permalink / raw)
To: Joakim Zhang, David S. Miller, Jakub Kicinski
Cc: netdev, NXP Linux Team, kernel, Andrew Lunn
An error code returned by devm_clk_get() might have other meanings than
"This clock doesn't exist". So use devm_clk_get_optional() and handle
all remaining errors as fatal.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello,
as Andrew pointed out, there are two clocks that can benefit from better
error handling during probe. So compared to (implicit) v1 this also
cares for "enet_clk_ref".
Best regards
Uwe
drivers/net/ethernet/freescale/fec_main.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 11227f51404c..907b379d2c83 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3866,17 +3866,21 @@ fec_probe(struct platform_device *pdev)
fep->itr_clk_rate = clk_get_rate(fep->clk_ahb);
/* enet_out is optional, depends on board */
- fep->clk_enet_out = devm_clk_get(&pdev->dev, "enet_out");
- if (IS_ERR(fep->clk_enet_out))
- fep->clk_enet_out = NULL;
+ fep->clk_enet_out = devm_clk_get_optional(&pdev->dev, "enet_out");
+ if (IS_ERR(fep->clk_enet_out)) {
+ ret = PTR_ERR(fep->clk_enet_out);
+ goto failed_clk;
+ }
fep->ptp_clk_on = false;
mutex_init(&fep->ptp_clk_mutex);
/* clk_ref is optional, depends on board */
- fep->clk_ref = devm_clk_get(&pdev->dev, "enet_clk_ref");
- if (IS_ERR(fep->clk_ref))
- fep->clk_ref = NULL;
+ fep->clk_ref = devm_clk_get_optional(&pdev->dev, "enet_clk_ref");
+ if (IS_ERR(fep->clk_ref)) {
+ ret = PTR_ERR(fep->clk_ref);
+ goto failed_clk;
+ }
fep->clk_ref_rate = clk_get_rate(fep->clk_ref);
/* clk_2x_txclk is optional, depends on board */
base-commit: 3123109284176b1532874591f7c81f3837bbdc17
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] net: fec: Do proper error checking for optional clks
2022-05-21 8:34 ` [PATCH v2] net: fec: Do proper error checking for optional clks Uwe Kleine-König
@ 2022-05-21 14:26 ` Andrew Lunn
2022-05-22 20:50 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 6+ messages in thread
From: Andrew Lunn @ 2022-05-21 14:26 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Joakim Zhang, David S. Miller, Jakub Kicinski, netdev,
NXP Linux Team, kernel
On Sat, May 21, 2022 at 10:34:25AM +0200, Uwe Kleine-König wrote:
> An error code returned by devm_clk_get() might have other meanings than
> "This clock doesn't exist". So use devm_clk_get_optional() and handle
> all remaining errors as fatal.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] net: fec: Do proper error checking for optional clks
2022-05-21 8:34 ` [PATCH v2] net: fec: Do proper error checking for optional clks Uwe Kleine-König
2022-05-21 14:26 ` Andrew Lunn
@ 2022-05-22 20:50 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-05-22 20:50 UTC (permalink / raw)
To: =?utf-8?q?Uwe_Kleine-K=C3=B6nig_=3Cu=2Ekleine-koenig=40pengutronix=2Ede=3E?=
Cc: qiangqing.zhang, davem, kuba, netdev, linux-imx, kernel, andrew
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:
On Sat, 21 May 2022 10:34:25 +0200 you wrote:
> An error code returned by devm_clk_get() might have other meanings than
> "This clock doesn't exist". So use devm_clk_get_optional() and handle
> all remaining errors as fatal.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Hello,
>
> [...]
Here is the summary with links:
- [v2] net: fec: Do proper error checking for optional clks
https://git.kernel.org/netdev/net/c/43252ed15f46
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next RESEND] net: fec: Do proper error checking for enet_out clk
2022-05-20 6:26 [PATCH net-next RESEND] net: fec: Do proper error checking for enet_out clk Uwe Kleine-König
2022-05-20 20:20 ` Andrew Lunn
@ 2022-05-22 21:00 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-05-22 21:00 UTC (permalink / raw)
To: =?utf-8?q?Uwe_Kleine-K=C3=B6nig_=3Cu=2Ekleine-koenig=40pengutronix=2Ede=3E?=
Cc: qiangqing.zhang, davem, kuba, netdev, linux-imx, kernel
Hello:
This patch was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:
On Fri, 20 May 2022 08:26:50 +0200 you wrote:
> An error code returned by devm_clk_get() might have other meanings than
> "This clock doesn't exist". So use devm_clk_get_optional() and handle
> all remaining errors as fatal.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Hello,
>
> [...]
Here is the summary with links:
- [net-next,RESEND] net: fec: Do proper error checking for enet_out clk
https://git.kernel.org/netdev/net-next/c/5ff851b7be75
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-22 21:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-20 6:26 [PATCH net-next RESEND] net: fec: Do proper error checking for enet_out clk Uwe Kleine-König
2022-05-20 20:20 ` Andrew Lunn
2022-05-21 8:34 ` [PATCH v2] net: fec: Do proper error checking for optional clks Uwe Kleine-König
2022-05-21 14:26 ` Andrew Lunn
2022-05-22 20:50 ` patchwork-bot+netdevbpf
2022-05-22 21:00 ` [PATCH net-next RESEND] net: fec: Do proper error checking for enet_out clk patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.