bnxt_en: query force speeds before disabling autoneg mode.

[ Upstream commit 56d374624778652d2a999e18c87a25338b127b41 ]

With autoneg enabled, PHY loopback test fails. To disable autoneg,
driver needs to send a valid forced speed to FW. FW is not sending
async event for invalid speeds. To fix this, query forced speeds
and send the correct speed when disabling autoneg mode.

Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 4879371ad0c750610a50fdc767a16b9d1f65596c..fc8e185718a1d768f80b992ab5935cf63b021935 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -2258,17 +2258,37 @@ static int bnxt_hwrm_mac_loopback(struct bnxt *bp, bool enable)
        return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
 }
 
+static int bnxt_query_force_speeds(struct bnxt *bp, u16 *force_speeds)
+{
+       struct hwrm_port_phy_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
+       struct hwrm_port_phy_qcaps_input req = {0};
+       int rc;
+
+       bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_PORT_PHY_QCAPS, -1, -1);
+       mutex_lock(&bp->hwrm_cmd_lock);
+       rc = _hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+       if (!rc)
+               *force_speeds = le16_to_cpu(resp->supported_speeds_force_mode);
+
+       mutex_unlock(&bp->hwrm_cmd_lock);
+       return rc;
+}
+
 static int bnxt_disable_an_for_lpbk(struct bnxt *bp,
                                    struct hwrm_port_phy_cfg_input *req)
 {
        struct bnxt_link_info *link_info = &bp->link_info;
-       u16 fw_advertising = link_info->advertising;
+       u16 fw_advertising;
        u16 fw_speed;
        int rc;
 
        if (!link_info->autoneg)
                return 0;
 
+       rc = bnxt_query_force_speeds(bp, &fw_advertising);
+       if (rc)
+               return rc;
+
        fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_1GB;
        if (netif_carrier_ok(bp->dev))
                fw_speed = bp->link_info.link_speed;