ethdev: change promiscuous callbacks to return status

[dpdk.git] / drivers / net / fm10k / fm10k_ethdev.c

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 2d3c477..f0f6290 100644 (file)
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -44,8 +44,8 @@ int fm10k_logtype_init;
 int fm10k_logtype_driver;
 
 static void fm10k_close_mbx_service(struct fm10k_hw *hw);
-static void fm10k_dev_promiscuous_enable(struct rte_eth_dev *dev);
-static void fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev);
+static int fm10k_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static int fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev);
 static void fm10k_dev_allmulticast_enable(struct rte_eth_dev *dev);
 static void fm10k_dev_allmulticast_disable(struct rte_eth_dev *dev);
 static inline int fm10k_glort_valid(struct fm10k_hw *hw);
@@ -60,8 +60,8 @@ static void fm10k_set_tx_function(struct rte_eth_dev *dev);
 static int fm10k_check_ftag(struct rte_devargs *devargs);
 static int fm10k_link_update(struct rte_eth_dev *dev, int wait_to_complete);
 
-static void fm10k_dev_infos_get(struct rte_eth_dev *dev,
-                               struct rte_eth_dev_info *dev_info);
+static int fm10k_dev_infos_get(struct rte_eth_dev *dev,
+                              struct rte_eth_dev_info *dev_info);
 static uint64_t fm10k_get_rx_queue_offloads_capa(struct rte_eth_dev *dev);
 static uint64_t fm10k_get_rx_port_offloads_capa(struct rte_eth_dev *dev);
 static uint64_t fm10k_get_tx_queue_offloads_capa(struct rte_eth_dev *dev);
@@ -908,7 +908,7 @@ static inline int fm10k_glort_valid(struct fm10k_hw *hw)
                != FM10K_DGLORTMAP_NONE);
 }
 
-static void
+static int
 fm10k_dev_promiscuous_enable(struct rte_eth_dev *dev)
 {
        struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -918,18 +918,22 @@ fm10k_dev_promiscuous_enable(struct rte_eth_dev *dev)
 
        /* Return if it didn't acquire valid glort range */
        if ((hw->mac.type == fm10k_mac_pf) && !fm10k_glort_valid(hw))
-               return;
+               return 0;
 
        fm10k_mbx_lock(hw);
        status = hw->mac.ops.update_xcast_mode(hw, hw->mac.dglort_map,
                                FM10K_XCAST_MODE_PROMISC);
        fm10k_mbx_unlock(hw);
 
-       if (status != FM10K_SUCCESS)
+       if (status != FM10K_SUCCESS) {
                PMD_INIT_LOG(ERR, "Failed to enable promiscuous mode");
+               return -EAGAIN;
+       }
+
+       return 0;
 }
 
-static void
+static int
 fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev)
 {
        struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -940,7 +944,7 @@ fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev)
 
        /* Return if it didn't acquire valid glort range */
        if ((hw->mac.type == fm10k_mac_pf) && !fm10k_glort_valid(hw))
-               return;
+               return 0;
 
        if (dev->data->all_multicast == 1)
                mode = FM10K_XCAST_MODE_ALLMULTI;
@@ -952,8 +956,12 @@ fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev)
                                mode);
        fm10k_mbx_unlock(hw);
 
-       if (status != FM10K_SUCCESS)
+       if (status != FM10K_SUCCESS) {
                PMD_INIT_LOG(ERR, "Failed to disable promiscuous mode");
+               return -EAGAIN;
+       }
+
+       return 0;
 }
 
 static void
@@ -1360,7 +1368,7 @@ fm10k_stats_reset(struct rte_eth_dev *dev)
        fm10k_rebind_hw_stats(hw, hw_stats);
 }
 
-static void
+static int
 fm10k_dev_infos_get(struct rte_eth_dev *dev,
        struct rte_eth_dev_info *dev_info)
 {
@@ -1438,6 +1446,8 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev,
        dev_info->speed_capa = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_2_5G |
                        ETH_LINK_SPEED_10G | ETH_LINK_SPEED_25G |
                        ETH_LINK_SPEED_40G | ETH_LINK_SPEED_100G;
+
+       return 0;
 }
 
 #ifdef RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE
@@ -2381,7 +2391,7 @@ fm10k_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
        else
                FM10K_WRITE_REG(hw, FM10K_VFITR(Q2V(pdev, queue_id)),
                        FM10K_ITR_AUTOMASK | FM10K_ITR_MASK_CLEAR);
-       rte_intr_enable(&pdev->intr_handle);
+       rte_intr_ack(&pdev->intr_handle);
        return 0;
 }
 
@@ -2680,7 +2690,7 @@ fm10k_dev_interrupt_handler_pf(void *param)
        FM10K_WRITE_REG(hw, FM10K_ITR(0), FM10K_ITR_AUTOMASK |
                                        FM10K_ITR_MASK_CLEAR);
        /* Re-enable interrupt from host side */
-       rte_intr_enable(dev->intr_handle);
+       rte_intr_ack(dev->intr_handle);
 }
 
 /**
@@ -2760,7 +2770,7 @@ fm10k_dev_interrupt_handler_vf(void *param)
        FM10K_WRITE_REG(hw, FM10K_VFITR(0), FM10K_ITR_AUTOMASK |
                                        FM10K_ITR_MASK_CLEAR);
        /* Re-enable interrupt from host side */
-       rte_intr_enable(dev->intr_handle);
+       rte_intr_ack(dev->intr_handle);
 }
 
 /* Mailbox message handler in VF */