net/bnxt: get default HWRM command timeout from FW

The HWRM command timeout is set to a very high value.
VER_GET command response returns the default request timeout value.
Use this value for waiting for HWRM commands to complete.
Poll for the valid bit every 1us instead of 600us.

Fixes: cbcd375d37d2 ("net/bnxt: fix HWRM macros and locking")
Cc: stable@dpdk.org
Signed-off-by: Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Lance Richardson <lance.richardson@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index ad0b18d..5020cd3 100644 (file)
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -525,6 +525,11 @@ struct bnxt {
        uint16_t                        max_resp_len;
        uint16_t                        hwrm_max_ext_req_len;
 
+        /* default command timeout value of 50ms */
+#define HWRM_CMD_TIMEOUT               50000
+       /* default HWRM request timeout value */
+       uint32_t                        hwrm_cmd_timeout;
+
        struct bnxt_link_info   link_info;
        struct bnxt_cos_queue_info      rx_cos_queue[BNXT_COS_QUEUE_COUNT];
        struct bnxt_cos_queue_info      tx_cos_queue[BNXT_COS_QUEUE_COUNT];

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index a40197e..5e3117f 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -25,8 +25,6 @@
 
 #include <rte_io.h>
 
-#define HWRM_CMD_TIMEOUT               6000000
-#define HWRM_SHORT_CMD_TIMEOUT         50000
 #define HWRM_SPEC_CODE_1_8_3           0x10803
 #define HWRM_VERSION_1_9_1             0x10901
 #define HWRM_VERSION_1_9_2             0x10903
@@ -105,9 +103,9 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,
 
        /* For VER_GET command, set timeout as 50ms */
        if (rte_cpu_to_le_16(req->req_type) == HWRM_VER_GET)
-               timeout = HWRM_SHORT_CMD_TIMEOUT;
-       else
                timeout = HWRM_CMD_TIMEOUT;
+       else
+               timeout = bp->hwrm_cmd_timeout;
 
        if (bp->flags & BNXT_FLAG_SHORT_CMD ||
            msg_len > bp->max_req_len) {
@@ -969,6 +967,13 @@ int bnxt_hwrm_ver_get(struct bnxt *bp)
        fw_version |= resp->hwrm_intf_upd_8b;
        bp->hwrm_spec_code = fw_version;
 
+       /* def_req_timeout value is in milliseconds */
+       bp->hwrm_cmd_timeout = rte_le_to_cpu_16(resp->def_req_timeout);
+       /* convert timeout to usec */
+       bp->hwrm_cmd_timeout *= 1000;
+       if (!bp->hwrm_cmd_timeout)
+               bp->hwrm_cmd_timeout = HWRM_CMD_TIMEOUT;
+
        if (resp->hwrm_intf_maj_8b != HWRM_VERSION_MAJOR) {
                PMD_DRV_LOG(ERR, "Unsupported firmware API version\n");
                rc = -EINVAL;