* [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors
@ 2026-09-09 6:47 phucduc.bui
2026-09-09 6:47 ` [PATCH net v5 2/2] net: fec: Handle optional IRQ lookup errors correctly phucduc.bui
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: phucduc.bui @ 2026-09-09 6:47 UTC (permalink / raw)
To: Wei Fang, Frank Li, Shenwei Wang
Cc: Andrew Lunn, Simon Horman, davem, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Richard Cochran, Stephen Boyd, imx, linux-kernel,
netdev, bui duc phuc
From: bui duc phuc <phucduc.bui@gmail.com>
Change fec_ptp_init() to return an error code instead of silently
ignoring failures during PTP initialization.
The PPS IRQ is not required for the FEC/PTP functionality, so its
absence should not make the probe fail. However, an unavailable
optional IRQ should be distinguished from an actual error returned
during the IRQ lookup.
If a platform does not support the PPS IRQ, it can omit the IRQ from
its device tree and the optional lookup will return -ENXIO. Propagate
other errors from the IRQ lookup instead of silently ignoring them.
In particular, silently ignoring -EPROBE_DEFER can cause the driver to
continue probing instead of deferring as required.
Also propagate failures from devm_request_irq() and ptp_clock_register().
Update the function declaration in fec.h accordingly.
Found by manual code inspection.
Fixes: b86bcb299092 ("net: fec_ptp: Use platform_get_irq_xxx_optional() to avoid error message")
Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
---
Link v1:
https://lore.kernel.org/all/20260820111416.97917-1-phucduc.bui@gmail.com/
Link v2:
https://lore.kernel.org/all/20260903092430.354186-1-phucduc.bui@gmail.com/
Link v3:
https://lore.kernel.org/all/20260904105542.70540-1-phucduc.bui@gmail.com/
Link v4:
https://lore.kernel.org/all/20260907034502.12619-1-phucduc.bui@gmail.com/
Changes in v2:
- Squash the two patches into one.
- Add error handling for platform_get_irq_byname_optional().
- Fix error handling for ptp_clock_register().
Changes in v3:
- Retarget the patch to the net tree instead of net-next.
- Add error handling for platform_get_irq_byname_optional()
in fec_probe() for the fec_enet_interrupt IRQ.
Changes in v4:
- Use a goto label for cleanup instead of returning directly on errors
from platform_get_irq_byname_optional() in probe().
- Update the commit message.
Changes in v5:
- Split the optional IRQ handling in fec_main.c into a separate patch.
drivers/net/ethernet/freescale/fec.h | 2 +-
drivers/net/ethernet/freescale/fec_main.c | 7 +++++--
drivers/net/ethernet/freescale/fec_ptp.c | 22 ++++++++++++++--------
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index 7176803146f3..8831da37326b 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -692,7 +692,7 @@ struct fec_enet_private {
u64 ethtool_stats[];
};
-void fec_ptp_init(struct platform_device *pdev, int irq_idx);
+int fec_ptp_init(struct platform_device *pdev, int irq_idx);
void fec_ptp_restore_state(struct fec_enet_private *fep);
void fec_ptp_save_state(struct fec_enet_private *fep);
void fec_ptp_stop(struct platform_device *pdev);
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 794ec427b0ee..c6e29b5c2abb 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -5384,8 +5384,11 @@ fec_probe(struct platform_device *pdev)
goto failed_reset;
irq_cnt = fec_enet_get_irq_cnt(pdev);
- if (fep->bufdesc_ex)
- fec_ptp_init(pdev, irq_cnt);
+ if (fep->bufdesc_ex) {
+ ret = fec_ptp_init(pdev, irq_cnt);
+ if (ret)
+ goto failed_reset;
+ }
ret = fec_enet_init(ndev);
if (ret)
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index 56801c2009d5..557a76797eba 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -736,7 +736,7 @@ static irqreturn_t fec_pps_interrupt(int irq, void *dev_id)
* cyclecounter init routine and exits.
*/
-void fec_ptp_init(struct platform_device *pdev, int irq_idx)
+int fec_ptp_init(struct platform_device *pdev, int irq_idx)
{
struct net_device *ndev = platform_get_drvdata(pdev);
struct fec_enet_private *fep = netdev_priv(ndev);
@@ -779,26 +779,32 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx)
HRTIMER_MODE_REL);
irq = platform_get_irq_byname_optional(pdev, "pps");
- if (irq < 0)
+ if (irq < 0 && irq != -ENXIO)
+ return irq;
+ if (irq == -ENXIO) {
irq = platform_get_irq_optional(pdev, irq_idx);
- /* Failure to get an irq is not fatal,
- * only the PTP_CLOCK_PPS clock events should stop
- */
- if (irq >= 0) {
+ if (irq < 0 && irq != -ENXIO)
+ return irq;
+ }
+
+ if (irq > 0) {
ret = devm_request_irq(&pdev->dev, irq, fec_pps_interrupt,
0, pdev->name, ndev);
if (ret < 0)
- dev_warn(&pdev->dev, "request for pps irq failed(%d)\n",
- ret);
+ return ret;
}
fep->ptp_clock = ptp_clock_register(&fep->ptp_caps, &pdev->dev);
if (IS_ERR(fep->ptp_clock)) {
+ ret = PTR_ERR(fep->ptp_clock);
fep->ptp_clock = NULL;
dev_err(&pdev->dev, "ptp_clock_register failed\n");
+ return ret;
}
schedule_delayed_work(&fep->time_keep, HZ);
+
+ return 0;
}
void fec_ptp_save_state(struct fec_enet_private *fep)
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net v5 2/2] net: fec: Handle optional IRQ lookup errors correctly
2026-09-09 6:47 [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors phucduc.bui
@ 2026-09-09 6:47 ` phucduc.bui
2026-09-09 7:56 ` Wei Fang
2026-09-09 7:52 ` [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors Wei Fang
2026-09-11 1:07 ` Jakub Kicinski
2 siblings, 1 reply; 6+ messages in thread
From: phucduc.bui @ 2026-09-09 6:47 UTC (permalink / raw)
To: Wei Fang, Frank Li, Shenwei Wang
Cc: Andrew Lunn, Simon Horman, davem, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Richard Cochran, Stephen Boyd, imx, linux-kernel,
netdev, bui duc phuc
From: bui duc phuc <phucduc.bui@gmail.com>
Handle errors from platform_get_irq_byname_optional() explicitly while
preserving the existing fallback to platform_get_irq() when the named IRQ
is not available.
Propagate errors other than -ENXIO from the optional IRQ lookup instead
of silently falling back to the indexed IRQ lookup.
In particular, silently ignoring -EPROBE_DEFER can cause the driver to
continue probing instead of deferring as required.
Fixes: 3b56be218f65 ("net: fec_main: Use platform_get_irq_byname_optional() to avoid error message")
Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
---
drivers/net/ethernet/freescale/fec_main.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index c6e29b5c2abb..f7636f23d1eb 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -5397,12 +5397,17 @@ fec_probe(struct platform_device *pdev)
for (i = 0; i < irq_cnt; i++) {
snprintf(irq_name, sizeof(irq_name), "int%d", i);
irq = platform_get_irq_byname_optional(pdev, irq_name);
- if (irq < 0)
- irq = platform_get_irq(pdev, i);
- if (irq < 0) {
+ if (irq < 0 && irq != -ENXIO) {
ret = irq;
goto failed_irq;
}
+ if (irq == -ENXIO) {
+ irq = platform_get_irq(pdev, i);
+ if (irq < 0) {
+ ret = irq;
+ goto failed_irq;
+ }
+ }
ret = devm_request_irq(&pdev->dev, irq, fec_enet_interrupt,
0, pdev->name, ndev);
if (ret)
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors
2026-09-09 6:47 [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors phucduc.bui
2026-09-09 6:47 ` [PATCH net v5 2/2] net: fec: Handle optional IRQ lookup errors correctly phucduc.bui
@ 2026-09-09 7:52 ` Wei Fang
2026-09-11 1:07 ` Jakub Kicinski
2 siblings, 0 replies; 6+ messages in thread
From: Wei Fang @ 2026-09-09 7:52 UTC (permalink / raw)
To: phucduc.bui, Frank Li, Shenwei Wang
Cc: Andrew Lunn, Simon Horman, davem, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Richard Cochran, Stephen Boyd, imx, linux-kernel,
netdev
> Change fec_ptp_init() to return an error code instead of silently
> ignoring failures during PTP initialization.
>
> The PPS IRQ is not required for the FEC/PTP functionality, so its
> absence should not make the probe fail. However, an unavailable
> optional IRQ should be distinguished from an actual error returned
> during the IRQ lookup.
>
> If a platform does not support the PPS IRQ, it can omit the IRQ from
> its device tree and the optional lookup will return -ENXIO. Propagate
> other errors from the IRQ lookup instead of silently ignoring them.
> In particular, silently ignoring -EPROBE_DEFER can cause the driver to
> continue probing instead of deferring as required.
>
> Also propagate failures from devm_request_irq() and ptp_clock_register().
>
> Update the function declaration in fec.h accordingly.
>
> Found by manual code inspection.
>
> Fixes: b86bcb299092 ("net: fec_ptp: Use platform_get_irq_xxx_optional() to
> avoid error message")
> Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Reviewed-by: Wei Fang <wei.fang@nxp.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH net v5 2/2] net: fec: Handle optional IRQ lookup errors correctly
2026-09-09 6:47 ` [PATCH net v5 2/2] net: fec: Handle optional IRQ lookup errors correctly phucduc.bui
@ 2026-09-09 7:56 ` Wei Fang
0 siblings, 0 replies; 6+ messages in thread
From: Wei Fang @ 2026-09-09 7:56 UTC (permalink / raw)
To: phucduc.bui, Frank Li, Shenwei Wang
Cc: Andrew Lunn, Simon Horman, davem, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Richard Cochran, Stephen Boyd, imx, linux-kernel,
netdev
> Handle errors from platform_get_irq_byname_optional() explicitly while
> preserving the existing fallback to platform_get_irq() when the named IRQ
> is not available.
>
> Propagate errors other than -ENXIO from the optional IRQ lookup instead
> of silently falling back to the indexed IRQ lookup.
>
> In particular, silently ignoring -EPROBE_DEFER can cause the driver to
> continue probing instead of deferring as required.
>
> Fixes: 3b56be218f65 ("net: fec_main: Use platform_get_irq_byname_optional()
> to avoid error message")
> Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Reviewed-by: Wei Fang <wei.fang@nxp.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors
2026-09-09 6:47 [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors phucduc.bui
2026-09-09 6:47 ` [PATCH net v5 2/2] net: fec: Handle optional IRQ lookup errors correctly phucduc.bui
2026-09-09 7:52 ` [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors Wei Fang
@ 2026-09-11 1:07 ` Jakub Kicinski
2026-09-11 4:02 ` Bui Duc Phuc
2 siblings, 1 reply; 6+ messages in thread
From: Jakub Kicinski @ 2026-09-11 1:07 UTC (permalink / raw)
To: phucduc.bui
Cc: Wei Fang, Frank Li, Shenwei Wang, Andrew Lunn, Simon Horman,
davem, Eric Dumazet, Paolo Abeni, Richard Cochran, Stephen Boyd,
imx, linux-kernel, netdev
On Wed, 9 Sep 2026 13:47:11 +0700 phucduc.bui@gmail.com wrote:
> * cyclecounter init routine and exits.
> */
>
> -void fec_ptp_init(struct platform_device *pdev, int irq_idx)
> +int fec_ptp_init(struct platform_device *pdev, int irq_idx)
This function has a kdoc, you need to document the return value now.
Please repost this for net-next without the Fixes tags.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors
2026-09-11 1:07 ` Jakub Kicinski
@ 2026-09-11 4:02 ` Bui Duc Phuc
0 siblings, 0 replies; 6+ messages in thread
From: Bui Duc Phuc @ 2026-09-11 4:02 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Wei Fang, Frank Li, Shenwei Wang, Andrew Lunn, Simon Horman,
davem, Eric Dumazet, Paolo Abeni, Richard Cochran, Stephen Boyd,
imx, linux-kernel, netdev
Hi Jakub,
Thank you for your review.
> > -void fec_ptp_init(struct platform_device *pdev, int irq_idx)
> > +int fec_ptp_init(struct platform_device *pdev, int irq_idx)
>
> This function has a kdoc, you need to document the return value now.
>
> Please repost this for net-next without the Fixes tags.
I will update the KDoc and repost this for net-next without the Fixes:
tags soon.
Best regards,
Phuc
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-09-11 4:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-09 6:47 [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors phucduc.bui
2026-09-09 6:47 ` [PATCH net v5 2/2] net: fec: Handle optional IRQ lookup errors correctly phucduc.bui
2026-09-09 7:56 ` Wei Fang
2026-09-09 7:52 ` [PATCH net v5 1/2] net: fec: Propagate PTP initialization errors Wei Fang
2026-09-11 1:07 ` Jakub Kicinski
2026-09-11 4:02 ` Bui Duc Phuc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®