diff mbox series

[2/2,v2] event/dpaa2: support Tx adapter

Message ID 20191017082904.17543-2-nipun.gupta@nxp.com
State Accepted
Commit c9d02b799d88ce79d6d28f781a48fb1977b2a6bb
Headers show
Series [1/2,v2] event/dpaa2: set priority as per the dpcon device | expand

Commit Message

Nipun Gupta Oct. 17, 2019, 8:29 a.m. UTC 
This patch adds the support of Tx adapter for DPAA2 platform

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>

---

Changes in v2:
 - Fix build with RTE_LIBRTE_ETHDEV_DEBUG enabled

 drivers/event/dpaa2/Makefile         |  2 +-
 drivers/event/dpaa2/dpaa2_eventdev.c | 75 ++++++++++++++++++++++++++--
 drivers/event/dpaa2/dpaa2_eventdev.h |  3 +-
 3 files changed, 73 insertions(+), 7 deletions(-)

-- 
2.17.1

Comments

Nipun Gupta Oct. 17, 2019, 8:47 a.m. UTC | #1 
Forgot to add in patch:

Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>


> -----Original Message-----

> From: Nipun Gupta <nipun.gupta@nxp.com>

> Sent: Thursday, October 17, 2019 1:59 PM

> To: dev@dpdk.org

> Cc: jerinj@marvell.com; Hemant Agrawal <hemant.agrawal@nxp.com>;

> Nipun Gupta <nipun.gupta@nxp.com>

> Subject: [PATCH 2/2 v2] event/dpaa2: support Tx adapter

> 

> This patch adds the support of Tx adapter for DPAA2 platform

> 

> Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>

> ---

> 

> Changes in v2:

>  - Fix build with RTE_LIBRTE_ETHDEV_DEBUG enabled

> 

>  drivers/event/dpaa2/Makefile         |  2 +-

>  drivers/event/dpaa2/dpaa2_eventdev.c | 75

> ++++++++++++++++++++++++++--

>  drivers/event/dpaa2/dpaa2_eventdev.h |  3 +-

>  3 files changed, 73 insertions(+), 7 deletions(-)

> 

> diff --git a/drivers/event/dpaa2/Makefile b/drivers/event/dpaa2/Makefile

> index c6ab326da..c4019d688 100644

> --- a/drivers/event/dpaa2/Makefile

> +++ b/drivers/event/dpaa2/Makefile

> @@ -20,7 +20,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2

>  LDLIBS += -lrte_eal -lrte_eventdev

>  LDLIBS += -lrte_common_dpaax

>  LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2

> -LDLIBS += -lrte_bus_vdev -lrte_mempool -lrte_mbuf

> +LDLIBS += -lrte_bus_vdev -lrte_mempool -lrte_mbuf -lrte_ethdev

>  CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2

>  CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc

> 

> diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c

> b/drivers/event/dpaa2/dpaa2_eventdev.c

> index 56cea5f90..4ee2c460e 100644

> --- a/drivers/event/dpaa2/dpaa2_eventdev.c

> +++ b/drivers/event/dpaa2/dpaa2_eventdev.c

> @@ -27,6 +27,7 @@

>  #include <rte_ethdev_driver.h>

>  #include <rte_cryptodev.h>

>  #include <rte_event_eth_rx_adapter.h>

> +#include <rte_event_eth_tx_adapter.h>

> 

>  #include <fslmc_vfio.h>

>  #include <dpaa2_hw_pvt.h>

> @@ -947,6 +948,66 @@ dpaa2_eventdev_crypto_stop(const struct

> rte_eventdev *dev,

>  	return 0;

>  }

> 

> +static int

> +dpaa2_eventdev_tx_adapter_create(uint8_t id,

> +				 const struct rte_eventdev *dev)

> +{

> +	RTE_SET_USED(id);

> +	RTE_SET_USED(dev);

> +

> +	/* Nothing to do. Simply return. */

> +	return 0;

> +}

