drivers/net: use ack in interrupt handlers

[dpdk.git] / drivers / net / atlantic / atl_ethdev.c

diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c
index 6b39580..3c1b349 100644 (file)
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -157,8 +157,7 @@ static const struct rte_pci_id pci_id_atl_map[] = {
 
 static struct rte_pci_driver rte_atl_pmd = {
        .id_table = pci_id_atl_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 = eth_atl_pci_probe,
        .remove = eth_atl_pci_remove,
 };
@@ -371,8 +370,7 @@ atl_disable_intr(struct aq_hw_s *hw)
 static int
 eth_atl_dev_init(struct rte_eth_dev *eth_dev)
 {
-       struct atl_adapter *adapter =
-               (struct atl_adapter *)eth_dev->data->dev_private;
+       struct atl_adapter *adapter = eth_dev->data->dev_private;
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
@@ -416,7 +414,8 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)
        atl_disable_intr(hw);
 
        /* Allocate memory for storing MAC addresses */
-       eth_dev->data->mac_addrs = rte_zmalloc("atlantic", ETHER_ADDR_LEN, 0);
+       eth_dev->data->mac_addrs = rte_zmalloc("atlantic",
+                                       RTE_ETHER_ADDR_LEN, 0);
        if (eth_dev->data->mac_addrs == NULL) {
                PMD_INIT_LOG(ERR, "MAC Malloc failed");
                return -ENOMEM;
@@ -897,7 +896,8 @@ int atl_macsec_config_txsc(struct rte_eth_dev *dev, uint8_t *mac)
                ATL_DEV_PRIVATE_TO_CFG(dev->data->dev_private);
 
        memset(&cfg->aq_macsec.txsc.mac, 0, sizeof(cfg->aq_macsec.txsc.mac));
-       memcpy((uint8_t *)&cfg->aq_macsec.txsc.mac + 2, mac, ETHER_ADDR_LEN);
+       memcpy((uint8_t *)&cfg->aq_macsec.txsc.mac + 2, mac,
+               RTE_ETHER_ADDR_LEN);
 
        return 0;
 }
@@ -909,7 +909,8 @@ int atl_macsec_config_rxsc(struct rte_eth_dev *dev,
                ATL_DEV_PRIVATE_TO_CFG(dev->data->dev_private);
 
        memset(&cfg->aq_macsec.rxsc.mac, 0, sizeof(cfg->aq_macsec.rxsc.mac));
-       memcpy((uint8_t *)&cfg->aq_macsec.rxsc.mac + 2, mac, ETHER_ADDR_LEN);
+       memcpy((uint8_t *)&cfg->aq_macsec.rxsc.mac + 2, mac,
+               RTE_ETHER_ADDR_LEN);
        cfg->aq_macsec.rxsc.pi = pi;
 
        return 0;
@@ -1012,8 +1013,7 @@ static int
 atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                   unsigned int n)
 {
-       struct atl_adapter *adapter =
-       (struct atl_adapter *)dev->data->dev_private;
+       struct atl_adapter *adapter = dev->data->dev_private;
        struct aq_hw_s *hw = &adapter->hw;
        struct get_stats req = { 0 };
        struct macsec_msg_fw_request msg = { 0 };
@@ -1349,8 +1349,7 @@ atl_dev_interrupt_action(struct rte_eth_dev *dev,
 {
        struct atl_interrupt *intr =
                ATL_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
-       struct atl_adapter *adapter =
-               (struct atl_adapter *)dev->data->dev_private;
+       struct atl_adapter *adapter = dev->data->dev_private;
        struct aq_hw_s *hw = &adapter->hw;
 
        if (!(intr->flags & ATL_FLAG_NEED_LINK_UPDATE))
@@ -1394,7 +1393,7 @@ atl_dev_interrupt_action(struct rte_eth_dev *dev,
        }
 done:
        atl_enable_intr(dev);
-       rte_intr_enable(intr_handle);
+       rte_intr_ack(intr_handle);
 
        return 0;
 }
@@ -1604,11 +1603,11 @@ static int
 atl_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 {
        struct rte_eth_dev_info dev_info;
-       uint32_t frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+       uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
 
        atl_dev_info_get(dev, &dev_info);
 
-       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)
                return -EINVAL;
 
        /* update max frame size */