ethdev: change queue release callback
[dpdk.git] / drivers / net / qede / qede_ethdev.c
index 1a95c01..fd8c62a 100644 (file)
@@ -237,9 +237,6 @@ qede_fw_version_get(struct rte_eth_dev *dev, char *fw_ver, size_t fw_size)
        static char ver_str[QEDE_PMD_DRV_VER_STR_SIZE];
        size_t size;
 
-       if (fw_ver == NULL)
-               return 0;
-
        if (IS_PF(edev))
                snprintf(ver_str, QEDE_PMD_DRV_VER_STR_SIZE, "%s",
                         QEDE_PMD_FW_VERSION);
@@ -1163,12 +1160,13 @@ err:
        return -1; /* common error code is < 0 */
 }
 
-static void qede_dev_stop(struct rte_eth_dev *eth_dev)
+static int qede_dev_stop(struct rte_eth_dev *eth_dev)
 {
        struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
        struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
 
        PMD_INIT_FUNC_TRACE(edev);
+       eth_dev->data->dev_started = 0;
 
        /* Bring the link down */
        qede_dev_set_link_state(eth_dev, false);
@@ -1183,7 +1181,7 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)
 
        /* Disable vport */
        if (qede_activate_vport(eth_dev, false))
-               return;
+               return 0;
 
        if (qdev->enable_lro)
                qede_enable_tpa(eth_dev, false);
@@ -1195,6 +1193,8 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)
        ecore_hw_stop_fastpath(edev); /* TBD - loop */
 
        DP_INFO(edev, "Device is stopped\n");
+
+       return 0;
 }
 
 static const char * const valid_args[] = {
@@ -1549,6 +1549,7 @@ static int qede_dev_close(struct rte_eth_dev *eth_dev)
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
        struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
        struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       int ret = 0;
 
        PMD_INIT_FUNC_TRACE(edev);
 
@@ -1562,7 +1563,7 @@ static int qede_dev_close(struct rte_eth_dev *eth_dev)
         * can release all the resources and device can be brought up newly
         */
        if (eth_dev->data->dev_started)
-               qede_dev_stop(eth_dev);
+               ret = qede_dev_stop(eth_dev);
 
        if (qdev->vport_started)
                qede_stop_vport(edev);
@@ -1593,11 +1594,7 @@ static int qede_dev_close(struct rte_eth_dev *eth_dev)
        if (ECORE_IS_CMT(edev))
                rte_eal_alarm_cancel(qede_poll_sp_sb_cb, (void *)eth_dev);
 
-       eth_dev->dev_ops = NULL;
-       eth_dev->rx_pkt_burst = NULL;
-       eth_dev->tx_pkt_burst = NULL;
-
-       return 0;
+       return ret;
 }
 
 static int
@@ -1885,6 +1882,8 @@ static int qede_allmulticast_enable(struct rte_eth_dev *eth_dev)
            QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC;
        enum _ecore_status_t ecore_status;
 
+       if (rte_eth_promiscuous_get(eth_dev->data->port_id) == 1)
+               type = QED_FILTER_RX_MODE_TYPE_PROMISC;
        ecore_status = qed_configure_filter_rx_mode(eth_dev, type);
 
        return ecore_status >= ECORE_SUCCESS ? 0 : -EAGAIN;
@@ -2137,8 +2136,10 @@ int qede_rss_hash_update(struct rte_eth_dev *eth_dev,
                /* RSS hash key */
                if (key) {
                        if (len > (ECORE_RSS_KEY_SIZE * sizeof(uint32_t))) {
-                               DP_ERR(edev, "RSS key length exceeds limit\n");
-                               return -EINVAL;
+                               len = ECORE_RSS_KEY_SIZE * sizeof(uint32_t);
+                               DP_NOTICE(edev, false,
+                                         "RSS key length too big, trimmed to %d\n",
+                                         len);
                        }
                        DP_INFO(edev, "Applying user supplied hash key\n");
                        rss_params.update_rss_key = 1;
@@ -2342,7 +2343,9 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
        }
        if (dev->data->dev_started) {
                dev->data->dev_started = 0;
-               qede_dev_stop(dev);
+               rc = qede_dev_stop(dev);
+               if (rc != 0)
+                       return rc;
                restart = true;
        }
        rte_delay_ms(1000);
@@ -2365,7 +2368,7 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
                        fp->rxq->rx_buf_size = rc;
                }
        }
