Merge branch 'stmmac-misc'

Corentin Labbe says:

====================
stmmac: misc patchs

This is a follow up of my previous stmmac serie which address some comment
done in v2.
====================

Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 71 insertions, 69 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index aab895d9257e..5ff6bc4eb8f1 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -442,24 +442,24 @@ static void stmmac_ethtool_gregs(struct net_device *dev,
 
         memset(reg_space, 0x0, REG_SPACE_SIZE);
 
-        if (!(priv->plat->has_gmac || priv->plat->has_gmac4)) {
+        if (priv->plat->has_gmac || priv->plat->has_gmac4) {
                 /* MAC registers */
-                for (i = 0; i < 12; i++)
+                for (i = 0; i < 55; i++)
                         reg_space[i] = readl(priv->ioaddr + (i * 4));
                 /* DMA registers */
-                for (i = 0; i < 9; i++)
-                        reg_space[i + 12] =
+                for (i = 0; i < 22; i++)
+                        reg_space[i + 55] =
                             readl(priv->ioaddr + (DMA_BUS_MODE + (i * 4)));
-                reg_space[22] = readl(priv->ioaddr + DMA_CUR_TX_BUF_ADDR);
-                reg_space[23] = readl(priv->ioaddr + DMA_CUR_RX_BUF_ADDR);
         } else {
                 /* MAC registers */
-                for (i = 0; i < 55; i++)
+                for (i = 0; i < 12; i++)
                         reg_space[i] = readl(priv->ioaddr + (i * 4));
                 /* DMA registers */
-                for (i = 0; i < 22; i++)
-                        reg_space[i + 55] =
+                for (i = 0; i < 9; i++)
+                        reg_space[i + 12] =
                             readl(priv->ioaddr + (DMA_BUS_MODE + (i * 4)));
+                reg_space[22] = readl(priv->ioaddr + DMA_CUR_TX_BUF_ADDR);
+                reg_space[23] = readl(priv->ioaddr + DMA_CUR_RX_BUF_ADDR);
         }
 }
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 7251871eaa32..3cbe09682afe 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -716,32 +716,36 @@ static void stmmac_adjust_link(struct net_device *dev)
                         new_state = 1;
                         switch (phydev->speed) {
                         case 1000:
-                                if (likely((priv->plat->has_gmac) ||
-                                           (priv->plat->has_gmac4)))
+                                if (priv->plat->has_gmac ||
+                                    priv->plat->has_gmac4)
                                         ctrl &= ~priv->hw->link.port;
-                                stmmac_hw_fix_mac_speed(priv);
                                 break;
                         case 100:
+                                if (priv->plat->has_gmac ||
+                                    priv->plat->has_gmac4) {
+                                        ctrl |= priv->hw->link.port;
+                                        ctrl |= priv->hw->link.speed;
+                                } else {
+                                        ctrl &= ~priv->hw->link.port;
+                                }
+                                break;
                         case 10:
-                                if (likely((priv->plat->has_gmac) ||
-                                           (priv->plat->has_gmac4))) {
+                                if (priv->plat->has_gmac ||
+                                    priv->plat->has_gmac4) {
                                         ctrl |= priv->hw->link.port;
-                                        if (phydev->speed == SPEED_100) {
-                                                ctrl |= priv->hw->link.speed;
-                                        } else {
-                                                ctrl &= ~(priv->hw->link.speed);
-                                        }
+                                        ctrl &= ~(priv->hw->link.speed);
                                 } else {
                                         ctrl &= ~priv->hw->link.port;
                                 }
-                                stmmac_hw_fix_mac_speed(priv);
                                 break;
                         default:
                                 netif_warn(priv, link, priv->dev,
                                            "broken speed: %d\n", phydev->speed);
+                                phydev->speed = SPEED_UNKNOWN;
                                 break;
                         }
-
+                        if (phydev->speed != SPEED_UNKNOWN)
+                                stmmac_hw_fix_mac_speed(priv);
                         priv->speed = phydev->speed;
                 }
 
@@ -754,8 +758,8 @@ static void stmmac_adjust_link(struct net_device *dev)
         } else if (priv->oldlink) {
                 new_state = 1;
                 priv->oldlink = 0;
-                priv->speed = 0;
-                priv->oldduplex = -1;
+                priv->speed = SPEED_UNKNOWN;
+                priv->oldduplex = DUPLEX_UNKNOWN;
         }
 
         if (new_state && netif_msg_link(priv))
