From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7B32EA0093 for ; Tue, 19 May 2020 15:11:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7373D1D702; Tue, 19 May 2020 15:11:52 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 334E61D702 for ; Tue, 19 May 2020 15:11:49 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id e1so15864669wrt.5 for ; Tue, 19 May 2020 06:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nU3Vvf5rLse1Yg3PejF/1hB4PQTFwqa6LxY7Bo1+VtU=; b=MLfeDIbMeDdZfDEzCGzRqZno6KvRkLM8+vRncP1mPGcqmAfy934IQtkkSAU0f+ChW1 +x12qyNaufC6v8vD+/IyZ/enm3h0+2W4Z2mIco1V/gZDEESiS/ceW7lNWNNNx75uz9JB TZDRvYkwpc+IH5bhXpBWp7n3DqRqb1c7BNaKGSKjiuRmGZjCbt6EAIM1YqNEV9Pf7Rqw cUMb+sitSu+9RTqWD8G97fxIV9ECjW7GHDnjJLFKI5wKU/DsYCdLIMS4l9b2wSYKFS+d G+Rot5EDLPHzPDaU5OeIb2KNO7mlfE91k57AvAwPboLpK99bayi+zJ6lNpuXbON0dAZ8 GK6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nU3Vvf5rLse1Yg3PejF/1hB4PQTFwqa6LxY7Bo1+VtU=; b=Q7JbZWdIxGe0Y2fB3fTKR8poSnhSISjDtjcEMI1KOcymiIaKe2/LSWyJYf/la6yZ45 XkcyAPmzeqMz7ekkE41lDzcV17rWYdZzCOxrQof1eu9KX8/M1XubvS2oWulhKQvIses0 auGueegGpLMRzxaHfcQnQAngAbkf/da4BcdWrocRfOgQXEU4np/o0h//klJUJTMWyDFR gIeemCJuNb2+2OWb01unCmhSe6e5e9Gprq59OKkT/613z6QpRKhQBqjT6iOgI4wFEpxU FunDpvYlb30LT7yvNvF8jT4dd15aPuwXvO1Ep8dEu2QVUSD07pCanCnVgAxPq28/CMZg 4KMg== X-Gm-Message-State: AOAM531bZTTT1z3NRiOA415cAfP6pNCkuV/EgNGC+O5a4IY50dj9IIxk F4//+NoxuSQbTFyyOQJcqD0= X-Google-Smtp-Source: ABdhPJzijsgPne1iyUFfTDa/mUmbXRkXuBfA7lxcR3kjwJIZLqtfq5BRwp7jApusO3nBNtYOaLkPNg== X-Received: by 2002:a5d:4dc9:: with SMTP id f9mr25472923wru.407.1589893908918; Tue, 19 May 2020 06:11:48 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d4sm14908016wre.22.2020.05.19.06.11.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:11:48 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Lance Richardson , Somnath Kotur , Ajit Khaparde , dpdk stable Date: Tue, 19 May 2020 14:04:07 +0100 Message-Id: <20200519130549.112823-112-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix HWRM command during FW reset' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 886085974e84c040e84058d508b739875090321b Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 21 Apr 2020 14:33:46 -0700 Subject: [PATCH] net/bnxt: fix HWRM command during FW reset [ upstream commit ac2df046a0cabd68e520fafbeaccd35e3e1b86ef ] FW returns HWRM_ERR_CODE_HOT_RESET_PROGRESS(0xa) when it is unable to process a specific cmd while hot reset is in progress. Host driver is expected to keep retrying the cmd for 2s with a gap of 50ms between each retrial. Also, fixed to fail port start if the HWRM_FUNC_DRV_IF_CHANGE still returns error after 2 seconds. Fixes: 0b533591238f ("net/bnxt: inform firmware about IF state changes") Signed-off-by: Kalesh AP Reviewed-by: Lance Richardson Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt.h | 5 +++++ drivers/net/bnxt/bnxt_ethdev.c | 25 +++++++++++++++++-------- drivers/net/bnxt/bnxt_hwrm.c | 4 ++++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 93735a2a46..cfd6f197da 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -470,6 +470,11 @@ struct bnxt_error_recovery_info { uint32_t last_reset_counter; }; +/* Frequency for the FUNC_DRV_IF_CHANGE retry in milliseconds */ +#define BNXT_IF_CHANGE_RETRY_INTERVAL 50 +/* Maximum retry count for FUNC_DRV_IF_CHANGE */ +#define BNXT_IF_CHANGE_RETRY_COUNT 40 + /* address space location of register */ #define BNXT_FW_STATUS_REG_TYPE_MASK 3 /* register is located in PCIe config space */ diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index dedb012382..b85ec14005 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -833,7 +833,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) struct bnxt *bp = eth_dev->data->dev_private; uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads; int vlan_mask = 0; - int rc; + int rc, retry_cnt = BNXT_IF_CHANGE_RETRY_COUNT; if (!eth_dev->data->nb_tx_queues || !eth_dev->data->nb_rx_queues) { PMD_DRV_LOG(ERR, "Queues are not configured yet!\n"); @@ -846,14 +846,23 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS); } - rc = bnxt_hwrm_if_change(bp, 1); - if (!rc) { - if (bp->flags & BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE) { - rc = bnxt_handle_if_change_status(bp); - if (rc) - return rc; - } + do { + rc = bnxt_hwrm_if_change(bp, 1); + if (rc == 0 || rc != -EAGAIN) + break; + + rte_delay_ms(BNXT_IF_CHANGE_RETRY_INTERVAL); + } while (retry_cnt--); + + if (rc) + return rc; + + if (bp->flags & BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE) { + rc = bnxt_handle_if_change_status(bp); + if (rc) + return rc; } + bnxt_enable_int(bp); rc = bnxt_init_chip(bp); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 7408412c9b..b8d1d6322e 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -221,6 +221,8 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg, rc = -EINVAL; \ else if (rc == HWRM_ERR_CODE_CMD_NOT_SUPPORTED) \ rc = -ENOTSUP; \ + else if (rc == HWRM_ERR_CODE_HOT_RESET_PROGRESS) \ + rc = -EAGAIN; \ else if (rc > 0) \ rc = -EIO; \ return rc; \ @@ -249,6 +251,8 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg, rc = -EINVAL; \ else if (rc == HWRM_ERR_CODE_CMD_NOT_SUPPORTED) \ rc = -ENOTSUP; \ + else if (rc == HWRM_ERR_CODE_HOT_RESET_PROGRESS) \ + rc = -EAGAIN; \ else if (rc > 0) \ rc = -EIO; \ return rc; \ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:49.045497222 +0100 +++ 0112-net-bnxt-fix-HWRM-command-during-FW-reset.patch 2020-05-19 14:04:44.376651273 +0100 @@ -1,8 +1,10 @@ -From ac2df046a0cabd68e520fafbeaccd35e3e1b86ef Mon Sep 17 00:00:00 2001 +From 886085974e84c040e84058d508b739875090321b Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 21 Apr 2020 14:33:46 -0700 Subject: [PATCH] net/bnxt: fix HWRM command during FW reset +[ upstream commit ac2df046a0cabd68e520fafbeaccd35e3e1b86ef ] + FW returns HWRM_ERR_CODE_HOT_RESET_PROGRESS(0xa) when it is unable to process a specific cmd while hot reset is in progress. Host driver is expected to keep retrying the cmd for 2s with @@ -12,7 +14,6 @@ still returns error after 2 seconds. Fixes: 0b533591238f ("net/bnxt: inform firmware about IF state changes") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Lance Richardson @@ -25,10 +26,10 @@ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h -index a7a9e4113a..d55a570396 100644 +index 93735a2a46..cfd6f197da 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h -@@ -480,6 +480,11 @@ struct bnxt_error_recovery_info { +@@ -470,6 +470,11 @@ struct bnxt_error_recovery_info { uint32_t last_reset_counter; }; @@ -37,14 +38,14 @@ +/* Maximum retry count for FUNC_DRV_IF_CHANGE */ +#define BNXT_IF_CHANGE_RETRY_COUNT 40 + - struct bnxt_mark_info { - uint32_t mark_id; - bool valid; + /* address space location of register */ + #define BNXT_FW_STATUS_REG_TYPE_MASK 3 + /* register is located in PCIe config space */ diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 3397c05353..b6c7132564 100644 +index dedb012382..b85ec14005 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -1051,7 +1051,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) +@@ -833,7 +833,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) struct bnxt *bp = eth_dev->data->dev_private; uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads; int vlan_mask = 0; @@ -53,7 +54,7 @@ if (!eth_dev->data->nb_tx_queues || !eth_dev->data->nb_rx_queues) { PMD_DRV_LOG(ERR, "Queues are not configured yet!\n"); -@@ -1064,14 +1064,23 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) +@@ -846,14 +846,23 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS); } @@ -85,7 +86,7 @@ rc = bnxt_init_chip(bp); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c -index 4c0fac6be1..dc0b405606 100644 +index 7408412c9b..b8d1d6322e 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -221,6 +221,8 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,