* [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid
@ 2019-10-14 21:20 Florian Fainelli
2019-10-15 0:52 ` Doug Berger
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Florian Fainelli @ 2019-10-14 21:20 UTC (permalink / raw)
To: netdev
Cc: phil, jonathan, matthias.bgg, linux-rpi-kernel, wahrenst,
nsaenzjulienne, Florian Fainelli, Doug Berger, David S. Miller,
open list:BROADCOM GENET ETHERNET DRIVER, open list
Instead of having a hard failure and stopping the driver's probe
routine, generate a random Ethernet MAC address to keep going.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes in v2:
- provide a message that a random MAC is used, the same message that
bcmsysport.c uses
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 12cb77ef1081..dd4e4f1dd384 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3461,16 +3461,10 @@ static int bcmgenet_probe(struct platform_device *pdev)
goto err;
}
- if (dn) {
+ if (dn)
macaddr = of_get_mac_address(dn);
- if (IS_ERR(macaddr)) {
- dev_err(&pdev->dev, "can't find MAC address\n");
- err = -EINVAL;
- goto err;
- }
- } else {
+ else
macaddr = pd->mac_address;
- }
priv->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(priv->base)) {
@@ -3482,7 +3476,12 @@ static int bcmgenet_probe(struct platform_device *pdev)
SET_NETDEV_DEV(dev, &pdev->dev);
dev_set_drvdata(&pdev->dev, dev);
- ether_addr_copy(dev->dev_addr, macaddr);
+ if (IS_ERR_OR_NULL(macaddr) || !is_valid_ether_addr(macaddr)) {
+ dev_warn(&pdev->dev, "using random Ethernet MAC\n");
+ eth_hw_addr_random(dev);
+ } else {
+ ether_addr_copy(dev->dev_addr, macaddr);
+ }
dev->watchdog_timeo = 2 * HZ;
dev->ethtool_ops = &bcmgenet_ethtool_ops;
dev->netdev_ops = &bcmgenet_netdev_ops;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid
2019-10-14 21:20 [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid Florian Fainelli
@ 2019-10-15 0:52 ` Doug Berger
2019-10-15 22:32 ` Scott Branden
2019-10-16 3:34 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Doug Berger @ 2019-10-15 0:52 UTC (permalink / raw)
To: Florian Fainelli, netdev
Cc: phil, jonathan, matthias.bgg, linux-rpi-kernel, wahrenst,
nsaenzjulienne, David S. Miller,
open list:BROADCOM GENET ETHERNET DRIVER, open list
On 10/14/19 2:20 PM, Florian Fainelli wrote:
> Instead of having a hard failure and stopping the driver's probe
> routine, generate a random Ethernet MAC address to keep going.
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> Changes in v2:
>
> - provide a message that a random MAC is used, the same message that
> bcmsysport.c uses
>
> drivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index 12cb77ef1081..dd4e4f1dd384 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> @@ -3461,16 +3461,10 @@ static int bcmgenet_probe(struct platform_device *pdev)
> goto err;
> }
>
> - if (dn) {
> + if (dn)
> macaddr = of_get_mac_address(dn);
> - if (IS_ERR(macaddr)) {
> - dev_err(&pdev->dev, "can't find MAC address\n");
> - err = -EINVAL;
> - goto err;
> - }
> - } else {
> + else
> macaddr = pd->mac_address;
> - }
>
> priv->base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(priv->base)) {
> @@ -3482,7 +3476,12 @@ static int bcmgenet_probe(struct platform_device *pdev)
>
> SET_NETDEV_DEV(dev, &pdev->dev);
> dev_set_drvdata(&pdev->dev, dev);
> - ether_addr_copy(dev->dev_addr, macaddr);
> + if (IS_ERR_OR_NULL(macaddr) || !is_valid_ether_addr(macaddr)) {
> + dev_warn(&pdev->dev, "using random Ethernet MAC\n");
> + eth_hw_addr_random(dev);
> + } else {
> + ether_addr_copy(dev->dev_addr, macaddr);
> + }
> dev->watchdog_timeo = 2 * HZ;
> dev->ethtool_ops = &bcmgenet_ethtool_ops;
> dev->netdev_ops = &bcmgenet_netdev_ops;
>
Acked-by: Doug Berger <opendmb@gmail.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid
2019-10-14 21:20 [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid Florian Fainelli
2019-10-15 0:52 ` Doug Berger
@ 2019-10-15 22:32 ` Scott Branden
2019-10-15 22:39 ` Jakub Kicinski
2019-10-16 3:34 ` David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Scott Branden @ 2019-10-15 22:32 UTC (permalink / raw)
To: Florian Fainelli, netdev
Cc: phil, jonathan, matthias.bgg, linux-rpi-kernel, wahrenst,
nsaenzjulienne, Doug Berger, David S. Miller,
open list:BROADCOM GENET ETHERNET DRIVER, open list
Hi Florian,
On 2019-10-14 2:20 p.m., Florian Fainelli wrote:
> Instead of having a hard failure and stopping the driver's probe
> routine, generate a random Ethernet MAC address to keep going.
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> Changes in v2:
>
> - provide a message that a random MAC is used, the same message that
> bcmsysport.c uses
>
> drivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index 12cb77ef1081..dd4e4f1dd384 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> @@ -3461,16 +3461,10 @@ static int bcmgenet_probe(struct platform_device *pdev)
> goto err;
> }
>
> - if (dn) {
> + if (dn)
> macaddr = of_get_mac_address(dn);
> - if (IS_ERR(macaddr)) {
> - dev_err(&pdev->dev, "can't find MAC address\n");
> - err = -EINVAL;
> - goto err;
> - }
> - } else {
> + else
> macaddr = pd->mac_address;
> - }
>
> priv->base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(priv->base)) {
> @@ -3482,7 +3476,12 @@ static int bcmgenet_probe(struct platform_device *pdev)
>
> SET_NETDEV_DEV(dev, &pdev->dev);
> dev_set_drvdata(&pdev->dev, dev);
> - ether_addr_copy(dev->dev_addr, macaddr);
> + if (IS_ERR_OR_NULL(macaddr) || !is_valid_ether_addr(macaddr)) {
> + dev_warn(&pdev->dev, "using random Ethernet MAC\n");
I would still consider this warrants a dev_err as you should not be
using the device with a random MAC address assigned to it. But I'll
leave it to the "experts" to decide on the print level here.
> + eth_hw_addr_random(dev);
> + } else {
> + ether_addr_copy(dev->dev_addr, macaddr);
> + }
> dev->watchdog_timeo = 2 * HZ;
> dev->ethtool_ops = &bcmgenet_ethtool_ops;
> dev->netdev_ops = &bcmgenet_netdev_ops;
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid
2019-10-15 22:32 ` Scott Branden
@ 2019-10-15 22:39 ` Jakub Kicinski
2019-10-16 0:04 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Jakub Kicinski @ 2019-10-15 22:39 UTC (permalink / raw)
To: Scott Branden
Cc: Florian Fainelli, netdev, phil, jonathan, matthias.bgg,
linux-rpi-kernel, wahrenst, nsaenzjulienne, Doug Berger,
David S. Miller, bcm-kernel-feedback-list, linux-kernel
On Tue, 15 Oct 2019 15:32:28 -0700, Scott Branden wrote:
> > @@ -3482,7 +3476,12 @@ static int bcmgenet_probe(struct platform_device *pdev)
> >
> > SET_NETDEV_DEV(dev, &pdev->dev);
> > dev_set_drvdata(&pdev->dev, dev);
> > - ether_addr_copy(dev->dev_addr, macaddr);
> > + if (IS_ERR_OR_NULL(macaddr) || !is_valid_ether_addr(macaddr)) {
> > + dev_warn(&pdev->dev, "using random Ethernet MAC\n");
>
> I would still consider this warrants a dev_err as you should not be
> using the device with a random MAC address assigned to it. But I'll
> leave it to the "experts" to decide on the print level here.
FWIW I'd stick to warn for this message since this is no longer a hard
failure.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid
2019-10-15 22:39 ` Jakub Kicinski
@ 2019-10-16 0:04 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-10-16 0:04 UTC (permalink / raw)
To: jakub.kicinski
Cc: scott.branden, f.fainelli, netdev, phil, jonathan, matthias.bgg,
linux-rpi-kernel, wahrenst, nsaenzjulienne, opendmb,
bcm-kernel-feedback-list, linux-kernel
From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Tue, 15 Oct 2019 15:39:55 -0700
> On Tue, 15 Oct 2019 15:32:28 -0700, Scott Branden wrote:
>> > @@ -3482,7 +3476,12 @@ static int bcmgenet_probe(struct platform_device *pdev)
>> >
>> > SET_NETDEV_DEV(dev, &pdev->dev);
>> > dev_set_drvdata(&pdev->dev, dev);
>> > - ether_addr_copy(dev->dev_addr, macaddr);
>> > + if (IS_ERR_OR_NULL(macaddr) || !is_valid_ether_addr(macaddr)) {
>> > + dev_warn(&pdev->dev, "using random Ethernet MAC\n");
>>
>> I would still consider this warrants a dev_err as you should not be
>> using the device with a random MAC address assigned to it. But I'll
>> leave it to the "experts" to decide on the print level here.
>
> FWIW I'd stick to warn for this message since this is no longer a hard
> failure.
Agreed.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid
2019-10-14 21:20 [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid Florian Fainelli
2019-10-15 0:52 ` Doug Berger
2019-10-15 22:32 ` Scott Branden
@ 2019-10-16 3:34 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-10-16 3:34 UTC (permalink / raw)
To: f.fainelli
Cc: netdev, phil, jonathan, matthias.bgg, linux-rpi-kernel, wahrenst,
nsaenzjulienne, opendmb, bcm-kernel-feedback-list, linux-kernel
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Mon, 14 Oct 2019 14:20:00 -0700
> Instead of having a hard failure and stopping the driver's probe
> routine, generate a random Ethernet MAC address to keep going.
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Applied to net-next, thank you.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-16 3:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-14 21:20 [PATCH net-next v2] net: bcmgenet: Generate a random MAC if none is valid Florian Fainelli
2019-10-15 0:52 ` Doug Berger
2019-10-15 22:32 ` Scott Branden
2019-10-15 22:39 ` Jakub Kicinski
2019-10-16 0:04 ` David Miller
2019-10-16 3:34 ` David Miller
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).