From patchwork Wed Sep 23 08:52:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 54027 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 0DBA822E14 for ; Wed, 23 Sep 2015 08:53:01 +0000 (UTC) Received: by lacao8 with SMTP id ao8sf8589672lac.3 for ; Wed, 23 Sep 2015 01:53:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=hj0g/FB9JxXMAFJTV5fhfEPqwM5C2/9JZ4GeJiB5jy8=; b=VpqrC8CnqX+6qKeY1Fw1qBIMPfA9Gfwbs1OjZ4uVNiHRqheGoj3BWXlPI/1lHg7zka lqdXmb1jMCPddSpinRQrQ8KmpYapUHqnlhNaRvvN6/Ihw0b91Dpu3XK0QhssGVp3Jbnn CbOiVMjoWWrm6eBI2YjZA6PNavWo3/isI01DWkOTnQAWODxjGVPABso0V6+k+qJE3sS1 tg2f8+CfylxoPIGHAM24XT2mxGur8Z3DnSRQk2GIH7LlCYU4c+xIY8G3ucR4MNC/eK11 c0nuoHfmDwcn2lhMvJpnSuCGdLwwhgYn2Z8VmvqJlT9/9hLcOtC32FsvXoI6wIhDCoRl LPAA== X-Gm-Message-State: ALoCoQkbgG2FKy2YB4CZUUH4feSOWxQESBwt96bTwcVIQbQ64eYbVgMLXYO4YgeiX8lDLvUs6Krv X-Received: by 10.180.210.71 with SMTP id ms7mr381793wic.4.1442998379984; Wed, 23 Sep 2015 01:52:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.199 with SMTP id a7ls26686lak.75.gmail; Wed, 23 Sep 2015 01:52:59 -0700 (PDT) X-Received: by 10.112.13.40 with SMTP id e8mr10960406lbc.82.1442998379792; Wed, 23 Sep 2015 01:52:59 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id a8si1372694lbc.107.2015.09.23.01.52.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Sep 2015 01:52:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lahh2 with SMTP id h2so17934791lah.0 for ; Wed, 23 Sep 2015 01:52:59 -0700 (PDT) X-Received: by 10.112.64.72 with SMTP id m8mr10817799lbs.41.1442998379479; Wed, 23 Sep 2015 01:52:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp959402lbq; Wed, 23 Sep 2015 01:52:58 -0700 (PDT) X-Received: by 10.66.228.71 with SMTP id sg7mr36917773pac.70.1442998378446; Wed, 23 Sep 2015 01:52:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id or4si8984585pbc.251.2015.09.23.01.52.57; Wed, 23 Sep 2015 01:52:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753990AbbIWIwy (ORCPT + 30 others); Wed, 23 Sep 2015 04:52:54 -0400 Received: from fw-tnat.cambridge.arm.com ([217.140.96.140]:58860 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753798AbbIWIww (ORCPT ); Wed, 23 Sep 2015 04:52:52 -0400 Received: from e106497-lin.cambridge.arm.com (e106497-lin.cambridge.arm.com [10.2.131.158]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id t8N8qiaY024648; Wed, 23 Sep 2015 09:52:44 +0100 From: Liviu Dudau To: Stephen Hemminger , Mirko Lindner , Florian Fainelli , Ryan Harkin , Sergei Shtylyov Cc: netdev , lkml Subject: [PATCH v3] sky2: use random address if EEPROM is bad Date: Wed, 23 Sep 2015 09:52:44 +0100 Message-Id: <1442998364-2399-1-git-send-email-Liviu.Dudau@arm.com> X-Mailer: git-send-email 2.5.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: liviu.dudau@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On some embedded systems the EEPROM does not contain a valid MAC address. In that case it is better to fallback to a generated mac address and let init scripts fix the value later. Reported-by: Liviu Dudau Signed-off-by: Stephen Hemminger [Changed handcoded setup to use eth_hw_addr_random() and to save new address into HW] Signed-off-by: Liviu Dudau --- drivers/net/ethernet/marvell/sky2.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index d9f4498..5606a04 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4819,6 +4819,18 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); + /* if the address is invalid, use a random value */ + if (!is_valid_ether_addr(dev->dev_addr)) { + struct sockaddr sa = { AF_UNSPEC }; + + netdev_warn(dev, + "Invalid MAC address, defaulting to random\n"); + eth_hw_addr_random(dev); + memcpy(sa.sa_data, dev->dev_addr, ETH_ALEN); + if (sky2_set_mac_address(dev, &sa)) + netdev_warn(dev, "Failed to set MAC address.\n"); + } + return dev; }