net/qede: fix CFLAGS for base files
[dpdk.git] / drivers / net / qede / qede_main.c
index a932c5f..712c03f 100644 (file)
@@ -12,8 +12,6 @@
 
 #include "qede_ethdev.h"
 
-static uint8_t npar_tx_switching = 1;
-
 /* Alarm timeout. */
 #define QEDE_ALARM_TIMEOUT_US 100000
 
@@ -76,7 +74,7 @@ qed_probe(struct ecore_dev *edev, struct rte_pci_device *pci_dev,
 
 static int qed_nic_setup(struct ecore_dev *edev)
 {
-       int rc, i;
+       int rc;
 
        rc = ecore_resc_alloc(edev);
        if (rc)
@@ -224,23 +222,33 @@ static void qed_stop_iov_task(struct ecore_dev *edev)
 static int qed_slowpath_start(struct ecore_dev *edev,
                              struct qed_slowpath_params *params)
 {
-       bool allow_npar_tx_switching;
        const uint8_t *data = NULL;
        struct ecore_hwfn *hwfn;
        struct ecore_mcp_drv_version drv_version;
        struct ecore_hw_init_params hw_init_params;
-       struct qede_dev *qdev = (struct qede_dev *)edev;
+       struct ecore_ptt *p_ptt;
        int rc;
 
-#ifdef CONFIG_ECORE_BINARY_FW
        if (IS_PF(edev)) {
+#ifdef CONFIG_ECORE_BINARY_FW
                rc = qed_load_firmware_data(edev);
                if (rc) {
                        DP_ERR(edev, "Failed to find fw file %s\n", fw_file);
                        goto err;
                }
-       }
 #endif
+               hwfn = ECORE_LEADING_HWFN(edev);
+               if (edev->num_hwfns == 1) { /* skip aRFS for 100G device */
+                       p_ptt = ecore_ptt_acquire(hwfn);
+                       if (p_ptt) {
+                               ECORE_LEADING_HWFN(edev)->p_arfs_ptt = p_ptt;
+                       } else {
+                               DP_ERR(edev, "Failed to acquire PTT for flowdir\n");
+                               rc = -ENOMEM;
+                               goto err;
+                       }
+               }
+       }
 
        rc = qed_nic_setup(edev);
        if (rc)
@@ -256,26 +264,26 @@ static int qed_slowpath_start(struct ecore_dev *edev,
                if (rc) {
                        DP_NOTICE(edev, true,
                        "Failed to allocate stream memory\n");
-                       goto err2;
+                       goto err1;
                }
        }
+#endif
 
        qed_start_iov_task(edev);
-#endif
 
 #ifdef CONFIG_ECORE_BINARY_FW
        if (IS_PF(edev))
                data = (const uint8_t *)edev->firmware + sizeof(u32);
 #endif
 
-       allow_npar_tx_switching = npar_tx_switching ? true : false;
-
        /* Start the slowpath */
        memset(&hw_init_params, 0, sizeof(hw_init_params));
        hw_init_params.b_hw_start = true;
        hw_init_params.int_mode = ECORE_INT_MODE_MSIX;
-       hw_init_params.allow_npar_tx_switch = allow_npar_tx_switching;
+       hw_init_params.allow_npar_tx_switch = true;
        hw_init_params.bin_fw_data = data;
+       hw_init_params.mfw_timeout_val = ECORE_LOAD_REQ_LOCK_TO_DEFAULT;
+       hw_init_params.avoid_eng_reset = false;
        rc = ecore_hw_init(edev, &hw_init_params);
        if (rc) {
                DP_ERR(edev, "ecore_hw_init failed\n");
@@ -297,7 +305,7 @@ static int qed_slowpath_start(struct ecore_dev *edev,
                if (rc) {
                        DP_NOTICE(edev, true,
                                  "Failed sending drv version command\n");
-                       return rc;
+                       goto err3;
                }
        }
 
@@ -305,8 +313,14 @@ static int qed_slowpath_start(struct ecore_dev *edev,
 
        return 0;
 
+err3:
        ecore_hw_stop(edev);
 err2:
+       qed_stop_iov_task(edev);
+#ifdef CONFIG_ECORE_ZIPPED_FW
+       qed_free_stream_mem(edev);
+err1:
+#endif
        ecore_resc_free(edev);
 err:
 #ifdef CONFIG_ECORE_BINARY_FW
@@ -325,8 +339,24 @@ static int
 qed_fill_dev_info(struct ecore_dev *edev, struct qed_dev_info *dev_info)
 {
        struct ecore_ptt *ptt = NULL;
+       struct ecore_tunnel_info *tun = &edev->tunnel;
 
        memset(dev_info, 0, sizeof(struct qed_dev_info));
+
+       if (tun->vxlan.tun_cls == ECORE_TUNN_CLSS_MAC_VLAN &&
+           tun->vxlan.b_mode_enabled)
+               dev_info->vxlan_enable = true;
+
+       if (tun->l2_gre.b_mode_enabled && tun->ip_gre.b_mode_enabled &&
+           tun->l2_gre.tun_cls == ECORE_TUNN_CLSS_MAC_VLAN &&
+           tun->ip_gre.tun_cls == ECORE_TUNN_CLSS_MAC_VLAN)
+               dev_info->gre_enable = true;
+
+       if (tun->l2_geneve.b_mode_enabled && tun->ip_geneve.b_mode_enabled &&
+           tun->l2_geneve.tun_cls == ECORE_TUNN_CLSS_MAC_VLAN &&
+           tun->ip_geneve.tun_cls == ECORE_TUNN_CLSS_MAC_VLAN)
+               dev_info->geneve_enable = true;
+
        dev_info->num_hwfns = edev->num_hwfns;
        dev_info->is_mf_default = IS_MF_DEFAULT(&edev->hwfns[0]);
        dev_info->mtu = ECORE_LEADING_HWFN(edev)->hw_info.mtu;
@@ -334,11 +364,12 @@ qed_fill_dev_info(struct ecore_dev *edev, struct qed_dev_info *dev_info)
        rte_memcpy(&dev_info->hw_mac, &edev->hwfns[0].hw_info.hw_mac_addr,
               ETHER_ADDR_LEN);
 
+       dev_info->fw_major = FW_MAJOR_VERSION;
+       dev_info->fw_minor = FW_MINOR_VERSION;
+       dev_info->fw_rev = FW_REVISION_VERSION;
+       dev_info->fw_eng = FW_ENGINEERING_VERSION;
+
        if (IS_PF(edev)) {
-               dev_info->fw_major = FW_MAJOR_VERSION;
-               dev_info->fw_minor = FW_MINOR_VERSION;
-               dev_info->fw_rev = FW_REVISION_VERSION;
-               dev_info->fw_eng = FW_ENGINEERING_VERSION;
                dev_info->mf_mode = edev->mf_mode;
                dev_info->tx_switching = false;
 
@@ -359,10 +390,6 @@ qed_fill_dev_info(struct ecore_dev *edev, struct qed_dev_info *dev_info)
                        ecore_ptt_release(ECORE_LEADING_HWFN(edev), ptt);
                }
        } else {
-               ecore_vf_get_fw_version(&edev->hwfns[0], &dev_info->fw_major,
-                                       &dev_info->fw_minor, &dev_info->fw_rev,
-                                       &dev_info->fw_eng);
-
                ecore_mcp_get_mfw_ver(ECORE_LEADING_HWFN(edev), ptt,
                                      &dev_info->mfw_rev, NULL);
        }
@@ -373,7 +400,6 @@ qed_fill_dev_info(struct ecore_dev *edev, struct qed_dev_info *dev_info)
 int
 qed_fill_eth_dev_info(struct ecore_dev *edev, struct qed_dev_eth_info *info)
 {
-       struct qede_dev *qdev = (struct qede_dev *)edev;
        uint8_t queues = 0;
        int i;
 
@@ -470,7 +496,6 @@ static void qed_fill_link(struct ecore_hwfn *hwfn,
        struct ecore_mcp_link_params params;
        struct ecore_mcp_link_state link;
        struct ecore_mcp_link_capabilities link_caps;
-       uint32_t media_type;
        uint8_t change = 0;
 
        memset(if_link, 0, sizeof(*if_link));
@@ -618,19 +643,6 @@ static int qed_nic_stop(struct ecore_dev *edev)
        return rc;
 }
 
-static int qed_nic_reset(struct ecore_dev *edev)
-{
-       int rc;
-
-       rc = ecore_hw_reset(edev);
-       if (rc)
-               return rc;
-
-       ecore_resc_free(edev);
-
-       return 0;
-}
-
 static int qed_slowpath_stop(struct ecore_dev *edev)
 {
 #ifdef CONFIG_QED_SRIOV
@@ -649,10 +661,11 @@ static int qed_slowpath_stop(struct ecore_dev *edev)
                if (IS_QED_ETH_IF(edev))
                        qed_sriov_disable(edev, true);
 #endif
-               qed_nic_stop(edev);
        }
 
-       qed_nic_reset(edev);
+       qed_nic_stop(edev);
+
+       ecore_resc_free(edev);
        qed_stop_iov_task(edev);
 
        return 0;
@@ -716,6 +729,7 @@ const struct qed_common_ops qed_common_ops_pass = {
        INIT_STRUCT_FIELD(chain_alloc, &ecore_chain_alloc),
        INIT_STRUCT_FIELD(chain_free, &ecore_chain_free),
        INIT_STRUCT_FIELD(sb_init, &qed_sb_init),
+       INIT_STRUCT_FIELD(get_sb_info, &qed_get_sb_info),
        INIT_STRUCT_FIELD(get_link, &qed_get_current_link),
        INIT_STRUCT_FIELD(set_link, &qed_set_link),
        INIT_STRUCT_FIELD(drain, &qed_drain),