netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: dsa: read mac address from DT for slave device
@ 2019-02-22 12:58 Vinod Koul
  2019-02-22 14:26 ` Andrew Lunn
  2019-02-22 15:43 ` Florian Fainelli
  0 siblings, 2 replies; 16+ messages in thread
From: Vinod Koul @ 2019-02-22 12:58 UTC (permalink / raw)
  To: David S. Miller
  Cc: linux-arm-msm, Bjorn Andersson, Xiaofei Shen, Andrew Lunn,
	Vivien Didelot, Florian Fainelli, Niklas Cassel, netdev,
	Vinod Koul

From: Xiaofei Shen <xiaofeis@codeaurora.org>

Before creating a slave netdevice, get the mac address from DTS and
apply in case it is valid.

Signed-off-by: Xiaofei Shen <xiaofeis@codeaurora.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
 include/net/dsa.h | 1 +
 net/dsa/dsa2.c    | 1 +
 net/dsa/slave.c   | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index b3eefe8e18fd..aa24ce756679 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -198,6 +198,7 @@ struct dsa_port {
 	unsigned int		index;
 	const char		*name;
 	const struct dsa_port	*cpu_dp;
+	const char		*mac;
 	struct device_node	*dn;
 	unsigned int		ageing_time;
 	u8			stp_state;
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index a1917025e155..afb7d9fa42f6 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -261,6 +261,7 @@ static int dsa_port_setup(struct dsa_port *dp)
 	int err = 0;
 
 	memset(&dp->devlink_port, 0, sizeof(dp->devlink_port));
+	dp->mac = of_get_mac_address(dp->dn);
 
 	if (dp->type != DSA_PORT_TYPE_UNUSED)
 		err = devlink_port_register(ds->devlink, &dp->devlink_port,
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index a3fcc1d01615..8e64c4e947c6 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1308,7 +1308,10 @@ int dsa_slave_create(struct dsa_port *port)
 	slave_dev->features = master->vlan_features | NETIF_F_HW_TC;
 	slave_dev->hw_features |= NETIF_F_HW_TC;
 	slave_dev->ethtool_ops = &dsa_slave_ethtool_ops;
-	eth_hw_addr_inherit(slave_dev, master);
+	if (port->mac && is_valid_ether_addr(port->mac))
+		ether_addr_copy(slave_dev->dev_addr, port->mac);
+	else
+		eth_hw_addr_inherit(slave_dev, master);
 	slave_dev->priv_flags |= IFF_NO_QUEUE;
 	slave_dev->netdev_ops = &dsa_slave_netdev_ops;
 	slave_dev->switchdev_ops = &dsa_slave_switchdev_ops;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2019-03-27  3:56 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-22 12:58 [PATCH] net: dsa: read mac address from DT for slave device Vinod Koul
2019-02-22 14:26 ` Andrew Lunn
2019-03-04  3:46   ` xiaofeis
2019-03-04  7:31     ` Vinod Koul
2019-03-04 13:18     ` Andrew Lunn
2019-02-22 15:43 ` Florian Fainelli
2019-02-25 13:28   ` xiaofeis
2019-02-25 17:27     ` Florian Fainelli
2019-02-26  7:45       ` xiaofeis
2019-02-27  2:04         ` xiaofeis
2019-02-27  3:13           ` Florian Fainelli
2019-02-28  2:23             ` xiaofeis
2019-02-28  3:54               ` Florian Fainelli
2019-03-04  3:48                 ` xiaofeis
2019-03-27  3:56                 ` xiaofeis
2019-02-27  6:57           ` xiaofeis

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).