X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fice%2Fice_dcf_parent.c;h=c5dfdd36e1dd162f0add6e333a074302194cc169;hb=f28fbd1e6b502fe4c38e0a4aa862e103811b1b97;hp=e05b6b3e5afaf1e577f554e5688bfb118dd0c80b;hpb=c8183dd8e059aa22488b9c7ebda6a33941befdd9;p=dpdk.git

diff --git a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/ice/ice_dcf_parent.c
index e05b6b3e5a..c5dfdd36e1 100644
--- a/drivers/net/ice/ice_dcf_parent.c
+++ b/drivers/net/ice/ice_dcf_parent.c
@@ -45,7 +45,7 @@ ice_dcf_update_vsi_ctx(struct ice_hw *hw, uint16_t vsi_handle,
 			VIRTCHNL_DCF_VF_VSI_ID_S;
 
 		/* Redirect rules if vsi mapping table changes. */
-		if (!first_update && vsi_ctx->vsi_num != new_vsi_num) {
+		if (!first_update) {
 			struct ice_flow_redirect rd;
 
 			memset(&rd, 0, sizeof(struct ice_flow_redirect));
@@ -226,12 +226,34 @@ ice_dcf_request_pkg_name(struct ice_hw *hw, char *pkg_name)
 {
 	struct ice_dcf_adapter *dcf_adapter =
 			container_of(hw, struct ice_dcf_adapter, parent.hw);
+	struct virtchnl_pkg_info pkg_info;
+	struct dcf_virtchnl_cmd vc_cmd;
+	uint64_t dsn;
 
-	/* TODO: check with DSN firstly by iAVF */
-	PMD_INIT_LOG(DEBUG,
-		     "DCF VSI_ID = %u",
-		     dcf_adapter->real_hw.vsi_id);
+	vc_cmd.v_op = VIRTCHNL_OP_DCF_GET_PKG_INFO;
+	vc_cmd.req_msglen = 0;
+	vc_cmd.req_msg = NULL;
+	vc_cmd.rsp_buflen = sizeof(pkg_info);
+	vc_cmd.rsp_msgbuf = (uint8_t *)&pkg_info;
 
+	if (ice_dcf_execute_virtchnl_cmd(&dcf_adapter->real_hw, &vc_cmd))
+		goto pkg_file_direct;
+
+	rte_memcpy(&dsn, pkg_info.dsn, sizeof(dsn));
+
+	snprintf(pkg_name, ICE_MAX_PKG_FILENAME_SIZE,
+		 ICE_PKG_FILE_SEARCH_PATH_UPDATES "ice-%016llx.pkg",
+		 (unsigned long long)dsn);
+	if (!access(pkg_name, 0))
+		return 0;
+
+	snprintf(pkg_name, ICE_MAX_PKG_FILENAME_SIZE,
+		 ICE_PKG_FILE_SEARCH_PATH_DEFAULT "ice-%016llx.pkg",
+		 (unsigned long long)dsn);
+	if (!access(pkg_name, 0))
+		return 0;
+
+pkg_file_direct:
 	snprintf(pkg_name,
 		 ICE_MAX_PKG_FILENAME_SIZE, "%s", ICE_PKG_FILE_UPDATES);
 	if (!access(pkg_name, 0))
@@ -313,6 +335,14 @@ ice_dcf_init_parent_adapter(struct rte_eth_dev *eth_dev)
 	parent_adapter->eth_dev = eth_dev;
 	parent_adapter->pf.adapter = parent_adapter;
 	parent_adapter->pf.dev_data = eth_dev->data;
+	/* create a dummy main_vsi */
+	parent_adapter->pf.main_vsi =
+		rte_zmalloc(NULL, sizeof(struct ice_vsi), 0);
+	if (!parent_adapter->pf.main_vsi)
+		return -ENOMEM;
+	parent_adapter->pf.main_vsi->adapter = parent_adapter;
+	parent_adapter->pf.adapter_stopped = 1;
+
 	parent_hw->back = parent_adapter;
 	parent_hw->mac_type = ICE_MAC_GENERIC;
 	parent_hw->vendor_id = ICE_INTEL_VENDOR_ID;