From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7775EC2BA83 for ; Fri, 14 Feb 2020 16:08:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE7D422314 for ; Fri, 14 Feb 2020 16:08:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=goldelico.com header.i=@goldelico.com header.b="nuijQscJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390984AbgBNQIb (ORCPT ); Fri, 14 Feb 2020 11:08:31 -0500 Received: from mo4-p01-ob.smtp.rzone.de ([81.169.146.165]:10762 "EHLO mo4-p01-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390768AbgBNQHt (ORCPT ); Fri, 14 Feb 2020 11:07:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1581696467; s=strato-dkim-0002; d=goldelico.com; h=Message-Id:Date:Subject:Cc:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=QeKv3h6vRqJ4wCD4+A7gbij8dajmVYg9hOuzCvCzqmo=; b=nuijQscJhPn8JCg+cNCVkD3gDvPqs3lQTxvPAmAk/HBZkedfnBTtckAwF5XDylUt5p w+WQ/brEVOSKOYVNVzkThCcJ9Rrbqu/BrSEQwj6dePmJvpDDiTucXAkqUgWQppPrPcwC DlUolY0z4lg5xdibIM30BNbgkMaNXcQIaGIPaXfmQfc7kXtmBu+h2fAeunVaBVc4e1d4 G7ndPSVbGV2g/1Qcvj/yOZk77fZH9q7jZ9KnzTjHnku246EBZmwJ1NdmPhGWrsydNg0f CNNzamnDsEmaA/wiHWVBd51Ewlt/3nar96MZGzp1X65S6WbOfIWocGtOKNvhs4Cs0B+1 x32g== X-RZG-AUTH: ":JGIXVUS7cutRB/49FwqZ7WcJeFKiMhflhwDubTJ9o1OAA2UNf2M7OMfsfQx3" X-RZG-CLASS-ID: mo00 Received: from iMac.fritz.box by smtp.strato.de (RZmta 46.1.12 DYNA|AUTH) with ESMTPSA id U06217w1EG7ZFkL (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 14 Feb 2020 17:07:35 +0100 (CET) From: "H. Nikolaus Schaller" To: Andrew Lunn , Paul Cercueil , "David S. Miller" , =?UTF-8?q?Petr=20=C5=A0tetiar?= , Richard Fontana , Thomas Gleixner , Heiner Kallweit Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, letux-kernel@openphoenux.org, kernel@pyra-handheld.com, "H. Nikolaus Schaller" Subject: [PATCH v2] net: davicom: dm9000: allow to pass MAC address through mac_addr module parameter Date: Fri, 14 Feb 2020 17:07:35 +0100 Message-Id: <0d6b4d383bb29ed5d4710e9706e5ad6c7f92d9da.1581696454.git.hns@goldelico.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The MIPS Ingenic CI20 board is shipped with a quite old u-boot (ci20-v2013.10 see https://elinux.org/CI20_Dev_Zone). This passes the MAC address through dm9000.mac_addr=xx:xx:xx:xx:xx:xx kernel module parameter to give the board a fixed MAC address. This is not processed by the dm9000 driver which assigns a random MAC address on each boot, making DHCP assign a new IP address each time. So we add a check for the mac_addr module parameter as a last resort before assigning a random one. This mechanism can also be used outside of u-boot to provide a value through modprobe config. To parse the MAC address in a new function get_mac_addr() we use an copy adapted from the ksz884x.c driver which provides the same functionality. Signed-off-by: H. Nikolaus Schaller --- drivers/net/ethernet/davicom/dm9000.c | 42 +++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index 1ea3372775e6..7402030b0352 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c @@ -1409,6 +1409,43 @@ static struct dm9000_plat_data *dm9000_parse_dt(struct device *dev) return pdata; } +static char *mac_addr = ":"; +module_param(mac_addr, charp, 0); +MODULE_PARM_DESC(mac_addr, "MAC address"); + +static void get_mac_addr(struct net_device *ndev, char *macaddr) +{ + int i = 0; + int j = 0; + int got_num = 0; + int num = 0; + + while (j < ETH_ALEN) { + if (macaddr[i]) { + int digit; + + got_num = 1; + digit = hex_to_bin(macaddr[i]); + if (digit >= 0) + num = num * 16 + digit; + else if (':' == macaddr[i]) + got_num = 2; + else + break; + } else if (got_num) { + got_num = 2; + } else { + break; + } + if (got_num == 2) { + ndev->dev_addr[j++] = (u8)num; + num = 0; + got_num = 0; + } + i++; + } +} + /* * Search DM9000 board, allocate space and register it */ @@ -1679,6 +1716,11 @@ dm9000_probe(struct platform_device *pdev) ndev->dev_addr[i] = ior(db, i+DM9000_PAR); } + if (!is_valid_ether_addr(ndev->dev_addr)) { + mac_src = "param"; + get_mac_addr(ndev, mac_addr); + } + if (!is_valid_ether_addr(ndev->dev_addr)) { inv_mac_addr = true; eth_hw_addr_random(ndev); -- 2.23.0