net/mlx5: rearrange creation of WQ and CQ object

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

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index c4f8f12..70d48e4 100644 (file)
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -7,13 +7,8 @@
 #include "qede_ethdev.h"
 #include <rte_string_fns.h>
 #include <rte_alarm.h>
-#include <rte_version.h>
 #include <rte_kvargs.h>
 
-/* Globals */
-int qede_logtype_init;
-int qede_logtype_driver;
-
 static const struct qed_eth_ops *qed_ops;
 static int qede_eth_dev_uninit(struct rte_eth_dev *eth_dev);
 static int qede_eth_dev_init(struct rte_eth_dev *eth_dev);
@@ -625,17 +620,16 @@ qed_configure_filter_rx_mode(struct rte_eth_dev *eth_dev,
                ECORE_ACCEPT_BCAST;
 
        if (type == QED_FILTER_RX_MODE_TYPE_PROMISC) {
-               flags.rx_accept_filter |= ECORE_ACCEPT_UCAST_UNMATCHED;
+               flags.rx_accept_filter |= (ECORE_ACCEPT_UCAST_UNMATCHED |
+                                          ECORE_ACCEPT_MCAST_UNMATCHED);
                if (IS_VF(edev)) {
-                       flags.tx_accept_filter |= ECORE_ACCEPT_UCAST_UNMATCHED;
-                       DP_INFO(edev, "Enabling Tx unmatched flag for VF\n");
+                       flags.tx_accept_filter |=
+                                               (ECORE_ACCEPT_UCAST_UNMATCHED |
+                                                ECORE_ACCEPT_MCAST_UNMATCHED);
+                       DP_INFO(edev, "Enabling Tx unmatched flags for VF\n");
                }
        } else if (type == QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC) {
                flags.rx_accept_filter |= ECORE_ACCEPT_MCAST_UNMATCHED;
-       } else if (type == (QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC |
-                               QED_FILTER_RX_MODE_TYPE_PROMISC)) {
-               flags.rx_accept_filter |= ECORE_ACCEPT_UCAST_UNMATCHED |
-                       ECORE_ACCEPT_MCAST_UNMATCHED;
        }
 
        return ecore_filter_accept_cmd(edev, 0, flags, false, false,
@@ -1036,9 +1030,6 @@ static int qede_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask)
                }
        }
 
-       if (mask & ETH_VLAN_EXTEND_MASK)
-               DP_ERR(edev, "Extend VLAN not supported\n");
-
        qdev->vlan_offload_mask = mask;
 
        DP_INFO(edev, "VLAN offload mask %d\n", mask);
@@ -1502,16 +1493,13 @@ qede_link_update(struct rte_eth_dev *eth_dev, __rte_unused int wait_to_complete)
 
 static int qede_promiscuous_enable(struct rte_eth_dev *eth_dev)
 {
-       struct qede_dev *qdev = eth_dev->data->dev_private;
-       struct ecore_dev *edev = &qdev->edev;
-       enum qed_filter_rx_mode_type type = QED_FILTER_RX_MODE_TYPE_PROMISC;
        enum _ecore_status_t ecore_status;
+       struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       enum qed_filter_rx_mode_type type = QED_FILTER_RX_MODE_TYPE_PROMISC;
 
        PMD_INIT_FUNC_TRACE(edev);
 
-       if (rte_eth_allmulticast_get(eth_dev->data->port_id) == 1)
-               type |= QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC;
-
        ecore_status = qed_configure_filter_rx_mode(eth_dev, type);
 
        return ecore_status >= ECORE_SUCCESS ? 0 : -EAGAIN;
@@ -1885,9 +1873,6 @@ 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;
@@ -2438,6 +2423,7 @@ static const struct eth_dev_ops qede_eth_dev_ops = {
        .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,
+       .get_reg = qede_get_regs,
 };
 
 static const struct eth_dev_ops qede_eth_vf_dev_ops = {
@@ -2870,13 +2856,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_INIT(qede_init_log)
-{
-       qede_logtype_init = rte_log_register("pmd.net.qede.init");
-       if (qede_logtype_init >= 0)
-               rte_log_set_level(qede_logtype_init, RTE_LOG_NOTICE);
-       qede_logtype_driver = rte_log_register("pmd.net.qede.driver");
-       if (qede_logtype_driver >= 0)
-               rte_log_set_level(qede_logtype_driver, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(qede_logtype_init, pmd.net.qede.init, NOTICE);
+RTE_LOG_REGISTER(qede_logtype_driver, pmd.net.qede.driver, NOTICE);