> +

> +static int

> +dpaa2_eventdev_tx_adapter_caps(const struct rte_eventdev *dev,

> +			       const struct rte_eth_dev *eth_dev,

> +			       uint32_t *caps)

> +{

> +	RTE_SET_USED(dev);

> +	RTE_SET_USED(eth_dev);

> +

> +	*caps = RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT;

> +	return 0;

> +}

> +

> +static uint16_t

> +dpaa2_eventdev_txa_enqueue_same_dest(void *port,

> +				     struct rte_event ev[],

> +				     uint16_t nb_events)

> +{

> +	struct rte_mbuf *m[DPAA2_EVENT_MAX_PORT_ENQUEUE_DEPTH],

> *m0;

> +	uint8_t qid, i;

> +

> +	RTE_SET_USED(port);

> +

> +	m0 = (struct rte_mbuf *)ev[0].mbuf;

> +	qid = rte_event_eth_tx_adapter_txq_get(m0);

> +

> +	for (i = 0; i < nb_events; i++)

> +		m[i] = (struct rte_mbuf *)ev[i].mbuf;

> +

> +	return rte_eth_tx_burst(m0->port, qid, m, nb_events);

> +}

> +

> +static uint16_t

> +dpaa2_eventdev_txa_enqueue(void *port,

> +			   struct rte_event ev[],

> +			   uint16_t nb_events)

> +{

> +	struct rte_mbuf *m = (struct rte_mbuf *)ev[0].mbuf;

> +	uint8_t qid, i;

> +

> +	RTE_SET_USED(port);

> +

> +	for (i = 0; i < nb_events; i++) {

> +		qid = rte_event_eth_tx_adapter_txq_get(m);

> +		rte_eth_tx_burst(m->port, qid, &m, 1);

> +	}

> +

> +	return nb_events;

> +}

> +

