From: Rosen Penev <rosenp@gmail.com>
To: netdev@vger.kernel.org
Cc: "Florian Fainelli" <florian.fainelli@broadcom.com>,
"Andrew Lunn" <andrew@lunn.ch>,
"Vladimir Oltean" <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Kurt Kanzenbach" <kurt@linutronix.de>,
"Woojung Huh" <woojung.huh@microchip.com>,
UNGLinuxDriver@microchip.com (maintainer:MICROCHIP KSZ SERIES
ETHERNET SWITCH DRIVER),
"Clément Léger" <clement.leger@bootlin.com>,
"George McCollister" <george.mccollister@gmail.com>,
"Richard Cochran" <richardcochran@gmail.com>,
"Rosen Penev" <rosenp@gmail.com>,
"Simon Horman" <horms@kernel.org>,
"Jacob Keller" <jacob.e.keller@intel.com>,
"Uwe Kleine-König" <u.kleine-koenig@baylibre.com>,
"Breno Leitao" <leitao@debian.org>,
linux-kernel@vger.kernel.org (open list),
linux-renesas-soc@vger.kernel.org (open list:RENESAS RZ/N1 A5PSW
SWITCH DRIVER)
Subject: [PATCHv7 net-next 6/6] net: ibm: emac: generate random MAC if not found
Date: Tue, 15 Oct 2024 13:02:21 -0700 [thread overview]
Message-ID: <20241015200222.12452-8-rosenp@gmail.com> (raw)
In-Reply-To: <20241015200222.12452-1-rosenp@gmail.com>
On this Cisco MX60W, u-boot sets the local-mac-address property.
Unfortunately by default, the MAC is wrong and is actually located on a
UBI partition. Which means nvmem needs to be used to grab it.
In the case where that fails, EMAC fails to initialize instead of
generating a random MAC as many other drivers do.
Match behavior with other drivers to have a working ethernet interface.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/net/ethernet/ibm/emac/core.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 3bea10624291..fb9adcc3a16d 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -2937,9 +2937,12 @@ static int emac_init_config(struct emac_instance *dev)
/* Read MAC-address */
err = of_get_ethdev_address(np, dev->ndev);
- if (err)
- return dev_err_probe(&dev->ofdev->dev, err,
- "Can't get valid [local-]mac-address from OF !\n");
+ if (err == -EPROBE_DEFER)
+ return err;
+ if (err) {
+ dev_warn(&dev->ofdev->dev, "Can't get valid mac-address. Generating random.");
+ eth_hw_addr_random(dev->ndev);
+ }
/* IAHT and GAHT filter parameterization */
if (emac_has_feature(dev, EMAC_FTR_EMAC4SYNC)) {
--
2.47.0
next prev parent reply other threads:[~2024-10-15 20:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-15 20:02 [PATCHv7 net-next 0/6] ibm: emac: more cleanups Rosen Penev
2024-10-15 20:02 ` [PATCHv7 net-next 1/6] net: ibm: emac: use netif_receive_skb_list Rosen Penev
2024-10-15 20:02 ` [PATCH] net: memcpy to ethtool_puts Rosen Penev
2024-10-15 20:04 ` Rosen Penev
2024-10-16 13:59 ` kernel test robot
2024-10-15 20:02 ` [PATCHv7 net-next 2/6] net: ibm: emac: remove custom init/exit functions Rosen Penev
2024-10-17 8:58 ` Simon Horman
2024-10-19 14:54 ` kernel test robot
2024-10-15 20:02 ` [PATCHv7 net-next 3/6] net: ibm: emac: use devm_platform_ioremap_resource Rosen Penev
2024-10-15 20:02 ` [PATCHv7 net-next 4/6] net: ibm: emac: use platform_get_irq Rosen Penev
2024-10-15 20:02 ` [PATCHv7 net-next 5/6] net: ibm: emac: use devm for mutex_init Rosen Penev
2024-10-17 8:58 ` Simon Horman
2024-10-15 20:02 ` Rosen Penev [this message]
2024-10-17 8:58 ` [PATCHv7 net-next 6/6] net: ibm: emac: generate random MAC if not found Simon Horman
2024-10-16 18:28 ` [PATCHv7 net-next 0/6] ibm: emac: more cleanups Rosen Penev
2024-10-16 18:38 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241015200222.12452-8-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=clement.leger@bootlin.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=george.mccollister@gmail.com \
--cc=horms@kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=kurt@linutronix.de \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=u.kleine-koenig@baylibre.com \
--cc=woojung.huh@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).