From: Ajit Khaparde <ajit.khaparde@broadcom.com> To: dev@dpdk.org Cc: ferruh.yigit@intel.com, stable@dpdk.org, Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>, Lance Richardson <lance.richardson@broadcom.com> Subject: [dpdk-dev] [PATCH v2 06/12] net/bnxt: get the default HWRM command timeout from firmware Date: Wed, 9 Oct 2019 18:41:47 -0700 Message-ID: <20191010014153.64908-7-ajit.khaparde@broadcom.com> (raw) In-Reply-To: <20191010014153.64908-1-ajit.khaparde@broadcom.com> 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> --- drivers/net/bnxt/bnxt.h | 5 +++++ drivers/net/bnxt/bnxt_hwrm.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index ad0b18dddd..5020cd3415 100644 --- 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 a40197e929..5e3117fee9 100644 --- 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; -- 2.20.1 (Apple Git-117)
next prev parent reply other threads:[~2019-10-10 1:43 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-04 5:02 [dpdk-dev] [PATCH 00/10] bnxt patchset with bug fixes Ajit Khaparde 2019-10-04 5:02 ` [dpdk-dev] [PATCH 01/10] net/bnxt: change return value of few routines Ajit Khaparde 2019-10-04 5:02 ` [dpdk-dev] [PATCH 02/10] net/bnxt: free default completion ring before VF configuration Ajit Khaparde 2019-10-04 5:02 ` [dpdk-dev] [PATCH 03/10] net/bnxt: return error if setting link up fail Ajit Khaparde 2019-10-04 5:02 ` [dpdk-dev] [PATCH 04/10] net/bnxt: remove redundant header file inclusion Ajit Khaparde 2019-10-08 8:44 ` Ferruh Yigit 2019-10-04 5:02 ` [dpdk-dev] [PATCH 05/10] net/bnxt: update trusted VF status only when it changes Ajit Khaparde 2019-10-04 5:02 ` [dpdk-dev] [PATCH 06/10] net/bnxt: get the default HWRM command timeout from firmware Ajit Khaparde 2019-10-04 5:02 ` [dpdk-dev] [PATCH 07/10] net/bnxt: reduce cleanup time during reset recovery Ajit Khaparde 2019-10-04 5:02 ` [dpdk-dev] [PATCH 08/10] net/bnxt: change msix vector to queue mapping Ajit Khaparde 2019-10-04 5:02 ` [dpdk-dev] [PATCH 09/10] net/bnxt: fix to handle if change status in port start only Ajit Khaparde 2019-10-04 5:02 ` [dpdk-dev] [PATCH 10/10] net/bnxt: remove a useless check in validate flow routine Ajit Khaparde 2019-10-08 9:03 ` Ferruh Yigit 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 00/12] bnxt patchset with bug fixes Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 01/12] net/bnxt: fix return checks and return values Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 02/12] net/bnxt: free default completion ring before VF configuration Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 03/12] net/bnxt: return error if setting link up fail Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 04/12] net/bnxt: remove redundant header file inclusion Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 05/12] net/bnxt: update trusted VF status only when it changes Ajit Khaparde 2019-10-10 1:41 ` Ajit Khaparde [this message] 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 07/12] net/bnxt: reduce cleanup time during reset recovery Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 08/12] net/bnxt: change msix vector to queue mapping Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 09/12] net/bnxt: enable interrupts after checking interface status from FW Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 10/12] net/bnxt: fix to handle interface change status in port start only Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 11/12] net/bnxt: fix coding style issues Ajit Khaparde 2019-10-10 1:41 ` [dpdk-dev] [PATCH v2 12/12] net/bnxt: remove unnecessary variable assignment Ajit Khaparde 2019-10-10 18:05 ` [dpdk-dev] [PATCH v2 00/12] bnxt patchset with bug fixes Ferruh Yigit
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191010014153.64908-7-ajit.khaparde@broadcom.com \ --to=ajit.khaparde@broadcom.com \ --cc=dev@dpdk.org \ --cc=ferruh.yigit@intel.com \ --cc=lance.richardson@broadcom.com \ --cc=santosh.rastapur@broadcom.com \ --cc=stable@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ http://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git