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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 C765FCA9EBC for ; Sun, 27 Oct 2019 21:14:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94C9321D7F for ; Sun, 27 Oct 2019 21:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210849; bh=z8GcRZ6nSiym5ndWhZ57ueF4ag98Yr2/cWaiFap1wnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Uzuek9Z9yNfHGWhcNGCmrJ/TDcPbpTeLbEK4a60tYMa61x2cky4x673eyzDc5WB93 xkbcaI6G3siBE6/xPSImWMbtDDH8+Z4C3FBiEPkP70M9PS6lpRQNb3N2aNdXl/YnNt rD2P1qFrwiEimvhS31+Ok4ysxaX2UuP9PPTvTeoc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730397AbfJ0VOI (ORCPT ); Sun, 27 Oct 2019 17:14:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:32964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730381AbfJ0VOE (ORCPT ); Sun, 27 Oct 2019 17:14:04 -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 109172064A; Sun, 27 Oct 2019 21:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210843; bh=z8GcRZ6nSiym5ndWhZ57ueF4ag98Yr2/cWaiFap1wnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KQRfZxqmnJMwMOELrPNQPcBaiYQPYkcDvprC09beoiBv6C777l4IL62+Ehbedxce2 z8yp36BwdPRmP7nJxwY5ZSUlFpKQ/AB4S81JIa3IDP4CRTTBBEmKrEvtGOHRVzIb9d 1fQe4nZ5yHVst1qZe+jnxI+WJTEoPDvLj8CLUanI= 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 4.19 29/93] net: bcmgenet: Set phydev->dev_flags only for internal PHYs Date: Sun, 27 Oct 2019 22:00:41 +0100 Message-Id: <20191027203257.011039549@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203251.029297948@linuxfoundation.org> References: <20191027203251.029297948@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 @@ -280,11 +280,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;