common/dpaax: move OF library from DPAA bus

[dpdk.git] / drivers / net / dpaa / dpaa_ethdev.c

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 3449aca..caf255d 100644 (file)
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2017 NXP
+ *   Copyright 2017-2019 NXP
  *
  */
 /* System headers */
@@ -59,7 +59,9 @@ static uint64_t dev_rx_offloads_nodis =
                DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;
 
 /* Supported Tx offloads */
-static uint64_t dev_tx_offloads_sup;
+static uint64_t dev_tx_offloads_sup =
+               DEV_TX_OFFLOAD_MT_LOCKFREE |
+               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
 
 /* Tx offloads which cannot be disabled */
 static uint64_t dev_tx_offloads_nodis =
@@ -68,9 +70,7 @@ static uint64_t dev_tx_offloads_nodis =
                DEV_TX_OFFLOAD_TCP_CKSUM |
                DEV_TX_OFFLOAD_SCTP_CKSUM |
                DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
-               DEV_TX_OFFLOAD_MULTI_SEGS |
-               DEV_TX_OFFLOAD_MT_LOCKFREE |
-               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+               DEV_TX_OFFLOAD_MULTI_SEGS;
 
 /* Keep track of whether QMAN and BMAN have been globally initialized */
 static int is_global_init;
@@ -196,20 +196,20 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE();
 
-       /* Rx offloads validation */
+       /* Rx offloads which are enabled by default */
        if (dev_rx_offloads_nodis & ~rx_offloads) {
-               DPAA_PMD_WARN(
-               "Rx offloads non configurable - requested 0x%" PRIx64
-               " ignored 0x%" PRIx64,
-                       rx_offloads, dev_rx_offloads_nodis);
+               DPAA_PMD_INFO(
+               "Some of rx offloads enabled by default - requested 0x%" PRIx64
+               " fixed are 0x%" PRIx64,
+               rx_offloads, dev_rx_offloads_nodis);
        }
 
-       /* Tx offloads validation */
+       /* Tx offloads which are enabled by default */
        if (dev_tx_offloads_nodis & ~tx_offloads) {
-               DPAA_PMD_WARN(
-               "Tx offloads non configurable - requested 0x%" PRIx64
-               " ignored 0x%" PRIx64,
-                       tx_offloads, dev_tx_offloads_nodis);
+               DPAA_PMD_INFO(
+               "Some of tx offloads enabled by default - requested 0x%" PRIx64
+               " fixed are 0x%" PRIx64,
+               tx_offloads, dev_tx_offloads_nodis);
        }
 
        if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
