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 7/9] eth: fwnode: add a helper for loading netdev->dev_addr
Date: Wed, 6 Oct 2021 18:07:00 -0700 [thread overview]
Message-ID: <20211007010702.3438216-8-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 is a handful of drivers which pass netdev->dev_addr as
the destination buffer to device_get_mac_address(). Add a helper
which takes a dev pointer instead, so it can call an appropriate
helper.
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
v2: spell out address instead of addr in the function name
v3: fix function name in kdoc
---
include/linux/etherdevice.h | 1 +
include/linux/property.h | 1 +
net/ethernet/eth.c | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+)
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 32c30d0f7a73..e75116f48cd1 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -32,6 +32,7 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr);
unsigned char *arch_get_platform_mac_address(void);
int nvmem_get_mac_address(struct device *dev, void *addrbuf);
int device_get_mac_address(struct device *dev, char *addr);
+int device_get_ethdev_address(struct device *dev, struct net_device *netdev);
int fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr);
u32 eth_get_headlen(const struct net_device *dev, const void *data, u32 len);
diff --git a/include/linux/property.h b/include/linux/property.h
index 4fb081684255..88fa726a76df 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -15,6 +15,7 @@
#include <linux/types.h>
struct device;
+struct net_device;
enum dev_prop_type {
DEV_PROP_U8,
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 29447a61d3ec..d7b8fa10fabb 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -617,3 +617,23 @@ int device_get_mac_address(struct device *dev, char *addr)
return fwnode_get_mac_address(dev_fwnode(dev), addr);
}
EXPORT_SYMBOL(device_get_mac_address);
+
+/**
+ * device_get_ethdev_address - Set netdev's MAC address from a given device
+ * @dev: Pointer to the device
+ * @netdev: Pointer to netdev to write the address to
+ *
+ * Wrapper around device_get_mac_address() which writes the address
+ * directly to netdev->dev_addr.
+ */
+int device_get_ethdev_address(struct device *dev, struct net_device *netdev)
+{
+ u8 addr[ETH_ALEN];
+ int ret;
+
+ ret = device_get_mac_address(dev, addr);
+ if (!ret)
+ eth_hw_addr_set(netdev, addr);
+ return ret;
+}
+EXPORT_SYMBOL(device_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 ` [PATCH net-next v3 2/9] of: net: add a helper for loading netdev->dev_addr Jakub Kicinski
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 ` Jakub Kicinski [this message]
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-8-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