Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2744859ybg; Mon, 28 Oct 2019 01:28:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxRScVcanWTgvKMJnn5fH7+OEkySc5hwVYNzE491SEZOAxUt6CbwmWJOpcJcYQs1EhxfKM X-Received: by 2002:aa7:cd01:: with SMTP id b1mr18221987edw.122.1572251305158; Mon, 28 Oct 2019 01:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572251305; cv=none; d=google.com; s=arc-20160816; b=ZfMS6cBa3RBMPjEL+1U2n99Vxm+LJm9Dlcv4W8c9wP3QAi9pzT9jK/Tnhzjcw2+eoE sPb3Z4WhIOXqCOOZgYmJGM9RbewnEpGO/ZTeMW0n/SaGQtPkVh4Tiv2fEmoFIOjkj2hd 3NyEVxDsyhpXTIAsTomYB2hA5o9tGOtdlmZ9JAxeGB2YsOhpBR7YVqGn0gQlOOHVcGRw gYwL7YFih3600E6KhI8YTD+gJMdU1NLVfMhoWkdxYbbxTsW5JEXZ6bCOVcgW9KCAja4g jzbqGRdILo9d+LcP7he/zN27nQ+lrCfKfpSzm8zAvjVWsSRsH8yqCbYd/q7dCxbmMMt0 l2Gg== 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=8lUuV02nWXKiZsG3Rwvr7YzI/fNwXXMp/oBpEpDWdBg=; b=DM8Maf2g00z91ivrBmNJDFGu0dJrw68bIIDZuagnRgRIPQS09GEj1l1IAPOFHqLhL7 3JzdUDkLSuPNphNbxYQr3QIsnlS4trYTz3m7lsLnAFPoQqeaOVaIaXPxgSPaS7/R1N9D FZ4L8WY8rKnKa85R7+7cG4971hM1hL9L3Pyl90N/AD8S2CVSBL8CfcaQboAaEA2n79uE ecP3U7SloHFLS+rMdNvxvGek4EKMsqez0QEs9ex6SXZhwsKSu5e6NsSeITIzGpn5J4sB CBDwv/pFP8gbGX+FF/9rNveBfd2T1Xvau9ou3OoQoQzanzfS0v+8zQNds0K44NwFuJzE LH4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pSuEGDfv; 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 e15si6005019eda.106.2019.10.28.01.28.02; Mon, 28 Oct 2019 01:28:25 -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=pSuEGDfv; 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 S1731683AbfJ0VUX (ORCPT + 99 others); Sun, 27 Oct 2019 17:20:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:40872 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731656AbfJ0VUU (ORCPT ); Sun, 27 Oct 2019 17:20:20 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 5C816205C9; Sun, 27 Oct 2019 21:20:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211220; bh=rh7W5OPq+XnPn7mFp/vhye5vyY2W7CQUPc9AMpzsR38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pSuEGDfvrsK9ZGZaCta3DOmDKTOeSrOrKZuhlfnPag+c0w0LpegQaNIdOBghaSwCQ 66sppe6g2kiwOJC4E7sT+xTnUJxK0JoP4xVlGyAL3ylAZ/GWFoA/9UQKrbrxOSCJim hq1NItoEeRJbi2f8wOfUpD7UV85vmGUzKHgmfCas= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , Doug Berger , "David S. Miller" Subject: [PATCH 5.3 073/197] net: bcmgenet: Set phydev->dev_flags only for internal PHYs Date: Sun, 27 Oct 2019 21:59:51 +0100 Message-Id: <20191027203355.585233888@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Fainelli [ Upstream commit 92696286f3bb37ba50e4bd8d1beb24afb759a799 ] phydev->dev_flags is entirely dependent on the PHY device driver which is going to be used, setting the internal GENET PHY revision in those bits only makes sense when drivers/net/phy/bcm7xxx.c is the PHY driver being used. Fixes: 487320c54143 ("net: bcmgenet: communicate integrated PHY revision to PHY driver") Signed-off-by: Florian Fainelli Acked-by: Doug Berger Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/genet/bcmmii.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -277,11 +277,12 @@ int bcmgenet_mii_probe(struct net_device struct bcmgenet_priv *priv = netdev_priv(dev); struct device_node *dn = priv->pdev->dev.of_node; struct phy_device *phydev; - u32 phy_flags; + u32 phy_flags = 0; int ret; /* Communicate the integrated PHY revision */ - phy_flags = priv->gphy_rev; + if (priv->internal_phy) + phy_flags = priv->gphy_rev; /* Initialize link state variables that bcmgenet_mii_setup() uses */ priv->old_link = -1;