@@ -817,8 +821,8 @@ static int stmmac_init_phy(struct net_device *dev)
         int interface = priv->plat->interface;
         int max_speed = priv->plat->max_speed;
         priv->oldlink = 0;
-        priv->speed = 0;
-        priv->oldduplex = -1;
+        priv->speed = SPEED_UNKNOWN;
+        priv->oldduplex = DUPLEX_UNKNOWN;
 
         if (priv->plat->phy_node) {
                 phydev = of_phy_connect(dev, priv->plat->phy_node,
@@ -3434,8 +3438,8 @@ int stmmac_suspend(struct device *dev)
         spin_unlock_irqrestore(&priv->lock, flags);
 
         priv->oldlink = 0;
-        priv->speed = 0;
-        priv->oldduplex = -1;
+        priv->speed = SPEED_UNKNOWN;
+        priv->oldduplex = DUPLEX_UNKNOWN;
         return 0;
 }
 EXPORT_SYMBOL_GPL(stmmac_suspend);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index d9893cf05695..db157a47000c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -247,50 +247,48 @@ int stmmac_mdio_register(struct net_device *ndev)
         found = 0;
         for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
                 struct phy_device *phydev = mdiobus_get_phy(new_bus, addr);
+                int act = 0;
+                char irq_num[4];
+                char *irq_str;
+
+                if (!phydev)
+                        continue;
+
+                /*
+                 * If an IRQ was provided to be assigned after
+                 * the bus probe, do it here.
+                 */
+                if (!mdio_bus_data->irqs &&
+                    (mdio_bus_data->probed_phy_irq > 0)) {
+                        new_bus->irq[addr] = mdio_bus_data->probed_phy_irq;
+                        phydev->irq = mdio_bus_data->probed_phy_irq;
+                }
 
-                if (phydev) {
-                        int act = 0;
-                        char irq_num[4];
-                        char *irq_str;
-
-                        /*
-                         * If an IRQ was provided to be assigned after
-                         * the bus probe, do it here.
-                         */
-                        if ((!mdio_bus_data->irqs) &&
-                            (mdio_bus_data->probed_phy_irq > 0)) {
-                                new_bus->irq[addr] =
-                                        mdio_bus_data->probed_phy_irq;
-                                phydev->irq = mdio_bus_data->probed_phy_irq;
-                        }
-
-                        /*
-                         * If we're going to bind the MAC to this PHY bus,
-                         * and no PHY number was provided to the MAC,
-                         * use the one probed here.
-                         */
-                        if (priv->plat->phy_addr == -1)
-                                priv->plat->phy_addr = addr;
-
-                        act = (priv->plat->phy_addr == addr);
-                        switch (phydev->irq) {
-                        case PHY_POLL:
-                                irq_str = "POLL";
-                                break;
-                        case PHY_IGNORE_INTERRUPT:
-                                irq_str = "IGNORE";
-                                break;
-                        default:
-                                sprintf(irq_num, "%d", phydev->irq);
-                                irq_str = irq_num;
-                                break;
-                        }
-                        netdev_info(ndev, "PHY ID %08x at %d IRQ %s (%s)%s\n",
-                                    phydev->phy_id, addr,
-                                    irq_str, phydev_name(phydev),
-                                    act ? " active" : "");
-                        found = 1;
+                /*
+                 * If we're going to bind the MAC to this PHY bus,
+                 * and no PHY number was provided to the MAC,
+                 * use the one probed here.
+                 */
+                if (priv->plat->phy_addr == -1)
+                        priv->plat->phy_addr = addr;
+
+                act = (priv->plat->phy_addr == addr);
+                switch (phydev->irq) {
+                case PHY_POLL:
+                        irq_str = "POLL";
+                        break;
+                case PHY_IGNORE_INTERRUPT:
+                        irq_str = "IGNORE";
+                        break;
+                default:
+                        sprintf(irq_num, "%d", phydev->irq);
+                        irq_str = irq_num;
+                        break;
                 }
+                netdev_info(ndev, "PHY ID %08x at %d IRQ %s (%s)%s\n",
+                            phydev->phy_id, addr, irq_str, phydev_name(phydev),
+                            act ? " active" : "");
+                found = 1;
         }
 
         if (!found && !mdio_node) {