Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0197645b authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 



[ Upstream commit efb86fede98cdc70b674692ff617b1162f642c49 ]

The RGMII_MODE_EN bit value was 0 for GENET versions 1 through 3, and
became 6 for GENET v4 and above, account for that difference.

Fixes: aa09677c ("net: bcmgenet: add MDIO routines")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarDoug Berger <opendmb@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6303b51d

drivers/net/ethernet/broadcom/genet/bcmgenet.h

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ struct bcmgenet_mib_counters { 
#define  EXT_ENERGY_DET_MASK		(1 << 12)



#define EXT_RGMII_OOB_CTRL		0x0C

#define  RGMII_MODE_EN_V123		(1 << 0)

#define  RGMII_LINK			(1 << 4)

#define  OOB_DISABLE			(1 << 5)

#define  RGMII_MODE_EN			(1 << 6)

drivers/net/ethernet/broadcom/genet/bcmmii.c

+5 −1
Original line number Diff line number Diff line
@@ -328,7 +328,11 @@ int bcmgenet_mii_config(struct net_device *dev) 
	 */

	if (priv->ext_phy) {

		reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL);

		reg |= RGMII_MODE_EN | id_mode_dis;

		reg |= id_mode_dis;

		if (GENET_IS_V1(priv) || GENET_IS_V2(priv) || GENET_IS_V3(priv))

			reg |= RGMII_MODE_EN_V123;

		else

			reg |= RGMII_MODE_EN;

		bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);

	}