netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RESEND][PATCH] net: cpsw: fix obtaining mac address for am3517
@ 2023-06-24 12:10 Mans Rullgard
  2023-06-24 14:17 ` Andrew Lunn
  0 siblings, 1 reply; 6+ messages in thread
From: Mans Rullgard @ 2023-06-24 12:10 UTC (permalink / raw)
  To: Grygorii Strashko, David S. Miller, Eric Dumazet, Jakub Kicinski,
	Paolo Abeni, linux-omap, netdev, linux-kernel
  Cc: Jeroen Hofstee, Tony Lindgren

From: Jeroen Hofstee <jhofstee@victronenergy.com>

Commit b6745f6e4e63 ("drivers: net: cpsw: davinci_emac: move reading mac
id to common file") did not only move the code for an am3517, it also
added the slave parameter, resulting in an invalid (all zero) mac address
being returned for an am3517, since it only has a single emac and the slave
parameter is pointing to the second. So simply always read the first and
valid mac-address.

Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Acked-by: Tony Lindgren <tony@atomide.com>
---
 drivers/net/ethernet/ti/cpsw-common.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ti/cpsw-common.c b/drivers/net/ethernet/ti/cpsw-common.c
index bfa81bbfce3f..465dc15f059d 100644
--- a/drivers/net/ethernet/ti/cpsw-common.c
+++ b/drivers/net/ethernet/ti/cpsw-common.c
@@ -74,8 +74,12 @@ int ti_cm_get_macid(struct device *dev, int slave, u8 *mac_addr)
 	if (of_machine_is_compatible("ti,am33xx"))
 		return cpsw_am33xx_cm_get_macid(dev, 0x630, slave, mac_addr);
 
+	/*
+	 * There is only one emac / mac address on an am3517 so ignore the
+	 * slave = 1 and always get the macid from slave 0.
+	 */
 	if (of_device_is_compatible(dev->of_node, "ti,am3517-emac"))
-		return davinci_emac_3517_get_macid(dev, 0x110, slave, mac_addr);
+		return davinci_emac_3517_get_macid(dev, 0x110, 0, mac_addr);
 
 	if (of_device_is_compatible(dev->of_node, "ti,dm816-emac"))
 		return cpsw_am33xx_cm_get_macid(dev, 0x30, slave, mac_addr);
-- 
2.41.0


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

end of thread, other threads:[~2023-06-30  7:22 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-24 12:10 [RESEND][PATCH] net: cpsw: fix obtaining mac address for am3517 Mans Rullgard
2023-06-24 14:17 ` Andrew Lunn
2023-06-24 14:24   ` Måns Rullgård
2023-06-24 14:33     ` Andrew Lunn
2023-06-24 14:36       ` Måns Rullgård
2023-06-30  7:22         ` Tony Lindgren

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