bnxt_en: Don't allow autoneg on cards that don't support it.

Some cards do not support autoneg.  The current code does not prevent the
user from enabling autoneg with ethtool on such cards, causing confusion.
Firmware provides the autoneg capability information and we just need to
store it in the support_auto_speeds field in bnxt_link_info struct.
The ethtool set_settings() call will check this field before proceeding
with autoneg.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index c2753296e75ea5711b0c61d4eca38f0e8e5fa17c..9aaa6a61c8006f050088f89ea29d0d9a8ba1df36 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -4823,6 +4823,7 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)
        int rc = 0;
        struct hwrm_port_phy_qcaps_input req = {0};
        struct hwrm_port_phy_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
+       struct bnxt_link_info *link_info = &bp->link_info;
 
        if (bp->hwrm_spec_code < 0x10201)
                return 0;
@@ -4845,6 +4846,8 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)
                bp->lpi_tmr_hi = le32_to_cpu(resp->valid_tx_lpi_timer_high) &
                                 PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_HIGH_MASK;
        }
+       link_info->support_auto_speeds =
+               le16_to_cpu(resp->supported_speeds_auto_mode);
 
 hwrm_phy_qcaps_exit:
        mutex_unlock(&bp->hwrm_cmd_lock);
@@ -6368,6 +6371,12 @@ static int bnxt_probe_phy(struct bnxt *bp)
                return rc;
        }
 
+       /* Older firmware does not have supported_auto_speeds, so assume
+        * that all supported speeds can be autonegotiated.
+        */
+       if (link_info->auto_link_speeds && !link_info->support_auto_speeds)
+               link_info->support_auto_speeds = link_info->support_speeds;
+
        /*initialize the ethool setting copy with NVM settings */
        if (BNXT_AUTO_MODE(link_info->auto_mode)) {
                link_info->autoneg = BNXT_AUTONEG_SPEED;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index c1b41fb216dc9ee8530759e29ba18cf1b2d3c8ed..04cc69bb9e6a5d65e0726aa0187a259787bcb237 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -849,6 +849,7 @@ struct bnxt_link_info {
 #define BNXT_LINK_SPEED_MSK_25GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_25GB
 #define BNXT_LINK_SPEED_MSK_40GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_40GB
 #define BNXT_LINK_SPEED_MSK_50GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_50GB
+       u16                     support_auto_speeds;
        u16                     lp_auto_link_speeds;
        u16                     force_link_speed;
        u32                     preemphasis;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 89050ed2046ff4a9ba3c36dea004a24ea19b6c62..3362e9043a51c4971883313ba72846b31a617f07 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -659,6 +659,17 @@ static u32 bnxt_fw_to_ethtool_support_spds(struct bnxt_link_info *link_info)
        return supported | SUPPORTED_Pause | SUPPORTED_Asym_Pause;
 }
 
+static u32 bnxt_fw_to_ethtool_support_adv_spds(struct bnxt_link_info *link_info)
+{
+       u16 fw_speeds = link_info->support_auto_speeds;
+       u32 supported;
+
+       supported = _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);
+       if (supported)
+               supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
+       return supported;
+}
+
 u32 bnxt_fw_to_ethtool_speed(u16 fw_link_speed)
 {
        switch (fw_link_speed) {
@@ -691,7 +702,7 @@ static int bnxt_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
        cmd->supported = bnxt_fw_to_ethtool_support_spds(link_info);
 
-       if (link_info->auto_link_speeds)
+       if (link_info->support_auto_speeds)
                cmd->supported |= SUPPORTED_Autoneg;
 
        if (link_info->autoneg) {
@@ -827,8 +838,14 @@ static int bnxt_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                return rc;
 
        if (cmd->autoneg == AUTONEG_ENABLE) {
-               u32 supported_spds = bnxt_fw_to_ethtool_support_spds(link_info);
+               u32 supported_spds =
+                       bnxt_fw_to_ethtool_support_adv_spds(link_info);
 
+               if (!supported_spds) {
+                       netdev_err(dev, "Autoneg not supported\n");
+                       rc = -EINVAL;
+                       goto set_setting_exit;
+               }
                if (cmd->advertising & ~(supported_spds | ADVERTISED_Autoneg |
                                         ADVERTISED_TP | ADVERTISED_FIBRE)) {
                        netdev_err(dev, "Unsupported advertising mask (adv: 0x%x)\n",
@@ -837,15 +854,9 @@ static int bnxt_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                        goto set_setting_exit;
                }
                fw_advertising = bnxt_get_fw_auto_link_speeds(cmd->advertising);
-               if (fw_advertising & ~link_info->support_speeds) {
-                       netdev_err(dev, "Advertising parameters are not supported! (adv: 0x%x)\n",
-                                  cmd->advertising);
-                       rc = -EINVAL;
-                       goto set_setting_exit;
-               }
                link_info->autoneg |= BNXT_AUTONEG_SPEED;
                if (!fw_advertising)
-                       link_info->advertising = link_info->support_speeds;
+                       link_info->advertising = link_info->support_auto_speeds;
                else
                        link_info->advertising = fw_advertising;
                /* any change to autoneg will cause link change, therefore the