net/hinic/base: fix port start during FW hot update

When repeatedly hotupdate firmware and start/stop port at the same time,
port start may be failed when cmdq reinit failed at the FW active phase,
so if cmdq fails, then reinit the cmdq when port start.

Fixes: d9ce1917941c ("net/hinic/base: add hardware operation")
Cc: stable@dpdk.org
Signed-off-by: Xiaoyun Wang <cloud.wangxiaoyun@huawei.com>

diff --git a/drivers/net/hinic/base/hinic_pmd_cmdq.c b/drivers/net/hinic/base/hinic_pmd_cmdq.c
index d73e2bf5929d91782b031948244bb3f15fa08e5f..685498ec2f500d527ebde98ec5ac7783acaf9f9a 100644 (file)
--- a/drivers/net/hinic/base/hinic_pmd_cmdq.c
+++ b/drivers/net/hinic/base/hinic_pmd_cmdq.c
@@ -7,6 +7,7 @@
 #include "hinic_pmd_hwif.h"
 #include "hinic_pmd_wq.h"
 #include "hinic_pmd_mgmt.h"
+#include "hinic_pmd_mbox.h"
 #include "hinic_pmd_cmdq.h"
 
 #define CMDQ_CMD_TIMEOUT                               5000 /* millisecond */
@@ -439,11 +440,14 @@ static int hinic_set_cmdq_ctxts(struct hinic_hwdev *hwdev)
                                             cmdq_ctxt, in_size, NULL,
                                             NULL, 0);
                if (err) {
+                       if (err == HINIC_MBOX_PF_BUSY_ACTIVE_FW)
+                               cmdqs->status |= HINIC_CMDQ_SET_FAIL;
                        PMD_DRV_LOG(ERR, "Set cmdq ctxt failed");
                        return -EFAULT;
                }
        }
 
+       cmdqs->status &= ~HINIC_CMDQ_SET_FAIL;
        cmdqs->status |= HINIC_CMDQ_ENABLE;
 
        return 0;

diff --git a/drivers/net/hinic/base/hinic_pmd_cmdq.h b/drivers/net/hinic/base/hinic_pmd_cmdq.h
index da939e16fa03ee267a2ab99d17a9a765d80637b5..4ce0a4c5b84753d665230b22870896ff352e8aef 100644 (file)
--- a/drivers/net/hinic/base/hinic_pmd_cmdq.h
+++ b/drivers/net/hinic/base/hinic_pmd_cmdq.h
@@ -170,6 +170,7 @@ struct hinic_cmdq_ctxt {
 
 enum hinic_cmdq_status {
        HINIC_CMDQ_ENABLE = BIT(0),
+       HINIC_CMDQ_SET_FAIL = BIT(1)
 };
 
 enum hinic_cmdq_cmd_type {

diff --git a/drivers/net/hinic/base/hinic_pmd_nicio.c b/drivers/net/hinic/base/hinic_pmd_nicio.c
index 59e39ed984f0b25b9111563ab1a1017aa1769cc2..31a13fbdcf72444d86c9c1b0f45ec95d85bc1b34 100644 (file)
--- a/drivers/net/hinic/base/hinic_pmd_nicio.c
+++ b/drivers/net/hinic/base/hinic_pmd_nicio.c
@@ -533,6 +533,15 @@ int hinic_init_qp_ctxts(struct hinic_hwdev *hwdev)
                return err;
        }
 
+       if (hwdev->cmdqs->status & HINIC_CMDQ_SET_FAIL) {
+               err = hinic_reinit_cmdq_ctxts(hwdev);
+               if (err) {
+                       PMD_DRV_LOG(ERR, "Reinit cmdq context failed, rc: %d\n",
+                               err);
+                       return err;
+               }
+       }
+
        err = init_qp_ctxts(nic_io);
        if (err) {
                PMD_DRV_LOG(ERR, "Init QP ctxts failed, rc: %d", err);