net/mlx5: add VLAN push/pop DR commands to glue

[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 c7fadf2..528b33e 100644 (file)
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -248,8 +248,8 @@ qede_interrupt_handler_intx(void *param)
        if (status & 0x1) {
                qede_interrupt_action(ECORE_LEADING_HWFN(edev));
 
-               if (rte_intr_enable(eth_dev->intr_handle))
-                       DP_ERR(edev, "rte_intr_enable failed\n");
+               if (rte_intr_ack(eth_dev->intr_handle))
+                       DP_ERR(edev, "rte_intr_ack failed\n");
        }
 }
 
@@ -261,8 +261,8 @@ qede_interrupt_handler(void *param)
        struct ecore_dev *edev = &qdev->edev;
 
        qede_interrupt_action(ECORE_LEADING_HWFN(edev));
-       if (rte_intr_enable(eth_dev->intr_handle))
-               DP_ERR(edev, "rte_intr_enable failed\n");
+       if (rte_intr_ack(eth_dev->intr_handle))
+               DP_ERR(edev, "rte_intr_ack failed\n");
 }
 
 static void
@@ -565,7 +565,7 @@ qede_ucast_filter(struct rte_eth_dev *eth_dev, struct ecore_filter_ucast *ucast,
        if (add) {
                SLIST_FOREACH(tmp, &qdev->uc_list_head, list) {
                        if ((memcmp(mac_addr, &tmp->mac,
-                                   ETHER_ADDR_LEN) == 0) &&
+                                   RTE_ETHER_ADDR_LEN) == 0) &&
                             ucast->vni == tmp->vni &&
                             ucast->vlan == tmp->vlan) {
                                DP_INFO(edev, "Unicast MAC is already added"
@@ -588,7 +588,7 @@ qede_ucast_filter(struct rte_eth_dev *eth_dev, struct ecore_filter_ucast *ucast,
        } else {
                SLIST_FOREACH(tmp, &qdev->uc_list_head, list) {
                        if ((memcmp(mac_addr, &tmp->mac,
-                                   ETHER_ADDR_LEN) == 0) &&
+                                   RTE_ETHER_ADDR_LEN) == 0) &&
                            ucast->vlan == tmp->vlan      &&
                            ucast->vni == tmp->vni)
                        break;
@@ -1216,7 +1216,7 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)
        if (rxmode->offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
                eth_dev->data->mtu =
                        eth_dev->data->dev_conf.rxmode.max_rx_pkt_len -
-                       ETHER_HDR_LEN - QEDE_ETH_OVERHEAD;
+                       RTE_ETHER_HDR_LEN - QEDE_ETH_OVERHEAD;
 
        if (rxmode->offloads & DEV_RX_OFFLOAD_SCATTER)
                eth_dev->data->scattered_rx = 1;
@@ -1426,7 +1426,6 @@ static void qede_poll_sp_sb_cb(void *param)
        if (rc != 0) {
                DP_ERR(edev, "Unable to start periodic"
                             " timer rc %d\n", rc);
-               assert(false && "Unable to start periodic timer");
        }
 }
 
@@ -2232,9 +2231,9 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
        qede_dev_info_get(dev, &dev_info);
        max_rx_pkt_len = mtu + QEDE_MAX_ETHER_HDR_LEN;
        frame_size = max_rx_pkt_len;
-       if ((mtu < ETHER_MIN_MTU) || (frame_size > dev_info.max_rx_pktlen)) {
+       if (mtu < RTE_ETHER_MIN_MTU || frame_size > dev_info.max_rx_pktlen) {
                DP_ERR(edev, "MTU %u out of range, %u is maximum allowable\n",
-                      mtu, dev_info.max_rx_pktlen - ETHER_HDR_LEN -
+                      mtu, dev_info.max_rx_pktlen - RTE_ETHER_HDR_LEN -
                       QEDE_ETH_OVERHEAD);
                return -EINVAL;
        }
@@ -2274,7 +2273,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 > ETHER_MAX_LEN)
+       if (max_rx_pkt_len > RTE_ETHER_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;
@@ -2408,7 +2407,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
        struct qed_slowpath_params params;
        static bool do_once = true;
        uint8_t bulletin_change;
-       uint8_t vf_mac[ETHER_ADDR_LEN];
+       uint8_t vf_mac[RTE_ETHER_ADDR_LEN];
        uint8_t is_mac_forced;
        bool is_mac_exist;
        /* Fix up ecore debug level */
@@ -2538,7 +2537,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
 
        /* Allocate memory for storing MAC addr */
        eth_dev->data->mac_addrs = rte_zmalloc(edev->name,
-                                       (ETHER_ADDR_LEN *
+                                       (RTE_ETHER_ADDR_LEN *
                                        adapter->dev_info.num_mac_filters),
                                        RTE_CACHE_LINE_SIZE);
 
@@ -2596,7 +2595,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
        SLIST_INIT(&adapter->vlan_list_head);
        SLIST_INIT(&adapter->uc_list_head);
        SLIST_INIT(&adapter->mc_list_head);
-       adapter->mtu = ETHER_MTU;
+       adapter->mtu = RTE_ETHER_MTU;
        adapter->vport_started = false;
 
        /* VF tunnel offloads is enabled by default in PF driver */
@@ -2738,8 +2737,7 @@ static int qedevf_eth_dev_pci_remove(struct rte_pci_device *pci_dev)
 
 static struct rte_pci_driver rte_qedevf_pmd = {
        .id_table = pci_id_qedevf_map,
-       .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
-                    RTE_PCI_DRV_IOVA_AS_VA,
+       .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
        .probe = qedevf_eth_dev_pci_probe,
        .remove = qedevf_eth_dev_pci_remove,
 };
@@ -2758,8 +2756,7 @@ static int qede_eth_dev_pci_remove(struct rte_pci_device *pci_dev)
 
 static struct rte_pci_driver rte_qede_pmd = {
        .id_table = pci_id_qede_map,
-       .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
-                    RTE_PCI_DRV_IOVA_AS_VA,
+       .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
        .probe = qede_eth_dev_pci_probe,
        .remove = qede_eth_dev_pci_remove,
 };