-       if (max_rx_pkt_len > RTE_ETHER_MAX_LEN)
+       if (frame_size > QEDE_ETH_MAX_LEN)
                dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
        else
                dev->data->dev_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
@@ -2393,13 +2396,25 @@ qede_dev_reset(struct rte_eth_dev *dev)
        return qede_eth_dev_init(dev);
 }
 
+static void
+qede_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
+{
+       qede_rx_queue_release(dev->data->rx_queues[qid]);
+}
+
+static void
+qede_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
+{
+       qede_tx_queue_release(dev->data->tx_queues[qid]);
+}
+
 static const struct eth_dev_ops qede_eth_dev_ops = {
        .dev_configure = qede_dev_configure,
        .dev_infos_get = qede_dev_info_get,
        .rx_queue_setup = qede_rx_queue_setup,
-       .rx_queue_release = qede_rx_queue_release,
+       .rx_queue_release = qede_dev_rx_queue_release,
        .tx_queue_setup = qede_tx_queue_setup,
-       .tx_queue_release = qede_tx_queue_release,
+       .tx_queue_release = qede_dev_tx_queue_release,
        .dev_start = qede_dev_start,
        .dev_reset = qede_dev_reset,
        .dev_set_link_up = qede_dev_set_link_up,
@@ -2430,7 +2445,7 @@ static const struct eth_dev_ops qede_eth_dev_ops = {
        .reta_update  = qede_rss_reta_update,
        .reta_query  = qede_rss_reta_query,
        .mtu_set = qede_set_mtu,
-       .filter_ctrl = qede_dev_filter_ctrl,
+       .flow_ops_get = qede_dev_flow_ops_get,
        .udp_tunnel_port_add = qede_udp_dst_port_add,
        .udp_tunnel_port_del = qede_udp_dst_port_del,
        .fw_version_get = qede_fw_version_get,
@@ -2441,9 +2456,9 @@ static const struct eth_dev_ops qede_eth_vf_dev_ops = {
        .dev_configure = qede_dev_configure,
        .dev_infos_get = qede_dev_info_get,
        .rx_queue_setup = qede_rx_queue_setup,
-       .rx_queue_release = qede_rx_queue_release,
+       .rx_queue_release = qede_dev_rx_queue_release,
        .tx_queue_setup = qede_tx_queue_setup,
-       .tx_queue_release = qede_tx_queue_release,
+       .tx_queue_release = qede_dev_tx_queue_release,
        .dev_start = qede_dev_start,
        .dev_reset = qede_dev_reset,
        .dev_set_link_up = qede_dev_set_link_up,
@@ -2543,6 +2558,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
        }
 
        rte_eth_copy_pci_info(eth_dev, pci_dev);
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
 
        /* @DPDK */
        edev->vendor_id = pci_dev->id.vendor_id;
@@ -2746,18 +2762,8 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
                qed_ops->sriov_configure(edev, pci_dev->max_vfs);
        }
 
-       /* Pass the information to the rte_eth_dev_close() that it should also
-        * release the private port resources.
-        */
-       eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
-
-       DP_INFO(edev, "MAC address : %02x:%02x:%02x:%02x:%02x:%02x\n",
-               adapter->primary_mac.addr_bytes[0],
-               adapter->primary_mac.addr_bytes[1],
-               adapter->primary_mac.addr_bytes[2],
-               adapter->primary_mac.addr_bytes[3],
-               adapter->primary_mac.addr_bytes[4],
-               adapter->primary_mac.addr_bytes[5]);
+       DP_INFO(edev, "MAC address : " RTE_ETHER_ADDR_PRT_FMT "\n",
+               RTE_ETHER_ADDR_BYTES(&adapter->primary_mac));
 
        DP_INFO(edev, "Device initialized\n");
 
@@ -2893,5 +2899,5 @@ RTE_PMD_REGISTER_KMOD_DEP(net_qede, "* igb_uio | uio_pci_generic | vfio-pci");
 RTE_PMD_REGISTER_PCI(net_qede_vf, rte_qedevf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_qede_vf, pci_id_qedevf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_qede_vf, "* igb_uio | vfio-pci");
-RTE_LOG_REGISTER(qede_logtype_init, pmd.net.qede.init, NOTICE);
-RTE_LOG_REGISTER(qede_logtype_driver, pmd.net.qede.driver, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(qede_logtype_init, init, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(qede_logtype_driver, driver, NOTICE);