From: Jakub Kicinski <kuba@kernel•org>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, rafael@kernel•org, saravanak@google•com,
mw@semihalf•com, andrew@lunn•ch, jeremy.linton@arm•com,
hkallweit1@gmail•com, linux@armlinux•org.uk, robh+dt@kernel•org,
frowand.list@gmail•com, heikki.krogerus@linux•intel.com,
devicetree@vger•kernel.org, snelson@pensando•io,
Jakub Kicinski <kuba@kernel•org>
Subject: [PATCH net-next v3 2/9] of: net: add a helper for loading netdev->dev_addr
Date: Wed, 6 Oct 2021 18:06:55 -0700 [thread overview]
Message-ID: <20211007010702.3438216-3-kuba@kernel.org> (raw)
In-Reply-To: <20211007010702.3438216-1-kuba@kernel.org>
Commit 406f42fa0d3c ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.
There are roughly 40 places where netdev->dev_addr is passed
as the destination to a of_get_mac_address() call. Add a helper
which takes a dev pointer instead, so it can call an appropriate
helper.
Note that of_get_mac_address() already assumes the address is
6 bytes long (ETH_ALEN) so use eth_hw_addr_set().
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
include/linux/of_net.h | 6 ++++++
net/core/of_net.c | 25 +++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/include/linux/of_net.h b/include/linux/of_net.h
index cf31188329b5..0797e2edb8c2 100644
--- a/include/linux/of_net.h
+++ b/include/linux/of_net.h
@@ -14,6 +14,7 @@
struct net_device;
extern int of_get_phy_mode(struct device_node *np, phy_interface_t *interface);
extern int of_get_mac_address(struct device_node *np, u8 *mac);
+int of_get_ethdev_address(struct device_node *np, struct net_device *dev);
extern struct net_device *of_find_net_device_by_node(struct device_node *np);
#else
static inline int of_get_phy_mode(struct device_node *np,
@@ -27,6 +28,11 @@ static inline int of_get_mac_address(struct device_node *np, u8 *mac)
return -ENODEV;
}
+static inline int of_get_ethdev_address(struct device_node *np, struct net_device *dev)
+{
+ return -ENODEV;
+}
+
static inline struct net_device *of_find_net_device_by_node(struct device_node *np)
{
return NULL;
diff --git a/net/core/of_net.c b/net/core/of_net.c
index dbac3a172a11..f1a9bf7578e7 100644
--- a/net/core/of_net.c
+++ b/net/core/of_net.c
@@ -143,3 +143,28 @@ int of_get_mac_address(struct device_node *np, u8 *addr)
return of_get_mac_addr_nvmem(np, addr);
}
EXPORT_SYMBOL(of_get_mac_address);
+
+/**
+ * of_get_ethdev_address()
+ * @np: Caller's Device Node
+ * @dev: Pointer to netdevice which address will be updated
+ *
+ * Search the device tree for the best MAC address to use.
+ * If found set @dev->dev_addr to that address.
+ *
+ * See documentation of of_get_mac_address() for more information on how
+ * the best address is determined.
+ *
+ * Return: 0 on success and errno in case of error.
+ */
+int of_get_ethdev_address(struct device_node *np, struct net_device *dev)
+{
+ u8 addr[ETH_ALEN];
+ int ret;
+
+ ret = of_get_mac_address(np, addr);
+ if (!ret)
+ eth_hw_addr_set(dev, addr);
+ return ret;
+}
+EXPORT_SYMBOL(of_get_ethdev_address);
--
2.31.1
next prev parent reply other threads:[~2021-10-07 1:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 1:06 [PATCH net-next v3 0/9] net: add a helpers for loading netdev->dev_addr from FW Jakub Kicinski
2021-10-07 1:06 ` [PATCH net-next v3 1/9] of: net: move of_net under net/ Jakub Kicinski
2021-10-07 12:12 ` Rob Herring
2021-10-07 1:06 ` Jakub Kicinski [this message]
2021-10-07 1:06 ` [PATCH net-next v3 3/9] ethernet: use of_get_ethdev_address() Jakub Kicinski
2021-10-07 1:06 ` [PATCH net-next v3 4/9] device property: move mac addr helpers to eth.c Jakub Kicinski
2021-10-07 10:20 ` Heikki Krogerus
2021-10-07 1:06 ` [PATCH net-next v3 5/9] eth: fwnode: change the return type of mac address helpers Jakub Kicinski
2021-10-07 1:06 ` [PATCH net-next v3 6/9] eth: fwnode: remove the addr len from mac helpers Jakub Kicinski
2021-10-07 1:07 ` [PATCH net-next v3 7/9] eth: fwnode: add a helper for loading netdev->dev_addr Jakub Kicinski
2021-10-07 1:07 ` [PATCH net-next v3 8/9] ethernet: use device_get_ethdev_address() Jakub Kicinski
2021-10-07 1:07 ` [PATCH net-next v3 9/9] ethernet: make more use of device_get_ethdev_address() Jakub Kicinski
2021-10-07 13:00 ` [PATCH net-next v3 0/9] net: add a helpers for loading netdev->dev_addr from FW patchwork-bot+netdevbpf
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=20211007010702.3438216-3-kuba@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=frowand.list@gmail$(echo .)com \
--cc=heikki.krogerus@linux$(echo .)intel.com \
--cc=hkallweit1@gmail$(echo .)com \
--cc=jeremy.linton@arm$(echo .)com \
--cc=linux@armlinux$(echo .)org.uk \
--cc=mw@semihalf$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rafael@kernel$(echo .)org \
--cc=robh+dt@kernel$(echo .)org \
--cc=saravanak@google$(echo .)com \
--cc=snelson@pensando$(echo .)io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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