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

Commit 487320c5 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: bcmgenet: communicate integrated PHY revision to PHY driver 



The integrated BCM7xxx PHY contains no useful revision information in
its MII_PHYSID2 bits 3:0, that information is instead contained in the
GENET hardware block.

We already read the GENET 32-bit revision register, so store the
integrated PHY revision in the driver private structure, and then
communicate this revision value to the PHY driver by overriding the
phy_flags value.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80780a54

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

+7 −0
Original line number Diff line number Diff line
@@ -2432,6 +2432,13 @@ static void bcmgenet_set_hw_params(struct bcmgenet_priv *priv) 
	dev_info(&priv->pdev->dev, "GENET " GENET_VER_FMT,

		 major, (reg >> 16) & 0x0f, reg & 0xffff);



	/* Store the integrated PHY revision for the MDIO probing function

	 * to pass this information to the PHY driver. The PHY driver expects

	 * to find the PHY major revision in bits 15:8 while the GENET register

	 * stores that information in bits 7:0, account for that.

	 */

	priv->gphy_rev = (reg & 0xffff) << 8;



#ifdef CONFIG_PHYS_ADDR_T_64BIT

	if (!(params->flags & GENET_HAS_40BITS))

		pr_warn("GENET does not support 40-bits PA\n");

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

+1 −0
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ struct bcmgenet_priv { 
	struct phy_device *phydev;

	struct device_node *phy_dn;

	struct mii_bus *mii_bus;

	u16 gphy_rev;



	/* PHY device variables */

	int old_duplex;

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

+6 −2
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ static int bcmgenet_mii_probe(struct net_device *dev) 
	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct device_node *dn = priv->pdev->dev.of_node;

	struct phy_device *phydev;

	u32 phy_flags;

	int ret;



	if (priv->phydev) {
@@ -314,8 +315,11 @@ static int bcmgenet_mii_probe(struct net_device *dev) 
		priv->phy_dn = of_node_get(dn);

	}



	phydev = of_phy_connect(dev, priv->phy_dn, bcmgenet_mii_setup, 0,

				priv->phy_interface);

	/* Communicate the integrated PHY revision */

	phy_flags = priv->gphy_rev;



	phydev = of_phy_connect(dev, priv->phy_dn, bcmgenet_mii_setup,

				phy_flags, priv->phy_interface);

	if (!phydev) {

		pr_err("could not attach to PHY\n");

		return -ENODEV;