From patchwork Fri Apr 18 00:17:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Max Schwarz X-Patchwork-Id: 340203 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F0FD614009E for ; Fri, 18 Apr 2014 10:18:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751217AbaDRARo (ORCPT ); Thu, 17 Apr 2014 20:17:44 -0400 Received: from moutng.kundenserver.de ([212.227.17.13]:53809 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750944AbaDRARn convert rfc822-to-8bit (ORCPT ); Thu, 17 Apr 2014 20:17:43 -0400 Received: from typ.localnet (xdsl-89-0-94-55.netcologne.de [89.0.94.55]) by mrelayeu.kundenserver.de (node=mreue104) with ESMTP (Nemesis) id 0LeM6H-1XIDng1xWP-00qBey; Fri, 18 Apr 2014 02:17:37 +0200 From: Max Schwarz To: "David S. Miller" Cc: Alexey Brodkin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Heiko Stuebner Subject: [PATCH] arc_emac: write initial MAC address from devicetree to hw Date: Fri, 18 Apr 2014 02:17:32 +0200 Message-ID: <1664530.jeK9vBIgft@typ> User-Agent: KMail/4.11.5 (Linux/3.11.0-19-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:aYtv/ZR5JdEVLIoo/HBdfyDDC9FNJvCuHmTyeCGlqy5 B+ITEpF+tJ6pP3xuqKuaAEWX8qTIBGJ07/gEoX/6ZLQBB4Meia K39dNtVW8E3RjeYmcJEnTb630exMe+heTgyf65QYL7PQhfMNMf dUHE/U8aGdAXmI3gxrIVdUKaRvGMc7YcQPTzE7nMV/QlCUJMkw 8WuroWfKNxUm134a89S0roblDYicETILmmuA8ctIQ5kZLlcA2a jkvAoeeBWuB2ITBlVUzY8mzUPzR+7UQGYv312l6EKFrUggxa/S 1jdiYp6lGCKMc41IrG+43uYRKsF3OF9xQL9DeQcglk1Lqx9fA= = Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The MAC address retrieved from dt was not actually written to the hardware. This meant proper communication was only possible after changing the MAC address. Fix that by always writing the mac address during probing. Signed-off-by: Max Schwarz Acked-by: Heiko Stuebner Tested-by: Heiko Stuebner --- I recently noticed this problem on the Radxa Rock board. I'm not sure how this has ever worked on other platforms, though. I can only receive broadcast packets without configuring the address. Running ifconfig eth0 hw ether XYZ or applying the patch fixes the problem for me. CCing Heiko Stübner because he has seen the problem as well. drivers/net/ethernet/arc/emac_main.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c index eeecc29..9f45782 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -574,6 +574,18 @@ static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) return NETDEV_TX_OK; } +static void arc_emac_set_address_internal(struct net_device *ndev) +{ + struct arc_emac_priv *priv = netdev_priv(ndev); + unsigned int addr_low, addr_hi; + + addr_low = le32_to_cpu(*(__le32 *) &ndev->dev_addr[0]); + addr_hi = le16_to_cpu(*(__le16 *) &ndev->dev_addr[4]); + + arc_reg_set(priv, R_ADDRL, addr_low); + arc_reg_set(priv, R_ADDRH, addr_hi); +} + /** * arc_emac_set_address - Set the MAC address for this device. * @ndev: Pointer to net_device structure. @@ -587,9 +599,7 @@ static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) */ static int arc_emac_set_address(struct net_device *ndev, void *p) { - struct arc_emac_priv *priv = netdev_priv(ndev); struct sockaddr *addr = p; - unsigned int addr_low, addr_hi; if (netif_running(ndev)) return -EBUSY; @@ -599,11 +609,7 @@ static int arc_emac_set_address(struct net_device *ndev, void *p) memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len); - addr_low = le32_to_cpu(*(__le32 *) &ndev->dev_addr[0]); - addr_hi = le16_to_cpu(*(__le16 *) &ndev->dev_addr[4]); - - arc_reg_set(priv, R_ADDRL, addr_low); - arc_reg_set(priv, R_ADDRH, addr_hi); + arc_emac_set_address_internal(ndev); return 0; } @@ -713,6 +719,7 @@ static int arc_emac_probe(struct platform_device *pdev) else eth_hw_addr_random(ndev); + arc_emac_set_address_internal(ndev); dev_info(&pdev->dev, "MAC address is now %pM\n", ndev->dev_addr); /* Do 1 allocation instead of 2 separate ones for Rx and Tx BD rings */