From patchwork Tue Apr 30 11:38:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 163109 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3125954ill; Tue, 30 Apr 2019 04:57:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKP7zFBj94TdQZX14rL7+dvMPRif4cob1KK2r2oLSZGCalYcWfn5nybQ46xDZClMmW5tCU X-Received: by 2002:a62:e411:: with SMTP id r17mr24827286pfh.127.1556625468824; Tue, 30 Apr 2019 04:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556625468; cv=none; d=google.com; s=arc-20160816; b=qobIYepxB7aKNSzFjiBvcb7F92p0NfU33yatmmLPBHaGg8aUrA2P7loJvLiQ21Gmiv MucY/QWOA3IbSmW/jG1Yh4cpUaL90xWfH7w4jMLD+Lkg1XIPTbPrsLuKdDspzI0zx5Wi b94Z9uoRd9uCZ7NOc0DoNAYAz0xSdvfwwER1+MrYtW5NBaEBDIbC9LK3RIKznm/DNRhN R+uSB9Oq91uJRfginpCemnUq3YZRwDRELp/qdrvTegUsUwFUcR8/7oKz72ipGO1rVEsR e3ANYyWx4Hx2/8sCpdROehQqLkud3vsjcSIRnNYaN/lDEqmL2PVNkcjT9fSefITVKrhK AhVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YOxpg7eNCu4SuWyCVOm2rKnkseQBxboeighkCRh218U=; b=xxhWeK6BaXbBsemow8ltUC1drQvmaqE0inzDSw/Fm2TleeHbGJgUIBprwxBzEAkrHv wbJPjU8el5Vcj/mgcvUmdBE58Y6QdE5a8tLk+iBPdC95eYebx4FV39p3iss9OzZug/Tv ZyCSu6UvkdJntSAcQrdveXLFhobVdRV0fb8emvXr2J8TY5eL6GYGgxftdxpP4YyyBFt0 dW6bRFwDpLOtYD5wfGbFbD84PHbkXmdY2ubnuAAwArZg9gvsFhNWAym4B3qWB85dAoJP PXOU4C84uPRVQIscOfb7yOr04czQ/vUUlIFbzQNg+bbkyLH32urMqYj+pOH8tu+tmmyb 1xEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AWCGOzof; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p185si17651859pgp.566.2019.04.30.04.57.48; Tue, 30 Apr 2019 04:57:48 -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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AWCGOzof; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727762AbfD3L5r (ORCPT + 30 others); Tue, 30 Apr 2019 07:57:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:33422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728453AbfD3Lrq (ORCPT ); Tue, 30 Apr 2019 07:47:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B62BE2054F; Tue, 30 Apr 2019 11:47:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624865; bh=24vZY+O6/y4ek2Var+3vq0gwG+F89pdG9TfVxl0hlnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AWCGOzofspvmEYZgpBK4LbW1WNNUKn/nNg8ZdjYM5b9R6mTsE6LSIOwNXDbZJtM65 zsVe4oNkxm55hfKpHp6ZwRM0UkNlqLo/+F/dMNkcJP/wFBOMo5S2pLLjh/r860keM7 BpfpDtG/pUUtXApQTgA3jrOIDlmSknHBKrva649c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaofei Shen , Sneh Shah , Vinod Koul , Andrew Lunn , "David S. Miller" Subject: [PATCH 4.19 090/100] net: stmmac: move stmmac_check_ether_addr() to driver probe Date: Tue, 30 Apr 2019 13:38:59 +0200 Message-Id: <20190430113613.062637557@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113608.616903219@linuxfoundation.org> References: <20190430113608.616903219@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vinod Koul [ Upstream commit b561af36b1841088552464cdc3f6371d92f17710 ] stmmac_check_ether_addr() checks the MAC address and assigns one in driver open(). In many cases when we create slave netdevice, the dev addr is inherited from master but the master dev addr maybe NULL at that time, so move this call to driver probe so that address is always valid. Signed-off-by: Xiaofei Shen Tested-by: Xiaofei Shen Signed-off-by: Sneh Shah Signed-off-by: Vinod Koul Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2595,8 +2595,6 @@ static int stmmac_open(struct net_device u32 chan; int ret; - stmmac_check_ether_addr(priv); - if (priv->hw->pcs != STMMAC_PCS_RGMII && priv->hw->pcs != STMMAC_PCS_TBI && priv->hw->pcs != STMMAC_PCS_RTBI) { @@ -4296,6 +4294,8 @@ int stmmac_dvr_probe(struct device *devi if (ret) goto error_hw_init; + stmmac_check_ether_addr(priv); + /* Configure real RX and TX queues */ netif_set_real_num_rx_queues(ndev, priv->plat->rx_queues_to_use); netif_set_real_num_tx_queues(ndev, priv->plat->tx_queues_to_use);