3 files changed, 16 insertions, 7 deletions

diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 9d009c46e96..1e7858511e3 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -909,6 +909,8 @@ static int falcon_probe_port(struct efx_nic *efx)
                 efx->wanted_fc = EFX_FC_RX | EFX_FC_TX;
         else
                 efx->wanted_fc = EFX_FC_RX;
+        if (efx->mdio.mmds & MDIO_DEVS_AN)
+                efx->wanted_fc |= EFX_FC_AUTO;
 
         /* Allocate buffer for stats */
         rc = efx_nic_alloc_buffer(efx, &efx->stats_buffer,
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c
index eb694af7a47..d87e74d3994 100644
--- a/drivers/net/sfc/mcdi_phy.c
+++ b/drivers/net/sfc/mcdi_phy.c
@@ -381,6 +381,18 @@ static int efx_mcdi_phy_probe(struct efx_nic *efx)
          * but by convention we don't */
         efx->loopback_modes &= ~(1 << LOOPBACK_NONE);
 
+        /* Set the initial link mode */
+        efx_mcdi_phy_decode_link(
+                efx, &efx->link_state,
+                MCDI_DWORD(outbuf, GET_LINK_OUT_LINK_SPEED),
+                MCDI_DWORD(outbuf, GET_LINK_OUT_FLAGS),
+                MCDI_DWORD(outbuf, GET_LINK_OUT_FCNTL));
+
+        /* Default to Autonegotiated flow control if the PHY supports it */
+        efx->wanted_fc = EFX_FC_RX | EFX_FC_TX;
+        if (phy_data->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN))
+                efx->wanted_fc |= EFX_FC_AUTO;
+
         return 0;
 
 fail:
@@ -436,7 +448,7 @@ void efx_mcdi_phy_check_fcntl(struct efx_nic *efx, u32 lpa)
 
         /* The link partner capabilities are only relevent if the
          * link supports flow control autonegotiation */
-        if (~phy_cfg->supported_cap & (1 << MC_CMD_PHY_CAP_ASYM_LBN))
+        if (~phy_cfg->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN))
                 return;
 
         /* If flow control autoneg is supported and enabled, then fine */
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c
index 0e4c13abf08..f6a53895ff2 100644
--- a/drivers/net/sfc/siena.c
+++ b/drivers/net/sfc/siena.c
@@ -106,16 +106,11 @@ static int siena_probe_port(struct efx_nic *efx)
         efx->mdio.mdio_read = siena_mdio_read;
         efx->mdio.mdio_write = siena_mdio_write;
 
-        /* Fill out MDIO structure and loopback modes */
+        /* Fill out MDIO structure, loopback modes, and initial link state */
         rc = efx->phy_op->probe(efx);
         if (rc != 0)
                 return rc;
 
-        /* Initial assumption */
-        efx->link_state.speed = 10000;
-        efx->link_state.fd = true;
-        efx->wanted_fc = EFX_FC_RX | EFX_FC_TX;
-
         /* Allocate buffer for stats */
         rc = efx_nic_alloc_buffer(efx, &efx->stats_buffer,
                                   MC_CMD_MAC_NSTATS * sizeof(u64));