git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/atlantic: fix reported flow control mode
[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 fdc0a7f..d5c2ec5 100644 (file)
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -24,10 +24,10 @@ static int  atl_dev_set_link_up(struct rte_eth_dev *dev);
 static int  atl_dev_set_link_down(struct rte_eth_dev *dev);
 static void atl_dev_close(struct rte_eth_dev *dev);
 static int  atl_dev_reset(struct rte_eth_dev *dev);
-static void atl_dev_promiscuous_enable(struct rte_eth_dev *dev);
-static void atl_dev_promiscuous_disable(struct rte_eth_dev *dev);
-static void atl_dev_allmulticast_enable(struct rte_eth_dev *dev);
-static void atl_dev_allmulticast_disable(struct rte_eth_dev *dev);
+static int  atl_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static int  atl_dev_promiscuous_disable(struct rte_eth_dev *dev);
+static int atl_dev_allmulticast_enable(struct rte_eth_dev *dev);
+static int atl_dev_allmulticast_disable(struct rte_eth_dev *dev);
 static int  atl_dev_link_update(struct rte_eth_dev *dev, int wait);
 
 static int atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
@@ -40,14 +40,11 @@ static int atl_dev_stats_get(struct rte_eth_dev *dev,
 static int atl_dev_xstats_get(struct rte_eth_dev *dev,
                              struct rte_eth_xstat *stats, unsigned int n);
 
-static void atl_dev_stats_reset(struct rte_eth_dev *dev);
+static int atl_dev_stats_reset(struct rte_eth_dev *dev);
 
 static int atl_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
                              size_t fw_size);
 
-static void atl_dev_info_get(struct rte_eth_dev *dev,
-                              struct rte_eth_dev_info *dev_info);
-
 static const uint32_t *atl_dev_supported_ptypes_get(struct rte_eth_dev *dev);
 
 static int atl_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
@@ -120,7 +117,7 @@ static int eth_atl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
        struct rte_pci_device *pci_dev);
 static int eth_atl_pci_remove(struct rte_pci_device *pci_dev);
 
-static void atl_dev_info_get(struct rte_eth_dev *dev,
+static int atl_dev_info_get(struct rte_eth_dev *dev,
                                struct rte_eth_dev_info *dev_info);
 
 int atl_logtype_init;
@@ -157,8 +154,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,
 };
@@ -979,7 +975,7 @@ atl_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        return 0;
 }
 
-static void
+static int
 atl_dev_stats_reset(struct rte_eth_dev *dev)
 {
        struct atl_adapter *adapter = ATL_DEV_TO_ADAPTER(dev);
@@ -991,6 +987,28 @@ atl_dev_stats_reset(struct rte_eth_dev *dev)
        memset(&hw->curr_stats, 0, sizeof(hw->curr_stats));
 
        memset(&adapter->sw_stats, 0, sizeof(adapter->sw_stats));
+
+       return 0;
+}
+
+static int
+atl_dev_xstats_get_count(struct rte_eth_dev *dev)
+{
+       struct atl_adapter *adapter =
+               (struct atl_adapter *)dev->data->dev_private;
+
+       struct aq_hw_s *hw = &adapter->hw;
+       unsigned int i, count = 0;
+
+       for (i = 0; i < RTE_DIM(atl_xstats_tbl); i++) {
+               if (atl_xstats_tbl[i].type == XSTATS_TYPE_MACSEC &&
+                       ((hw->caps_lo & BIT(CAPS_LO_MACSEC)) == 0))
+                       continue;
+
+               count++;
+       }
+
+       return count;
 }
 
 static int
@@ -999,15 +1017,17 @@ atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
                         unsigned int size)
 {
        unsigned int i;
+       unsigned int count = atl_dev_xstats_get_count(dev);
 
-       if (!xstats_names)
-               return RTE_DIM(atl_xstats_tbl);
-
-       for (i = 0; i < size && i < RTE_DIM(atl_xstats_tbl); i++)
-               strlcpy(xstats_names[i].name, atl_xstats_tbl[i].name,
-                       RTE_ETH_XSTATS_NAME_SIZE);
+       if (xstats_names) {
+               for (i = 0; i < size && i < count; i++) {
+                       snprintf(xstats_names[i].name,
+                               RTE_ETH_XSTATS_NAME_SIZE, "%s",
+                               atl_xstats_tbl[i].name);
+               }
+       }
 
-       return i;
+       return count;
 }
 
 static int
