* [PATCHv2 net-next] net: bcmasp: handle EPROBE_DEFER for MAC retrieval
@ 2026-04-28 1:43 Rosen Penev
2026-04-28 12:39 ` Andrew Lunn
2026-04-28 17:43 ` Justin Chen
0 siblings, 2 replies; 5+ messages in thread
From: Rosen Penev @ 2026-04-28 1:43 UTC (permalink / raw)
To: netdev
Cc: Justin Chen, Florian Fainelli, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni,
open list:BROADCOM ASP 2.0 ETHERNET DRIVER, open list
of_get_ethdev_address can return EPROBE_DEFER when using nvmem. To
handle this, encode the error with ERR_PTR for minimal changes. Adjust
the only place using bcmasp_interface_create.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
v2: use dev_err_probe.
drivers/net/ethernet/broadcom/asp2/bcmasp.c | 6 +++---
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
index 972474893a6b..e9b11b956344 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
@@ -1333,10 +1333,10 @@ static int bcmasp_probe(struct platform_device *pdev)
i = 0;
for_each_available_child_of_node_scoped(ports_node, intf_node) {
intf = bcmasp_interface_create(priv, intf_node, i);
- if (!intf) {
- dev_err(dev, "Cannot create eth interface %d\n", i);
+ if (IS_ERR(intf)) {
of_node_put(ports_node);
- ret = -EINVAL;
+ ret = dev_err_probe(dev, PTR_ERR(intf), "Cannot create eth interface %d\n",
+ i);
goto err_cleanup;
}
list_add_tail(&intf->list, &priv->intfs);
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
index ec63f50a849e..caf0e408e2f7 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
@@ -1254,7 +1254,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
struct device *dev = &priv->pdev->dev;
struct bcmasp_intf *intf;
struct net_device *ndev;
- int ch, port, ret;
+ int ch, port, ret = -EINVAL;
if (of_property_read_u32(ndev_dn, "reg", &port)) {
dev_warn(dev, "%s: invalid port number\n", ndev_dn->name);
@@ -1314,6 +1314,8 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
}
ret = of_get_ethdev_address(ndev_dn, ndev);
+ if (ret == -EPROBE_DEFER)
+ return ERR_PTR(-EPROBE_DEFER);
if (ret) {
netdev_warn(ndev, "using random Ethernet MAC\n");
eth_hw_addr_random(ndev);
@@ -1340,7 +1342,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
err_free_netdev:
free_netdev(ndev);
err:
- return NULL;
+ return ERR_PTR(ret);
}
void bcmasp_interface_destroy(struct bcmasp_intf *intf)
--
2.54.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCHv2 net-next] net: bcmasp: handle EPROBE_DEFER for MAC retrieval
2026-04-28 1:43 [PATCHv2 net-next] net: bcmasp: handle EPROBE_DEFER for MAC retrieval Rosen Penev
@ 2026-04-28 12:39 ` Andrew Lunn
2026-04-28 17:43 ` Justin Chen
1 sibling, 0 replies; 5+ messages in thread
From: Andrew Lunn @ 2026-04-28 12:39 UTC (permalink / raw)
To: Rosen Penev
Cc: netdev, Justin Chen, Florian Fainelli, Andrew Lunn,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
open list:BROADCOM ASP 2.0 ETHERNET DRIVER, open list
> +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
> @@ -1254,7 +1254,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
> struct device *dev = &priv->pdev->dev;
> struct bcmasp_intf *intf;
> struct net_device *ndev;
> - int ch, port, ret;
> + int ch, port, ret = -EINVAL;
That breaks the reverse christmas tree. Otherwise this looks O.K.
Andrew
---
pw-bot: cr
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCHv2 net-next] net: bcmasp: handle EPROBE_DEFER for MAC retrieval
2026-04-28 1:43 [PATCHv2 net-next] net: bcmasp: handle EPROBE_DEFER for MAC retrieval Rosen Penev
2026-04-28 12:39 ` Andrew Lunn
@ 2026-04-28 17:43 ` Justin Chen
2026-04-29 3:36 ` Rosen Penev
1 sibling, 1 reply; 5+ messages in thread
From: Justin Chen @ 2026-04-28 17:43 UTC (permalink / raw)
To: Rosen Penev, netdev
Cc: Florian Fainelli, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni,
open list:BROADCOM ASP 2.0 ETHERNET DRIVER, open list
On 4/27/26 6:43 PM, Rosen Penev wrote:
> of_get_ethdev_address can return EPROBE_DEFER when using nvmem. To
> handle this, encode the error with ERR_PTR for minimal changes. Adjust
> the only place using bcmasp_interface_create.
>
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
> ---
> v2: use dev_err_probe.
> drivers/net/ethernet/broadcom/asp2/bcmasp.c | 6 +++---
> drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 6 ++++--
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
> index 972474893a6b..e9b11b956344 100644
> --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
> +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
> @@ -1333,10 +1333,10 @@ static int bcmasp_probe(struct platform_device *pdev)
> i = 0;
> for_each_available_child_of_node_scoped(ports_node, intf_node) {
> intf = bcmasp_interface_create(priv, intf_node, i);
> - if (!intf) {
> - dev_err(dev, "Cannot create eth interface %d\n", i);
> + if (IS_ERR(intf)) {
> of_node_put(ports_node);
> - ret = -EINVAL;
> + ret = dev_err_probe(dev, PTR_ERR(intf), "Cannot create eth interface %d\n",
> + i);
> goto err_cleanup;
> }
> list_add_tail(&intf->list, &priv->intfs);
> diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
> index ec63f50a849e..caf0e408e2f7 100644
> --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
> +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
> @@ -1254,7 +1254,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
> struct device *dev = &priv->pdev->dev;
> struct bcmasp_intf *intf;
> struct net_device *ndev;
> - int ch, port, ret;
> + int ch, port, ret = -EINVAL;
>
> if (of_property_read_u32(ndev_dn, "reg", &port)) {
> dev_warn(dev, "%s: invalid port number\n", ndev_dn->name);
> @@ -1314,6 +1314,8 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
> }
>
> ret = of_get_ethdev_address(ndev_dn, ndev);
> + if (ret == -EPROBE_DEFER)
> + return ERR_PTR(-EPROBE_DEFER);
Do we need to hit unwind here? i.e. goto err_deregister_fixed_link.
Thanks,
Justin
> if (ret) {
> netdev_warn(ndev, "using random Ethernet MAC\n");
> eth_hw_addr_random(ndev);
> @@ -1340,7 +1342,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
> err_free_netdev:
> free_netdev(ndev);
> err:
> - return NULL;
> + return ERR_PTR(ret);
> }
>
> void bcmasp_interface_destroy(struct bcmasp_intf *intf)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCHv2 net-next] net: bcmasp: handle EPROBE_DEFER for MAC retrieval
@ 2026-04-29 3:34 Rosen Penev
0 siblings, 0 replies; 5+ messages in thread
From: Rosen Penev @ 2026-04-29 3:34 UTC (permalink / raw)
To: netdev
Cc: Justin Chen, Florian Fainelli, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni,
open list:BROADCOM ASP 2.0 ETHERNET DRIVER, open list
of_get_ethdev_address can return EPROBE_DEFER when using nvmem. To
handle this, encode the error with ERR_PTR for minimal changes. Adjust
the only place using bcmasp_interface_create.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
v2: use goto after of_get_mac_address probe deferral
drivers/net/ethernet/broadcom/asp2/bcmasp.c | 6 +++---
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
index 972474893a6b..e9b11b956344 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
@@ -1333,10 +1333,10 @@ static int bcmasp_probe(struct platform_device *pdev)
i = 0;
for_each_available_child_of_node_scoped(ports_node, intf_node) {
intf = bcmasp_interface_create(priv, intf_node, i);
- if (!intf) {
- dev_err(dev, "Cannot create eth interface %d\n", i);
+ if (IS_ERR(intf)) {
of_node_put(ports_node);
- ret = -EINVAL;
+ ret = dev_err_probe(dev, PTR_ERR(intf), "Cannot create eth interface %d\n",
+ i);
goto err_cleanup;
}
list_add_tail(&intf->list, &priv->intfs);
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
index ec63f50a849e..4c34bf16bb76 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
@@ -1254,7 +1254,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
struct device *dev = &priv->pdev->dev;
struct bcmasp_intf *intf;
struct net_device *ndev;
- int ch, port, ret;
+ int ch, port, ret = -EINVAL;
if (of_property_read_u32(ndev_dn, "reg", &port)) {
dev_warn(dev, "%s: invalid port number\n", ndev_dn->name);
@@ -1314,6 +1314,8 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
}
ret = of_get_ethdev_address(ndev_dn, ndev);
+ if (ret == -EPROBE_DEFER)
+ goto err_deregister_fixed_link;
if (ret) {
netdev_warn(ndev, "using random Ethernet MAC\n");
eth_hw_addr_random(ndev);
@@ -1340,7 +1342,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
err_free_netdev:
free_netdev(ndev);
err:
- return NULL;
+ return ERR_PTR(ret);
}
void bcmasp_interface_destroy(struct bcmasp_intf *intf)
--
2.54.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCHv2 net-next] net: bcmasp: handle EPROBE_DEFER for MAC retrieval
2026-04-28 17:43 ` Justin Chen
@ 2026-04-29 3:36 ` Rosen Penev
0 siblings, 0 replies; 5+ messages in thread
From: Rosen Penev @ 2026-04-29 3:36 UTC (permalink / raw)
To: Justin Chen
Cc: netdev, Florian Fainelli, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni,
open list:BROADCOM ASP 2.0 ETHERNET DRIVER, open list
On Tue, Apr 28, 2026 at 10:43 AM Justin Chen <justin.chen@broadcom.com> wrote:
>
>
>
> On 4/27/26 6:43 PM, Rosen Penev wrote:
> > of_get_ethdev_address can return EPROBE_DEFER when using nvmem. To
> > handle this, encode the error with ERR_PTR for minimal changes. Adjust
> > the only place using bcmasp_interface_create.
> >
> > Signed-off-by: Rosen Penev <rosenp@gmail.com>
> > ---
> > v2: use dev_err_probe.
> > drivers/net/ethernet/broadcom/asp2/bcmasp.c | 6 +++---
> > drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 6 ++++--
> > 2 files changed, 7 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
> > index 972474893a6b..e9b11b956344 100644
> > --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
> > +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
> > @@ -1333,10 +1333,10 @@ static int bcmasp_probe(struct platform_device *pdev)
> > i = 0;
> > for_each_available_child_of_node_scoped(ports_node, intf_node) {
> > intf = bcmasp_interface_create(priv, intf_node, i);
> > - if (!intf) {
> > - dev_err(dev, "Cannot create eth interface %d\n", i);
> > + if (IS_ERR(intf)) {
> > of_node_put(ports_node);
> > - ret = -EINVAL;
> > + ret = dev_err_probe(dev, PTR_ERR(intf), "Cannot create eth interface %d\n",
> > + i);
> > goto err_cleanup;
> > }
> > list_add_tail(&intf->list, &priv->intfs);
> > diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
> > index ec63f50a849e..caf0e408e2f7 100644
> > --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
> > +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
> > @@ -1254,7 +1254,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
> > struct device *dev = &priv->pdev->dev;
> > struct bcmasp_intf *intf;
> > struct net_device *ndev;
> > - int ch, port, ret;
> > + int ch, port, ret = -EINVAL;
> >
> > if (of_property_read_u32(ndev_dn, "reg", &port)) {
> > dev_warn(dev, "%s: invalid port number\n", ndev_dn->name);
> > @@ -1314,6 +1314,8 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
> > }
> >
> > ret = of_get_ethdev_address(ndev_dn, ndev);
> > + if (ret == -EPROBE_DEFER)
> > + return ERR_PTR(-EPROBE_DEFER);
>
> Do we need to hit unwind here? i.e. goto err_deregister_fixed_link.
Yes we do. In other news I just sent another v2 by accident. Guess
I'll wait to send a v4...
>
> Thanks,
> Justin
>
> > if (ret) {
> > netdev_warn(ndev, "using random Ethernet MAC\n");
> > eth_hw_addr_random(ndev);
> > @@ -1340,7 +1342,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
> > err_free_netdev:
> > free_netdev(ndev);
> > err:
> > - return NULL;
> > + return ERR_PTR(ret);
> > }
> >
> > void bcmasp_interface_destroy(struct bcmasp_intf *intf)
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-04-29 3:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-28 1:43 [PATCHv2 net-next] net: bcmasp: handle EPROBE_DEFER for MAC retrieval Rosen Penev
2026-04-28 12:39 ` Andrew Lunn
2026-04-28 17:43 ` Justin Chen
2026-04-29 3:36 ` Rosen Penev
-- strict thread matches above, loose matches on Subject: below --
2026-04-29 3:34 Rosen Penev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox