net/mlx5: add ConnectX6-DX device ID

[dpdk.git] / drivers / net / axgbe / axgbe_mdio.c

diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c
index 914f34f..2721e5c 100644 (file)
--- a/drivers/net/axgbe/axgbe_mdio.c
+++ b/drivers/net/axgbe/axgbe_mdio.c
@@ -287,10 +287,14 @@ static void axgbe_an73_disable(struct axgbe_port *pdata)
 {
        axgbe_an73_set(pdata, false, false);
        axgbe_an73_disable_interrupts(pdata);
+       pdata->an_start = 0;
 }
 
 static void axgbe_an_restart(struct axgbe_port *pdata)
 {
+       if (pdata->phy_if.phy_impl.an_pre)
+               pdata->phy_if.phy_impl.an_pre(pdata);
+
        switch (pdata->an_mode) {
        case AXGBE_AN_MODE_CL73:
        case AXGBE_AN_MODE_CL73_REDRV:
@@ -307,6 +311,9 @@ static void axgbe_an_restart(struct axgbe_port *pdata)
 
 static void axgbe_an_disable(struct axgbe_port *pdata)
 {
+       if (pdata->phy_if.phy_impl.an_post)
+               pdata->phy_if.phy_impl.an_post(pdata);
+
        switch (pdata->an_mode) {
        case AXGBE_AN_MODE_CL73:
        case AXGBE_AN_MODE_CL73_REDRV:
@@ -482,9 +489,9 @@ static enum axgbe_an axgbe_an73_incompat_link(struct axgbe_port *pdata)
                        return AXGBE_AN_NO_LINK;
        }
 
-       axgbe_an73_disable(pdata);
+       axgbe_an_disable(pdata);
        axgbe_switch_mode(pdata);
-       axgbe_an73_restart(pdata);
+       axgbe_an_restart(pdata);
 
        return AXGBE_AN_INCOMPAT_LINK;
 }
@@ -553,6 +560,8 @@ again:
                pdata->kr_state = AXGBE_RX_BPA;
                pdata->kx_state = AXGBE_RX_BPA;
                pdata->an_start = 0;
+               if (pdata->phy_if.phy_impl.an_post)
+                       pdata->phy_if.phy_impl.an_post(pdata);
        }
 
        if (cur_state != pdata->an_state)
@@ -674,6 +683,19 @@ static void axgbe_an_init(struct axgbe_port *pdata)
 static void axgbe_phy_adjust_link(struct axgbe_port *pdata)
 {
        if (pdata->phy.link) {
+               /* Flow control support */
+               pdata->pause_autoneg = pdata->phy.pause_autoneg;
+
+               if (pdata->tx_pause != (unsigned int)pdata->phy.tx_pause) {
+                       pdata->hw_if.config_tx_flow_control(pdata);
+                       pdata->tx_pause = pdata->phy.tx_pause;
+               }
+
+               if (pdata->rx_pause != (unsigned int)pdata->phy.rx_pause) {
+                       pdata->hw_if.config_rx_flow_control(pdata);
+                       pdata->rx_pause = pdata->phy.rx_pause;
+               }
+
                /* Speed support */
                if (pdata->phy_speed != pdata->phy.speed)
                        pdata->phy_speed = pdata->phy.speed;