@@ -1021,9 +1041,10 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
        struct macsec_msg_fw_response resp = { 0 };
        int err = -1;
        unsigned int i;
+       unsigned int count = atl_dev_xstats_get_count(dev);
 
        if (!stats)
-               return 0;
+               return count;
 
        if (hw->aq_fw_ops->send_macsec_req != NULL) {
                req.ingress_sa_index = 0xff;
@@ -1036,7 +1057,7 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                err = hw->aq_fw_ops->send_macsec_req(hw, &msg, &resp);
        }
 
-       for (i = 0; i < n && i < RTE_DIM(atl_xstats_tbl); i++) {
+       for (i = 0; i < n && i < count; i++) {
                stats[i].id = i;
 
                switch (atl_xstats_tbl[i].type) {
@@ -1045,14 +1066,15 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                                         atl_xstats_tbl[i].offset);
                        break;
                case XSTATS_TYPE_MACSEC:
-                       if (err)
-                               goto done;
-                       stats[i].value = *(u64 *)((uint8_t *)&resp.stats +
-                                        atl_xstats_tbl[i].offset);
+                       if (!err) {
+                               stats[i].value =
+                                       *(u64 *)((uint8_t *)&resp.stats +
+                                       atl_xstats_tbl[i].offset);
+                       }
                        break;
                }
        }
-done:
+
        return i;
 }
 
@@ -1078,7 +1100,7 @@ atl_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
        return 0;
 }
 
-static void
+static int
 atl_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
@@ -1119,6 +1141,8 @@ atl_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->speed_capa |= ETH_LINK_SPEED_100M;
        dev_info->speed_capa |= ETH_LINK_SPEED_2_5G;
        dev_info->speed_capa |= ETH_LINK_SPEED_5G;
+
+       return 0;
 }
 
 static const uint32_t *
@@ -1209,39 +1233,47 @@ atl_dev_link_update(struct rte_eth_dev *dev, int wait __rte_unused)
        return 0;
 }
 
-static void
+static int
 atl_dev_promiscuous_enable(struct rte_eth_dev *dev)
 {
        struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        hw_atl_rpfl2promiscuous_mode_en_set(hw, true);
+
+       return 0;
 }
 
-static void
+static int
 atl_dev_promiscuous_disable(struct rte_eth_dev *dev)
 {
        struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        hw_atl_rpfl2promiscuous_mode_en_set(hw, false);
+
+       return 0;
 }
 
-static void
+static int
 atl_dev_allmulticast_enable(struct rte_eth_dev *dev)
 {
        struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        hw_atl_rpfl2_accept_all_mc_packets_set(hw, true);
+
+       return 0;
 }
 
-static void
+static int
 atl_dev_allmulticast_disable(struct rte_eth_dev *dev)
 {
        struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if (dev->data->promiscuous == 1)
-               return; /* must remain in all_multicast mode */
+               return 0; /* must remain in all_multicast mode */
 
        hw_atl_rpfl2_accept_all_mc_packets_set(hw, false);
+
+       return 0;
 }
 
 /**
@@ -1394,7 +1426,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;
 }
@@ -1512,11 +1544,11 @@ atl_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 
        if (fc == AQ_NIC_FC_OFF)
                fc_conf->mode = RTE_FC_NONE;
-       else if (fc & (AQ_NIC_FC_RX | AQ_NIC_FC_TX))
+       else if ((fc & AQ_NIC_FC_RX) && (fc & AQ_NIC_FC_TX))
                fc_conf->mode = RTE_FC_FULL;
        else if (fc & AQ_NIC_FC_RX)
                fc_conf->mode = RTE_FC_RX_PAUSE;
-       else if (fc & AQ_NIC_FC_RX)
+       else if (fc & AQ_NIC_FC_TX)
                fc_conf->mode = RTE_FC_TX_PAUSE;
 
        return 0;
@@ -1604,9 +1636,12 @@ static int
 atl_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 {
        struct rte_eth_dev_info dev_info;
+       int ret;
        uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
 
-       atl_dev_info_get(dev, &dev_info);
+       ret = atl_dev_info_get(dev, &dev_info);
+       if (ret != 0)
+               return ret;
 
        if (mtu < RTE_ETHER_MIN_MTU || frame_size > dev_info.max_rx_pktlen)
                return -EINVAL;
DPDK repo used for reviews