@@ -335,7 +335,7 @@ static int dpaa_eth_dev_info(struct rte_eth_dev *dev,
 {
        struct dpaa_if *dpaa_intf = dev->data->dev_private;
 
-       PMD_INIT_FUNC_TRACE();
+       DPAA_PMD_DEBUG(": %s", dpaa_intf->name);
 
        dev_info->max_rx_queues = dpaa_intf->nb_rx_queues;
        dev_info->max_tx_queues = dpaa_intf->nb_tx_queues;
@@ -642,7 +642,11 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
                fman_if_get_sg_enable(dpaa_intf->fif),
                dev->data->dev_conf.rxmode.max_rx_pkt_len);
        /* checking if push mode only, no error check for now */
-       if (dpaa_push_mode_max_queue > dpaa_push_queue_idx) {
+       if (!rxq->is_static &&
+           dpaa_push_mode_max_queue > dpaa_push_queue_idx) {
+               struct qman_portal *qp;
+               int q_fd;
+
                dpaa_push_queue_idx++;
                opts.we_mask = QM_INITFQ_WE_FQCTRL | QM_INITFQ_WE_CONTEXTA;
                opts.fqd.fq_ctrl = QM_FQCTRL_AVOIDBLOCK |
@@ -686,6 +690,37 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
                }
 
                rxq->is_static = true;
+
+               /* Allocate qman specific portals */
+               qp = fsl_qman_fq_portal_create(&q_fd);
+               if (!qp) {
+                       DPAA_PMD_ERR("Unable to alloc fq portal");
+                       return -1;
+               }
+               rxq->qp = qp;
+
+               /* Set up the device interrupt handler */
+               if (!dev->intr_handle) {
+                       struct rte_dpaa_device *dpaa_dev;
+                       struct rte_device *rdev = dev->device;
+
+                       dpaa_dev = container_of(rdev, struct rte_dpaa_device,
+                                               device);
+                       dev->intr_handle = &dpaa_dev->intr_handle;
+                       dev->intr_handle->intr_vec = rte_zmalloc(NULL,
+                                       dpaa_push_mode_max_queue, 0);
+                       if (!dev->intr_handle->intr_vec) {
+                               DPAA_PMD_ERR("intr_vec alloc failed");
+                               return -ENOMEM;
+                       }
+                       dev->intr_handle->nb_efd = dpaa_push_mode_max_queue;
+                       dev->intr_handle->max_intr = dpaa_push_mode_max_queue;
+               }
+
+               dev->intr_handle->type = RTE_INTR_HANDLE_EXT;
+               dev->intr_handle->intr_vec[queue_idx] = queue_idx + 1;
+               dev->intr_handle->efds[queue_idx] = q_fd;
+               rxq->q_fd = q_fd;
        }
        rxq->bp_array = rte_dpaa_bpid_info;
        dev->data->rx_queues[queue_idx] = rxq;
@@ -992,6 +1027,40 @@ dpaa_dev_set_mac_addr(struct rte_eth_dev *dev,
        return ret;
 }
 
+static int dpaa_dev_queue_intr_enable(struct rte_eth_dev *dev,
+                                     uint16_t queue_id)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       struct qman_fq *rxq = &dpaa_intf->rx_queues[queue_id];
+
+       if (!rxq->is_static)
+               return -EINVAL;
+
+       return qman_fq_portal_irqsource_add(rxq->qp, QM_PIRQ_DQRI);
+}
+
+static int dpaa_dev_queue_intr_disable(struct rte_eth_dev *dev,
+                                      uint16_t queue_id)
+{
+       struct dpaa_if *dpaa_intf = dev->data->dev_private;
+       struct qman_fq *rxq = &dpaa_intf->rx_queues[queue_id];
+       uint32_t temp;
+       ssize_t temp1;
+
+       if (!rxq->is_static)
+               return -EINVAL;
+
+       qman_fq_portal_irqsource_remove(rxq->qp, ~0);
+
+       temp1 = read(rxq->q_fd, &temp, sizeof(temp));
+       if (temp1 != sizeof(temp))
+               DPAA_EVENTDEV_ERR("irq read error");
+
+       qman_fq_portal_thread_irq(rxq->qp);
+
+       return 0;
+}
+
 static struct eth_dev_ops dpaa_devops = {
        .dev_configure            = dpaa_eth_dev_configure,
        .dev_start                = dpaa_eth_dev_start,
@@ -1029,6 +1098,9 @@ static struct eth_dev_ops dpaa_devops = {
        .mac_addr_set             = dpaa_dev_set_mac_addr,
 
        .fw_version_get           = dpaa_fw_version_get,
+
+       .rx_queue_intr_enable     = dpaa_dev_queue_intr_enable,
+       .rx_queue_intr_disable    = dpaa_dev_queue_intr_disable,
 };
 
 static bool
@@ -1114,8 +1186,6 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx,
                }
        };
 
-       PMD_INIT_FUNC_TRACE();
-
        if (fqid) {
                ret = qman_reserve_fqid(fqid);
                if (ret) {
@@ -1167,8 +1237,6 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
        struct qm_mcc_initfq opts = {0};
        int ret;
 
-       PMD_INIT_FUNC_TRACE();
-
        ret = qman_create_fq(0, QMAN_FQ_FLAG_DYNAMIC_FQID |
                             QMAN_FQ_FLAG_TO_DCPORTAL, fq);
        if (ret) {