net: bgmac: enable master mode for BCM54210E and B50212E PHYs

There are 4 very similar PHYs:
0x600d84a1: BCM54210E (rev B0)
0x600d84a2: BCM54210E (rev B1)
0x600d84a5: B50212E (rev B0)
0x600d84a6: B50212E (rev B1)
that need setting master mode manually. It's because they run in slave
mode by default with Automatic Slave/Master configuration disabled which
can lead to unreliable connection with massive ping loss.

So far it was reported for a board with BCM47189 SoC and B50212E B1 PHY
connected to the bgmac supported ethernet device. Telling PHY driver to
setup PHY properly solves this issue.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bgmac-bcma.c b/drivers/net/ethernet/broadcom/bgmac-bcma.c
index 6322594ab2600ac100a63140c9420855f07c86dc..6fe074c1588bb7c4568be9ace93cd5f754bab33a 100644 (file)
--- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
@@ -184,13 +184,19 @@ static int bgmac_probe(struct bcma_device *core)
 
        if (!bgmac_is_bcm4707_family(core) &&
            !(ci->id == BCMA_CHIP_ID_BCM53573 && core->core_unit == 1)) {
+               struct phy_device *phydev;
+
                mii_bus = bcma_mdio_mii_register(bgmac);
                if (IS_ERR(mii_bus)) {
                        err = PTR_ERR(mii_bus);
                        goto err;
                }
-
                bgmac->mii_bus = mii_bus;
+
+               phydev = mdiobus_get_phy(bgmac->mii_bus, bgmac->phyaddr);
+               if (ci->id == BCMA_CHIP_ID_BCM53573 && phydev &&
+                   (phydev->drv->phy_id & phydev->drv->phy_id_mask) == PHY_ID_BCM54210E)
+                       phydev->dev_flags |= PHY_BRCM_EN_MASTER_MODE;
        }
 
        if (core->bus->hosttype == BCMA_HOSTTYPE_PCI) {