pasemi_mac: Print warning when not attaching to a PHY

pasemi_mac: Print warning when not attaching to a PHY

Print a warning on the console when not connecting to a phy for an interface.
It turns out to be a pretty common problem when someone gets the MDIO info
wrong in their device tree, resulting in the macs running at a fixed 1Gbit FD.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 07475bb7d8600a6f0320454a5a22e3b8791c8180..7345a81bb2c690a5b6e0db6585fbedc2c49ca68b 100644 (file)
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1064,11 +1064,12 @@ static int pasemi_mac_open(struct net_device *dev)
        write_mac_reg(mac, PAS_MAC_CFG_PCFG, flags);
 
        ret = pasemi_mac_phy_init(dev);
-       /* Some configs don't have PHYs (XAUI etc), so don't complain about
-        * failed init due to -ENODEV.
+       /* Warn for missing PHY on SGMII (1Gig) ports.
         */
-       if (ret && ret != -ENODEV)
-               dev_warn(&mac->pdev->dev, "phy init failed: %d\n", ret);
+       if (ret && mac->type == MAC_TYPE_GMAC) {
+               dev_warn(&mac->pdev->dev, "PHY init failed: %d.\n", ret);
+               dev_warn(&mac->pdev->dev, "Defaulting to 1Gbit full duplex\n");
+       }
 
        netif_start_queue(dev);
        napi_enable(&mac->napi);