remove useless memzone includes
[dpdk.git] / drivers / net / dpaa / dpaa_ethdev.c
index a11edeb..cf5a2ec 100644 (file)
@@ -41,7 +41,6 @@
 #include <sys/types.h>
 #include <sys/syscall.h>
 
-#include <rte_config.h>
 #include <rte_byteorder.h>
 #include <rte_common.h>
 #include <rte_interrupts.h>
@@ -51,7 +50,6 @@
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_alarm.h>
 /* Keep track of whether QMAN and BMAN have been globally initialized */
 static int is_global_init;
 
+struct rte_dpaa_xstats_name_off {
+       char name[RTE_ETH_XSTATS_NAME_SIZE];
+       uint32_t offset;
+};
+
+static const struct rte_dpaa_xstats_name_off dpaa_xstats_strings[] = {
+       {"rx_align_err",
+               offsetof(struct dpaa_if_stats, raln)},
+       {"rx_valid_pause",
+               offsetof(struct dpaa_if_stats, rxpf)},
+       {"rx_fcs_err",
+               offsetof(struct dpaa_if_stats, rfcs)},
+       {"rx_vlan_frame",
+               offsetof(struct dpaa_if_stats, rvlan)},
+       {"rx_frame_err",
+               offsetof(struct dpaa_if_stats, rerr)},
+       {"rx_drop_err",
+               offsetof(struct dpaa_if_stats, rdrp)},
+       {"rx_undersized",
+               offsetof(struct dpaa_if_stats, rund)},
+       {"rx_oversize_err",
+               offsetof(struct dpaa_if_stats, rovr)},
+       {"rx_fragment_pkt",
+               offsetof(struct dpaa_if_stats, rfrg)},
+       {"tx_valid_pause",
+               offsetof(struct dpaa_if_stats, txpf)},
+       {"tx_fcs_err",
+               offsetof(struct dpaa_if_stats, terr)},
+       {"tx_vlan_frame",
+               offsetof(struct dpaa_if_stats, tvlan)},
+       {"rx_undersized",
+               offsetof(struct dpaa_if_stats, tund)},
+};
+
 static int
 dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 {
@@ -112,6 +144,28 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
        return 0;
 }
 
+static const uint32_t *
+dpaa_supported_ptypes_get(struct rte_eth_dev *dev)
+{
+       static const uint32_t ptypes[] = {
+               /*todo -= add more types */
+               RTE_PTYPE_L2_ETHER,
+               RTE_PTYPE_L3_IPV4,
+               RTE_PTYPE_L3_IPV4_EXT,
+               RTE_PTYPE_L3_IPV6,
+               RTE_PTYPE_L3_IPV6_EXT,
+               RTE_PTYPE_L4_TCP,
+               RTE_PTYPE_L4_UDP,
+               RTE_PTYPE_L4_SCTP
+       };
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dev->rx_pkt_burst == dpaa_eth_queue_rx)
+               return ptypes;
+       return NULL;
+}
+
 static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
 {
        struct dpaa_if *dpaa_intf = dev->data->dev_private;
@@ -142,6 +196,41 @@ static void dpaa_eth_dev_close(struct rte_eth_dev *dev)
        dpaa_eth_dev_stop(dev);
 }
 
