|WARNING| pw109861-109862 [PATCH] [v4,2/2] net/ice: fix DCF reset

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/109861

_apply patch failure_

Submitter: Kevin Liu <kevinx.liu at intel.com>
Date: Tuesday, April 19 2022 16:01:31 
Applied on: CommitID:76076342ec8ef108a155938d46a88bb493fae60e
Apply patch set 109861-109862 failed:

Checking patch drivers/net/ice/base/ice_common.c...
Checking patch drivers/net/ice/ice_dcf.c...
error: while searching for:
	int ret;

	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;

	ice_dcf_disable_irq0(hw);
	rte_intr_disable(intr_handle);

error: patch failed: drivers/net/ice/ice_dcf.c:1429
Checking patch drivers/net/ice/ice_dcf_ethdev.c...
error: while searching for:
	uint32_t i;
	int len, err = 0;

	len = sizeof(struct virtchnl_ether_addr_list);
	len += sizeof(struct virtchnl_ether_addr) * mc_addrs_num;


error: patch failed: drivers/net/ice/ice_dcf_ethdev.c:1028
Hunk #2 succeeded at 891 (offset -832 lines).
Checking patch drivers/net/ice/ice_dcf_parent.c...
Applied patch drivers/net/ice/base/ice_common.c cleanly.
Applying patch drivers/net/ice/ice_dcf.c with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/ice/ice_dcf_ethdev.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch drivers/net/ice/ice_dcf_parent.c cleanly.
diff a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c	(rejected hunks)
@@ -1429,7 +1429,7 @@ ice_dcf_cap_reset(struct rte_eth_dev *eth_dev, struct ice_dcf_hw *hw)
 	int ret;
 
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+	struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
 
 	ice_dcf_disable_irq0(hw);
 	rte_intr_disable(intr_handle);
diff a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c	(rejected hunks)
@@ -1028,6 +1028,15 @@ dcf_add_del_mc_addr_list(struct ice_dcf_hw *hw,
 	uint32_t i;
 	int len, err = 0;
 
+	if (hw->resetting) {
+		if (!add)
+			return 0;
+
+		PMD_DRV_LOG(ERR,
+			    "fail to add multicast MACs for VF resetting");
+		return -EIO;
+	}
+
 	len = sizeof(struct virtchnl_ether_addr_list);
 	len += sizeof(struct virtchnl_ether_addr) * mc_addrs_num;
 

https://lab.dpdk.org/results/dashboard/patchsets/21834/

UNH-IOL DPDK Community Lab