git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
replace snprintf with strlcpy
[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 6ebc028..8327863 100644 (file)
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2018 Aquantia Corporation
  */
 
+#include <rte_string_fns.h>
 #include <rte_ethdev_pci.h>
 
 #include "atl_ethdev.h"
@@ -62,6 +63,17 @@ static void atl_vlan_strip_queue_set(struct rte_eth_dev *dev,
 static int atl_vlan_tpid_set(struct rte_eth_dev *dev,
                             enum rte_vlan_type vlan_type, uint16_t tpid);
 
+/* EEPROM */
+static int atl_dev_get_eeprom_length(struct rte_eth_dev *dev);
+static int atl_dev_get_eeprom(struct rte_eth_dev *dev,
+                             struct rte_dev_eeprom_info *eeprom);
+static int atl_dev_set_eeprom(struct rte_eth_dev *dev,
+                             struct rte_dev_eeprom_info *eeprom);
+
+/* Regs */
+static int atl_dev_get_regs(struct rte_eth_dev *dev,
+                           struct rte_dev_reg_info *regs);
+
 /* Flow control */
 static int atl_flow_ctrl_get(struct rte_eth_dev *dev,
                               struct rte_eth_fc_conf *fc_conf);
@@ -154,7 +166,8 @@ static struct rte_pci_driver rte_atl_pmd = {
                        | DEV_RX_OFFLOAD_IPV4_CKSUM \
                        | DEV_RX_OFFLOAD_UDP_CKSUM \
                        | DEV_RX_OFFLOAD_TCP_CKSUM \
-                       | DEV_RX_OFFLOAD_JUMBO_FRAME)
+                       | DEV_RX_OFFLOAD_JUMBO_FRAME \
+                       | DEV_RX_OFFLOAD_VLAN_FILTER)
 
 #define ATL_TX_OFFLOADS (DEV_TX_OFFLOAD_VLAN_INSERT \
                        | DEV_TX_OFFLOAD_IPV4_CKSUM \
@@ -222,6 +235,8 @@ static const struct eth_dev_ops atl_eth_dev_ops = {
        /* Link */
        .link_update          = atl_dev_link_update,
 
+       .get_reg              = atl_dev_get_regs,
+
        /* Stats */
        .stats_get            = atl_dev_stats_get,
        .xstats_get           = atl_dev_xstats_get,
@@ -259,6 +274,11 @@ static const struct eth_dev_ops atl_eth_dev_ops = {
        .rx_descriptor_status = atl_dev_rx_descriptor_status,
        .tx_descriptor_status = atl_dev_tx_descriptor_status,
 
+       /* EEPROM */
+       .get_eeprom_length    = atl_dev_get_eeprom_length,
+       .get_eeprom           = atl_dev_get_eeprom,
+       .set_eeprom           = atl_dev_set_eeprom,
+
        /* Flow Control */
        .flow_ctrl_get        = atl_flow_ctrl_get,
        .flow_ctrl_set        = atl_flow_ctrl_set,
@@ -447,8 +467,6 @@ atl_dev_start(struct rte_eth_dev *dev)
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        uint32_t intr_vector = 0;
-       uint32_t *link_speeds;
-       uint32_t speed = 0;
        int status;
        int err;
 
@@ -525,6 +543,8 @@ atl_dev_start(struct rte_eth_dev *dev)
                goto error;
        }
 
+       err = atl_dev_set_link_up(dev);
+
        err = hw->aq_fw_ops->update_link_status(hw);
 
        if (err)
@@ -532,26 +552,6 @@ atl_dev_start(struct rte_eth_dev *dev)
 
        dev->data->dev_link.link_status = hw->aq_link_status.mbps != 0;
 
-       link_speeds = &dev->data->dev_conf.link_speeds;
-
-       speed = 0x0;
-
-       if (*link_speeds == ETH_LINK_SPEED_AUTONEG) {
-               speed = hw->aq_nic_cfg->link_speed_msk;
-       } else {
-               if (*link_speeds & ETH_LINK_SPEED_10G)
-                       speed |= AQ_NIC_RATE_10G;
-               if (*link_speeds & ETH_LINK_SPEED_5G)
-                       speed |= AQ_NIC_RATE_5G;
-               if (*link_speeds & ETH_LINK_SPEED_1G)
-                       speed |= AQ_NIC_RATE_1G;
-               if (*link_speeds & ETH_LINK_SPEED_2_5G)
-                       speed |=  AQ_NIC_RATE_2G5;
-               if (*link_speeds & ETH_LINK_SPEED_100M)
-                       speed |= AQ_NIC_RATE_100M;
-       }
-
-       err = hw->aq_fw_ops->set_link_speed(hw, speed);
        if (err)
                goto error;
 
@@ -639,9 +639,25 @@ static int
 atl_dev_set_link_up(struct rte_eth_dev *dev)
 {
        struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       uint32_t link_speeds = dev->data->dev_conf.link_speeds;
+       uint32_t speed_mask = 0;
+
+       if (link_speeds == ETH_LINK_SPEED_AUTONEG) {
+               speed_mask = hw->aq_nic_cfg->link_speed_msk;
+       } else {
+               if (link_speeds & ETH_LINK_SPEED_10G)
+                       speed_mask |= AQ_NIC_RATE_10G;
+               if (link_speeds & ETH_LINK_SPEED_5G)
+                       speed_mask |= AQ_NIC_RATE_5G;
+               if (link_speeds & ETH_LINK_SPEED_1G)
+                       speed_mask |= AQ_NIC_RATE_1G;
+               if (link_speeds & ETH_LINK_SPEED_2_5G)
+                       speed_mask |=  AQ_NIC_RATE_2G5;
+               if (link_speeds & ETH_LINK_SPEED_100M)
+                       speed_mask |= AQ_NIC_RATE_100M;
+       }
 
-       return hw->aq_fw_ops->set_link_speed(hw,
-                       hw->aq_nic_cfg->link_speed_msk);
+       return hw->aq_fw_ops->set_link_speed(hw, speed_mask);
 }
 
 /*
@@ -740,10 +756,10 @@ atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
                return RTE_DIM(atl_xstats_tbl);
 
        for (i = 0; i < size && i < RTE_DIM(atl_xstats_tbl); i++)
-               snprintf(xstats_names[i].name, RTE_ETH_XSTATS_NAME_SIZE, "%s",
-                       atl_xstats_tbl[i].name);
+               strlcpy(xstats_names[i].name, atl_xstats_tbl[i].name,
+                       RTE_ETH_XSTATS_NAME_SIZE);
 
-       return size;
+       return i;
 }
 
 static int
@@ -763,7 +779,7 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                                        atl_xstats_tbl[i].offset);
        }
 
-       return n;
+       return i;
 }
 
 static int
@@ -1076,6 +1092,78 @@ atl_dev_interrupt_handler(void *param)
        atl_dev_interrupt_action(dev, dev->intr_handle);
 }
 
+#define SFP_EEPROM_SIZE 0xff
+
+static int
+atl_dev_get_eeprom_length(struct rte_eth_dev *dev __rte_unused)
+{
+       return SFP_EEPROM_SIZE;
+}
+
+int atl_dev_get_eeprom(struct rte_eth_dev *dev,
+                      struct rte_dev_eeprom_info *eeprom)
+{
+       struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       uint32_t dev_addr = SMBUS_DEVICE_ID;
+
+       if (hw->aq_fw_ops->get_eeprom == NULL)
+               return -ENOTSUP;
+
+       if (eeprom->length + eeprom->offset > SFP_EEPROM_SIZE ||
+           eeprom->data == NULL)
+               return -EINVAL;
+
+       if (eeprom->magic)
+               dev_addr = eeprom->magic;
+
+       return hw->aq_fw_ops->get_eeprom(hw, dev_addr, eeprom->data,
+                                        eeprom->length, eeprom->offset);
+}
+
+int atl_dev_set_eeprom(struct rte_eth_dev *dev,
+                      struct rte_dev_eeprom_info *eeprom)
+{
+       struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       uint32_t dev_addr = SMBUS_DEVICE_ID;
+
+       if (hw->aq_fw_ops->set_eeprom == NULL)
+               return -ENOTSUP;
+
+       if (eeprom->length != SFP_EEPROM_SIZE || eeprom->data == NULL)
+               return -EINVAL;
+
+       if (eeprom->magic)
+               dev_addr = eeprom->magic;
+
+       return hw->aq_fw_ops->set_eeprom(hw, dev_addr,
+                                        eeprom->data, eeprom->length);
+}
+
+static int
+atl_dev_get_regs(struct rte_eth_dev *dev, struct rte_dev_reg_info *regs)
+{
+       struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       u32 mif_id;
+       int err;
+
+       if (regs->data == NULL) {
+               regs->length = hw_atl_utils_hw_get_reg_length();
+               regs->width = sizeof(u32);
+               return 0;
+       }
+
+       /* Only full register dump is supported */
+       if (regs->length && regs->length != hw_atl_utils_hw_get_reg_length())
+               return -ENOTSUP;
+
+       err = hw_atl_utils_hw_get_regs(hw, regs->data);
+
+       /* Device version */
+       mif_id = hw_atl_reg_glb_mif_id_get(hw);
+       regs->version = mif_id & 0xFFU;
+
+       return err;
+}
 
 static int
 atl_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
DPDK repo used for reviews