[dpdk-dev] [PATCH] net/ice: simplify the use of DCF device reset

[dapengx.yu@intel.com]

From: Dapeng Yu <dapengx.yu@intel.com>

After DCF is reset by PF, the DCF device un-initialization cannot
function normally since the resource is already invalidated. So
reset DCF twice is necessary, the first reset re-initializes the DCF,
only then second reset can clean the filters successfully.

This patch detects the reset flag, which is set by PF on DCF reset,
if the flag is true, do DCF reset twice automatically.

Fixes: 1a86f4dbdf42 ("net/ice: support DCF device reset")
Cc: stable@dpdk.org

Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
---
 drivers/net/ice/ice_dcf_ethdev.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
index 7cb8066416..e8057f5588 100644
--- a/drivers/net/ice/ice_dcf_ethdev.c
+++ b/drivers/net/ice/ice_dcf_ethdev.c
@@ -1031,8 +1031,29 @@ ice_dcf_tm_ops_get(struct rte_eth_dev *dev __rte_unused,
 static int
 ice_dcf_dev_reset(struct rte_eth_dev *dev)
 {
+	struct ice_dcf_adapter *ad = dev->data->dev_private;
+	struct iavf_hw *hw = &ad->real_hw.avf;
 	int ret;
 
+	if (!(IAVF_READ_REG(hw, IAVF_VF_ARQLEN1) &
+	      IAVF_VF_ARQLEN1_ARQENABLE_MASK)) {
+		if (!ad->real_hw.resetting)
+			ad->real_hw.resetting = true;
+		PMD_DRV_LOG(ERR, "The DCF has been reset by PF");
+
+		/*
+		 * Do the extra dev uninit/init to make DCF get resource.
+		 * Then the next uninit/init can clean filters successfully.
+		 */
+		ret = ice_dcf_dev_uninit(dev);
+		if (ret)
+			return ret;
+
+		ret = ice_dcf_dev_init(dev);
+		if (ret)
+			return ret;
+	}
+
 	ret = ice_dcf_dev_uninit(dev);
 	if (ret)
 		return ret;
-- 
2.27.0