>  static struct rte_eventdev_ops dpaa2_eventdev_ops = {

>  	.dev_infos_get    = dpaa2_eventdev_info_get,

>  	.dev_configure    = dpaa2_eventdev_configure,

> @@ -964,11 +1025,13 @@ static struct rte_eventdev_ops

> dpaa2_eventdev_ops = {

>  	.timeout_ticks    = dpaa2_eventdev_timeout_ticks,

>  	.dump             = dpaa2_eventdev_dump,

>  	.dev_selftest     = test_eventdev_dpaa2,

> -	.eth_rx_adapter_caps_get = dpaa2_eventdev_eth_caps_get,

> -	.eth_rx_adapter_queue_add = dpaa2_eventdev_eth_queue_add,

> -	.eth_rx_adapter_queue_del = dpaa2_eventdev_eth_queue_del,

> -	.eth_rx_adapter_start = dpaa2_eventdev_eth_start,

> -	.eth_rx_adapter_stop = dpaa2_eventdev_eth_stop,

> +	.eth_rx_adapter_caps_get	= dpaa2_eventdev_eth_caps_get,

> +	.eth_rx_adapter_queue_add	= dpaa2_eventdev_eth_queue_add,

> +	.eth_rx_adapter_queue_del	= dpaa2_eventdev_eth_queue_del,

> +	.eth_rx_adapter_start		= dpaa2_eventdev_eth_start,

> +	.eth_rx_adapter_stop		= dpaa2_eventdev_eth_stop,

> +	.eth_tx_adapter_caps_get	= dpaa2_eventdev_tx_adapter_caps,

> +	.eth_tx_adapter_create		=

> dpaa2_eventdev_tx_adapter_create,

>  	.crypto_adapter_caps_get	= dpaa2_eventdev_crypto_caps_get,

>  	.crypto_adapter_queue_pair_add	=

> dpaa2_eventdev_crypto_queue_add,

>  	.crypto_adapter_queue_pair_del	=

> dpaa2_eventdev_crypto_queue_del,

> @@ -1035,6 +1098,8 @@ dpaa2_eventdev_create(const char *name)

>  	eventdev->enqueue_forward_burst =

> dpaa2_eventdev_enqueue_burst;

>  	eventdev->dequeue       = dpaa2_eventdev_dequeue;

>  	eventdev->dequeue_burst = dpaa2_eventdev_dequeue_burst;

> +	eventdev->txa_enqueue	= dpaa2_eventdev_txa_enqueue;

> +	eventdev->txa_enqueue_same_dest	=

> dpaa2_eventdev_txa_enqueue_same_dest;

> 

>  	/* For secondary processes, the primary has done all the work */

>  	if (rte_eal_process_type() != RTE_PROC_PRIMARY)

> diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h

> b/drivers/event/dpaa2/dpaa2_eventdev.h

> index 7c5d00550..785e52032 100644

> --- a/drivers/event/dpaa2/dpaa2_eventdev.h

> +++ b/drivers/event/dpaa2/dpaa2_eventdev.h

> @@ -38,7 +38,8 @@ enum {

>  #define RTE_EVENT_ETH_RX_ADAPTER_DPAA2_CAP \

>  		(RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT | \

>  		RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ | \

> -		RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID)

> +		RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID |

> \

> +		RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT)

> 

>  /**< Crypto Rx adapter cap to return If the packet transfers from

>   * the cryptodev to eventdev with DPAA2 devices.

> --

> 2.17.1
diff mbox series

Patch

diff --git a/drivers/event/dpaa2/Makefile b/drivers/event/dpaa2/Makefile
index c6ab326da..c4019d688 100644
--- a/drivers/event/dpaa2/Makefile
+++ b/drivers/event/dpaa2/Makefile
@@ -20,7 +20,7 @@  CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2
 LDLIBS += -lrte_eal -lrte_eventdev
 LDLIBS += -lrte_common_dpaax
 LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2
-LDLIBS += -lrte_bus_vdev -lrte_mempool -lrte_mbuf
+LDLIBS += -lrte_bus_vdev -lrte_mempool -lrte_mbuf -lrte_ethdev
 CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2
 CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc
 
diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index 56cea5f90..4ee2c460e 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -27,6 +27,7 @@ 
 #include <rte_ethdev_driver.h>
 #include <rte_cryptodev.h>
 #include <rte_event_eth_rx_adapter.h>
+#include <rte_event_eth_tx_adapter.h>
 
 #include <fslmc_vfio.h>
 #include <dpaa2_hw_pvt.h>
@@ -947,6 +948,66 @@  dpaa2_eventdev_crypto_stop(const struct rte_eventdev *dev,
 	return 0;
 }
 
+static int
+dpaa2_eventdev_tx_adapter_create(uint8_t id,
+				 const struct rte_eventdev *dev)
+{
+	RTE_SET_USED(id);
+	RTE_SET_USED(dev);
+
+	/* Nothing to do. Simply return. */
+	return 0;
+}
+
+static int
+dpaa2_eventdev_tx_adapter_caps(const struct rte_eventdev *dev,
+			       const struct rte_eth_dev *eth_dev,
+			       uint32_t *caps)
+{
+	RTE_SET_USED(dev);
+	RTE_SET_USED(eth_dev);
+
+	*caps = RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT;
+	return 0;
+}
+
+static uint16_t
+dpaa2_eventdev_txa_enqueue_same_dest(void *port,
+				     struct rte_event ev[],
+				     uint16_t nb_events)
+{
+	struct rte_mbuf *m[DPAA2_EVENT_MAX_PORT_ENQUEUE_DEPTH], *m0;
+	uint8_t qid, i;
+
+	RTE_SET_USED(port);
+
+	m0 = (struct rte_mbuf *)ev[0].mbuf;
+	qid = rte_event_eth_tx_adapter_txq_get(m0);
+
+	for (i = 0; i < nb_events; i++)
+		m[i] = (struct rte_mbuf *)ev[i].mbuf;
+
+	return rte_eth_tx_burst(m0->port, qid, m, nb_events);
+}
+
+static uint16_t
+dpaa2_eventdev_txa_enqueue(void *port,
+			   struct rte_event ev[],
+			   uint16_t nb_events)
+{
+	struct rte_mbuf *m = (struct rte_mbuf *)ev[0].mbuf;
+	uint8_t qid, i;
+
+	RTE_SET_USED(port);
+
+	for (i = 0; i < nb_events; i++) {
+		qid = rte_event_eth_tx_adapter_txq_get(m);
+		rte_eth_tx_burst(m->port, qid, &m, 1);
+	}
+
+	return nb_events;
+}
+
 static struct rte_eventdev_ops dpaa2_eventdev_ops = {
 	.dev_infos_get    = dpaa2_eventdev_info_get,
 	.dev_configure    = dpaa2_eventdev_configure,
@@ -964,11 +1025,13 @@  static struct rte_eventdev_ops dpaa2_eventdev_ops = {
 	.timeout_ticks    = dpaa2_eventdev_timeout_ticks,
 	.dump             = dpaa2_eventdev_dump,
 	.dev_selftest     = test_eventdev_dpaa2,
-	.eth_rx_adapter_caps_get = dpaa2_eventdev_eth_caps_get,
-	.eth_rx_adapter_queue_add = dpaa2_eventdev_eth_queue_add,
-	.eth_rx_adapter_queue_del = dpaa2_eventdev_eth_queue_del,
-	.eth_rx_adapter_start = dpaa2_eventdev_eth_start,
-	.eth_rx_adapter_stop = dpaa2_eventdev_eth_stop,
+	.eth_rx_adapter_caps_get	= dpaa2_eventdev_eth_caps_get,
+	.eth_rx_adapter_queue_add	= dpaa2_eventdev_eth_queue_add,
+	.eth_rx_adapter_queue_del	= dpaa2_eventdev_eth_queue_del,
+	.eth_rx_adapter_start		= dpaa2_eventdev_eth_start,
+	.eth_rx_adapter_stop		= dpaa2_eventdev_eth_stop,
+	.eth_tx_adapter_caps_get	= dpaa2_eventdev_tx_adapter_caps,
+	.eth_tx_adapter_create		= dpaa2_eventdev_tx_adapter_create,
 	.crypto_adapter_caps_get	= dpaa2_eventdev_crypto_caps_get,
 	.crypto_adapter_queue_pair_add	= dpaa2_eventdev_crypto_queue_add,
 	.crypto_adapter_queue_pair_del	= dpaa2_eventdev_crypto_queue_del,
@@ -1035,6 +1098,8 @@  dpaa2_eventdev_create(const char *name)
 	eventdev->enqueue_forward_burst = dpaa2_eventdev_enqueue_burst;
 	eventdev->dequeue       = dpaa2_eventdev_dequeue;
 	eventdev->dequeue_burst = dpaa2_eventdev_dequeue_burst;
+	eventdev->txa_enqueue	= dpaa2_eventdev_txa_enqueue;
+	eventdev->txa_enqueue_same_dest	= dpaa2_eventdev_txa_enqueue_same_dest;
 
 	/* For secondary processes, the primary has done all the work */
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h b/drivers/event/dpaa2/dpaa2_eventdev.h
index 7c5d00550..785e52032 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev.h
@@ -38,7 +38,8 @@  enum {
 #define RTE_EVENT_ETH_RX_ADAPTER_DPAA2_CAP \
 		(RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT | \
 		RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ | \
-		RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID)
+		RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID | \
+		RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT)
 
 /**< Crypto Rx adapter cap to return If the packet transfers from
  * the cryptodev to eventdev with DPAA2 devices.