+static int
+dpaa_fw_version_get(struct rte_eth_dev *dev __rte_unused,
+                    char *fw_version,
+                    size_t fw_size)
+{
+       int ret;
+       FILE *svr_file = NULL;
+       unsigned int svr_ver = 0;
+
+       PMD_INIT_FUNC_TRACE();
+
+       svr_file = fopen(DPAA_SOC_ID_FILE, "r");
+       if (!svr_file) {
+               DPAA_PMD_ERR("Unable to open SoC device");
+               return -ENOTSUP; /* Not supported on this infra */
+       }
+
+       ret = fscanf(svr_file, "svr:%x", &svr_ver);
+       if (ret <= 0) {
+               DPAA_PMD_ERR("Unable to read SoC device");
+               return -ENOTSUP; /* Not supported on this infra */
+       }
+
+       ret = snprintf(fw_version, fw_size,
+                      "svr:%x-fman-v%x",
+                      svr_ver,
+                      fman_ip_rev);
+
+       ret += 1; /* add the size of '\0' */
+       if (fw_size < (uint32_t)ret)
+               return ret;
+       else
+               return 0;
+}
+
 static void dpaa_eth_dev_info(struct rte_eth_dev *dev,
                              struct rte_eth_dev_info *dev_info)
 {
@@ -160,6 +249,14 @@ static void dpaa_eth_dev_info(struct rte_eth_dev *dev,
        dev_info->flow_type_rss_offloads = DPAA_RSS_OFFLOAD_ALL;
        dev_info->speed_capa = (ETH_LINK_SPEED_1G |
                                ETH_LINK_SPEED_10G);
+       dev_info->rx_offload_capa =
+               (DEV_RX_OFFLOAD_IPV4_CKSUM |
+               DEV_RX_OFFLOAD_UDP_CKSUM   |
+               DEV_RX_OFFLOAD_TCP_CKSUM);
+       dev_info->tx_offload_capa =
+               (DEV_TX_OFFLOAD_IPV4_CKSUM  |
+               DEV_TX_OFFLOAD_UDP_CKSUM   |
+               DEV_TX_OFFLOAD_TCP_CKSUM);
 }
 
 static int dpaa_eth_link_update(struct rte_eth_dev *dev,
@@ -184,7 +281,7 @@ static int dpaa_eth_link_update(struct rte_eth_dev *dev,
        return 0;
 }
 
-static void dpaa_eth_stats_get(struct rte_eth_dev *dev,
+static int dpaa_eth_stats_get(struct rte_eth_dev *dev,
                               struct rte_eth_stats *stats)
 {
        struct dpaa_if *dpaa_intf = dev->data->dev_private;
@@ -192,6 +289,7 @@ static void dpaa_eth_stats_get(struct rte_eth_dev *dev,
        PMD_INIT_FUNC_TRACE();
 
        fman_if_stats_get(dpaa_intf->fif, stats);
+       return 0;
 }
 
 static void dpaa_eth_stats_reset(struct rte_eth_dev *dev)
@@ -203,6 +301,110 @@ static void dpaa_eth_stats_reset(struct rte_eth_dev *dev)
        fman_if_stats_reset(dpaa_intf->fif);
 }
 
+static int
+dpaa_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
+                   unsigned int n)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       unsigned int i = 0, num = RTE_DIM(dpaa_xstats_strings);
+       uint64_t values[sizeof(struct dpaa_if_stats) / 8];
+
+       if (xstats == NULL)
+               return 0;
+
+       if (n < num)
+               return num;
+
+       fman_if_stats_get_all(dpaa_intf->fif, values,
+                             sizeof(struct dpaa_if_stats) / 8);
+
+       for (i = 0; i < num; i++) {
+               xstats[i].id = i;
+               xstats[i].value = values[dpaa_xstats_strings[i].offset / 8];
+       }
+       return i;
+}
+
+static int
+dpaa_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
+                     struct rte_eth_xstat_name *xstats_names,
+                     __rte_unused unsigned int limit)
+{
+       unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings);
+
+       if (xstats_names != NULL)
+               for (i = 0; i < stat_cnt; i++)
+                       snprintf(xstats_names[i].name,
+                                sizeof(xstats_names[i].name),
+                                "%s",
+                                dpaa_xstats_strings[i].name);
+
+       return stat_cnt;
+}
+
+static int
+dpaa_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
+                     uint64_t *values, unsigned int n)
+{
+       unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings);
+       uint64_t values_copy[sizeof(struct dpaa_if_stats) / 8];
+
+       if (!ids) {
+               struct dpaa_if *dpaa_intf = dev->data->dev_private;
+
+               if (n < stat_cnt)
+                       return stat_cnt;
+
+               if (!values)
+                       return 0;
+
+               fman_if_stats_get_all(dpaa_intf->fif, values_copy,
+                                     sizeof(struct dpaa_if_stats));
+
+               for (i = 0; i < stat_cnt; i++)
+                       values[i] =
+                               values_copy[dpaa_xstats_strings[i].offset / 8];
+
+               return stat_cnt;
+       }
+
+       dpaa_xstats_get_by_id(dev, NULL, values_copy, stat_cnt);
+
+       for (i = 0; i < n; i++) {
+               if (ids[i] >= stat_cnt) {
+                       DPAA_PMD_ERR("id value isn't valid");
+                       return -1;
+               }
+               values[i] = values_copy[ids[i]];
+       }
+       return n;
+}
+
+static int
+dpaa_xstats_get_names_by_id(
+       struct rte_eth_dev *dev,
+       struct rte_eth_xstat_name *xstats_names,
+       const uint64_t *ids,
+       unsigned int limit)
+{
+       unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings);
+       struct rte_eth_xstat_name xstats_names_copy[stat_cnt];
+
+       if (!ids)
+               return dpaa_xstats_get_names(dev, xstats_names, limit);
+
+       dpaa_xstats_get_names(dev, xstats_names_copy, limit);
+
+       for (i = 0; i < limit; i++) {
+               if (ids[i] >= stat_cnt) {
+                       DPAA_PMD_ERR("id value isn't valid");
+                       return -1;
+               }
+               strcpy(xstats_names[i].name, xstats_names_copy[ids[i]].name);
+       }
+       return limit;
+}
+
 static void dpaa_eth_promiscuous_enable(struct rte_eth_dev *dev)
 {
        struct dpaa_if *dpaa_intf = dev->data->dev_private;
@@ -458,6 +660,7 @@ static struct eth_dev_ops dpaa_devops = {
        .dev_stop                 = dpaa_eth_dev_stop,
        .dev_close                = dpaa_eth_dev_close,
        .dev_infos_get            = dpaa_eth_dev_info,
+       .dev_supported_ptypes_get = dpaa_supported_ptypes_get,
 
        .rx_queue_setup           = dpaa_eth_rx_queue_setup,
        .tx_queue_setup           = dpaa_eth_tx_queue_setup,
@@ -469,6 +672,11 @@ static struct eth_dev_ops dpaa_devops = {
 
        .link_update              = dpaa_eth_link_update,
        .stats_get                = dpaa_eth_stats_get,
+       .xstats_get               = dpaa_dev_xstats_get,
+       .xstats_get_by_id         = dpaa_xstats_get_by_id,
+       .xstats_get_names_by_id   = dpaa_xstats_get_names_by_id,
+       .xstats_get_names         = dpaa_xstats_get_names,
+       .xstats_reset             = dpaa_eth_stats_reset,
        .stats_reset              = dpaa_eth_stats_reset,
        .promiscuous_enable       = dpaa_eth_promiscuous_enable,
        .promiscuous_disable      = dpaa_eth_promiscuous_disable,
@@ -481,6 +689,7 @@ static struct eth_dev_ops dpaa_devops = {
        .mac_addr_remove          = dpaa_dev_remove_mac_addr,
        .mac_addr_set             = dpaa_dev_set_mac_addr,
 
+       .fw_version_get           = dpaa_fw_version_get,
 };
 
 static int dpaa_fc_set_default(struct dpaa_if *dpaa_intf)
@@ -587,6 +796,39 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
        return ret;
 }
 
+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
+/* Initialise a DEBUG FQ ([rt]x_error, rx_default). */
+static int dpaa_debug_queue_init(struct qman_fq *fq, uint32_t fqid)
+{
+       struct qm_mcc_initfq opts;
+       int ret;
+
+       PMD_INIT_FUNC_TRACE();
+
+       ret = qman_reserve_fqid(fqid);
+       if (ret) {
+               DPAA_PMD_ERR("Reserve debug fqid %d failed with ret: %d",
+                       fqid, ret);
+               return -EINVAL;
+       }
+       /* "map" this Rx FQ to one of the interfaces Tx FQID */
+       DPAA_PMD_DEBUG("Creating debug fq %p, fqid %d", fq, fqid);
+       ret = qman_create_fq(fqid, QMAN_FQ_FLAG_NO_ENQUEUE, fq);
+       if (ret) {
+               DPAA_PMD_ERR("create debug fqid %d failed with ret: %d",
+                       fqid, ret);
+               return ret;
+       }
+       opts.we_mask = QM_INITFQ_WE_DESTWQ | QM_INITFQ_WE_FQCTRL;
+       opts.fqd.dest.wq = DPAA_IF_DEBUG_PRIORITY;
+       ret = qman_init_fq(fq, 0, &opts);
+       if (ret)
+               DPAA_PMD_ERR("init debug fqid %d failed with ret: %d",
+                           fqid, ret);
+       return ret;
+}
+#endif
+
 /* Initialise a network interface */
 static int
 dpaa_dev_init(struct rte_eth_dev *eth_dev)
@@ -661,6 +903,15 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
        }
        dpaa_intf->nb_tx_queues = num_cores;
 
+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
+       dpaa_debug_queue_init(&dpaa_intf->debug_queues[
+               DPAA_DEBUG_FQ_RX_ERROR], fman_intf->fqid_rx_err);
+       dpaa_intf->debug_queues[DPAA_DEBUG_FQ_RX_ERROR].dpaa_intf = dpaa_intf;
+       dpaa_debug_queue_init(&dpaa_intf->debug_queues[
+               DPAA_DEBUG_FQ_TX_ERROR], fman_intf->fqid_tx_err);
+       dpaa_intf->debug_queues[DPAA_DEBUG_FQ_TX_ERROR].dpaa_intf = dpaa_intf;
+#endif
+
        DPAA_PMD_DEBUG("All frame queues created");
 
        /* Get the initial configuration for flow control */
@@ -669,7 +920,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
        /* reset bpool list, initialize bpool dynamically */
        list_for_each_entry_safe(bp, tmp_bp, &cfg->fman_if->bpool_list, node) {
                list_del(&bp->node);
-               rte_free(bp);
+               free(bp);
        }
 
        /* Populate ethdev structure */