From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Date: Fri, 28 Aug 2020 05:01:12 +0000 (+0530)
Subject: net/bnxt: fix speed setting on certain adapters
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=99ad2abc02c3b9ddf568ac0241fd3bda2e89f1b9;p=dpdk.git

net/bnxt: fix speed setting on certain adapters

On BCM957508-N2100 adapters, FW will not allow any user other
than BMC to shutdown the port. As a result, bnxt_get_hwrm_link_config()
always returns link up.

Because of this, driver will not update the new port configurations
such as speed, autoneg during a port start.

Fixed the condition to invoke bnxt_set_hwrm_link_config() in
bnxt_init_chip().

Fixes: 7bc8e9a227cc ("net/bnxt: support async link notification")
Cc: stable@dpdk.org

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 74e2c9a709..a190d78bdd 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -81,6 +81,10 @@
 #define BROADCOM_DEV_ID_58808		0x16f0
 #define BROADCOM_DEV_ID_58802_VF	0xd800
 
+#define BROADCOM_DEV_957508_N2100	0x5208
+#define IS_BNXT_DEV_957508_N2100(bp)	\
+	((bp)->pdev->id.subsystem_device_id == BROADCOM_DEV_957508_N2100)
+
 #define BNXT_MAX_MTU		9574
 #define VLAN_TAG_SIZE		4
 #define BNXT_NUM_VLANS		2
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 40023a454d..75d055be00 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -605,9 +605,35 @@ static int bnxt_init_ctx_mem(struct bnxt *bp)
 	return rc;
 }
 
-static int bnxt_init_chip(struct bnxt *bp)
+static int bnxt_update_phy_setting(struct bnxt *bp)
 {
 	struct rte_eth_link new;
+	int rc;
+
+	rc = bnxt_get_hwrm_link_config(bp, &new);
+	if (rc) {
+		PMD_DRV_LOG(ERR, "Failed to get link settings\n");
+		return rc;
+	}
+
+	/*
+	 * On BCM957508-N2100 adapters, FW will not allow any user other
+	 * than BMC to shutdown the port. bnxt_get_hwrm_link_config() call
+	 * always returns link up. Force phy update always in that case.
+	 */
+	if (!new.link_status || IS_BNXT_DEV_957508_N2100(bp)) {
+		rc = bnxt_set_hwrm_link_config(bp, true);
+		if (rc) {
+			PMD_DRV_LOG(ERR, "Failed to update PHY settings\n");
+			return rc;
+		}
+	}
+
+	return rc;
+}
+
+static int bnxt_init_chip(struct bnxt *bp)
+{
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev);
 	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 	uint32_t intr_vector = 0;
@@ -737,21 +763,9 @@ skip_cosq_cfg:
 		goto err_free;
 #endif
 
-	rc = bnxt_get_hwrm_link_config(bp, &new);
-	if (rc) {
-		PMD_DRV_LOG(ERR, "HWRM Get link config failure rc: %x\n", rc);
+	rc = bnxt_update_phy_setting(bp);
+	if (rc)
 		goto err_free;
-	}
-
-	if (!bp->link_info->link_up) {
-		rc = bnxt_set_hwrm_link_config(bp, true);
-		if (rc) {
-			PMD_DRV_LOG(ERR,
-				"HWRM link config failure rc: %x\n", rc);
-			goto err_free;
-		}
-	}
-	bnxt_print_link_info(bp->eth_dev);
 
 	bp->mark_table = rte_zmalloc("bnxt_mark_table", BNXT_MARK_TABLE_SZ, 0);
 	if (!bp->mark_table)