net/ice: complete device configure in DCF

[dpdk.git] / drivers / net / qede / qede_main.c

diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c
index df83666..02f70be 100644 (file)
--- a/drivers/net/qede/qede_main.c
+++ b/drivers/net/qede/qede_main.c
@@ -18,7 +18,7 @@
 char qede_fw_file[PATH_MAX];
 
 static const char * const QEDE_DEFAULT_FIRMWARE =
-       "/lib/firmware/qed/qed_init_values-8.37.7.0.bin";
+       "/lib/firmware/qed/qed_init_values-8.40.33.0.bin";
 
 static void
 qed_update_pf_params(struct ecore_dev *edev, struct ecore_pf_params *params)
@@ -56,6 +56,10 @@ qed_probe(struct ecore_dev *edev, struct rte_pci_device *pci_dev,
        qed_init_pci(edev, pci_dev);
 
        memset(&hw_prepare_params, 0, sizeof(hw_prepare_params));
+
+       if (is_vf)
+               hw_prepare_params.acquire_retry_cnt = ECORE_VF_ACQUIRE_THRESH;
+
        hw_prepare_params.personality = ECORE_PCI_ETH;
        hw_prepare_params.drv_resc_alloc = false;
        hw_prepare_params.chk_reg_fifo = false;
@@ -288,6 +292,7 @@ static int qed_slowpath_start(struct ecore_dev *edev,
        drv_load_params.mfw_timeout_val = ECORE_LOAD_REQ_LOCK_TO_DEFAULT;
        drv_load_params.avoid_eng_reset = false;
        drv_load_params.override_force_load = ECORE_OVERRIDE_FORCE_LOAD_ALWAYS;
+       hw_init_params.avoid_eng_affin = false;
        hw_init_params.p_drv_load_params = &drv_load_params;
 
        rc = ecore_hw_init(edev, &hw_init_params);
@@ -368,7 +373,7 @@ qed_fill_dev_info(struct ecore_dev *edev, struct qed_dev_info *dev_info)
        dev_info->dev_type = edev->type;
 
        rte_memcpy(&dev_info->hw_mac, &edev->hwfns[0].hw_info.hw_mac_addr,
-              ETHER_ADDR_LEN);
+              RTE_ETHER_ADDR_LEN);
 
        dev_info->fw_major = FW_MAJOR_VERSION;
        dev_info->fw_minor = FW_MINOR_VERSION;
@@ -377,8 +382,8 @@ qed_fill_dev_info(struct ecore_dev *edev, struct qed_dev_info *dev_info)
 
        if (IS_PF(edev)) {
                dev_info->b_inter_pf_switch =
-                       OSAL_TEST_BIT(ECORE_MF_INTER_PF_SWITCH, &edev->mf_bits);
-               if (!OSAL_TEST_BIT(ECORE_MF_DISABLE_ARFS, &edev->mf_bits))
+                       OSAL_GET_BIT(ECORE_MF_INTER_PF_SWITCH, &edev->mf_bits);
+               if (!OSAL_GET_BIT(ECORE_MF_DISABLE_ARFS, &edev->mf_bits))
                        dev_info->b_arfs_capable = true;
                dev_info->tx_switching = false;
 
@@ -389,6 +394,9 @@ qed_fill_dev_info(struct ecore_dev *edev, struct qed_dev_info *dev_info)
                        ecore_mcp_get_mfw_ver(ECORE_LEADING_HWFN(edev), ptt,
                                              &dev_info->mfw_rev, NULL);
 
+                       ecore_mcp_get_mbi_ver(ECORE_LEADING_HWFN(edev), ptt,
+                                             &dev_info->mbi_version);
+
                        ecore_mcp_get_flash_size(ECORE_LEADING_HWFN(edev), ptt,
                                                 &dev_info->flash_size);
 
@@ -433,7 +441,7 @@ qed_fill_eth_dev_info(struct ecore_dev *edev, struct qed_dev_eth_info *info)
                                         max_vf_vlan_filters;
 
                rte_memcpy(&info->port_mac, &edev->hwfns[0].hw_info.hw_mac_addr,
-                          ETHER_ADDR_LEN);
+                          RTE_ETHER_ADDR_LEN);
        } else {
                ecore_vf_get_num_rxqs(ECORE_LEADING_HWFN(edev),
                                      &info->num_queues);
@@ -454,7 +462,7 @@ qed_fill_eth_dev_info(struct ecore_dev *edev, struct qed_dev_eth_info *info)
        qed_fill_dev_info(edev, &info->common);
 
        if (IS_VF(edev))
-               memset(&info->common.hw_mac, 0, ETHER_ADDR_LEN);
+               memset(&info->common.hw_mac, 0, RTE_ETHER_ADDR_LEN);
 
        return 0;
 }