Acked-By: Abhinandan Gujjar <abhinandan.guj...@intel.com>
> -----Original Message-----
> From: Jerin Jacob <jerin.ja...@caviumnetworks.com>
> Sent: Tuesday, September 25, 2018 8:42 AM
> To: akhil.go...@nxp.com
> Cc: dev@dpdk.org; hemant.agra...@nxp.com; De Lara Guarch, Pablo
> <pablo.de.lara.gua...@intel.com>; Gujjar, Abhinandan S
> <abhinandan.guj...@intel.com>
> Subject: Re: [dpdk-dev] [PATCH 3/3] event/dpaa2: support for crypto adapter
>
> -----Original Message-----
> > Date: Fri, 14 Sep 2018 17:18:10 +0530
> > From: akhil.go...@nxp.com
> > To: dev@dpdk.org
> > CC: hemant.agra...@nxp.com, pablo.de.lara.gua...@intel.com, Akhil
> > Goyal <akhil.go...@nxp.com>
> > Subject: [dpdk-dev] [PATCH 3/3] event/dpaa2: support for crypto
> > adapter
> > X-Mailer: git-send-email 2.17.1
> >
> >
> > From: Akhil Goyal <akhil.go...@nxp.com>
> >
> > Signed-off-by: Akhil Goyal <akhil.go...@nxp.com>
> > Signed-off-by: Ashish Jain <ashish.j...@nxp.com>
> > Signed-off-by: Hemant Agrawal <hemant.agra...@nxp.com>
>
>
> Adding Eventdev Crypto Adapter maintainer
>
> + Abhinandan Gujjar <abhinandan.guj...@intel.com>
>
>
> > ---
> > drivers/event/dpaa2/Makefile | 3 +-
> > drivers/event/dpaa2/dpaa2_eventdev.c | 150
> +++++++++++++++++++++++++++
> > drivers/event/dpaa2/dpaa2_eventdev.h | 9 ++
> > drivers/event/dpaa2/meson.build | 3 +-
> > 4 files changed, 163 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/event/dpaa2/Makefile
> > b/drivers/event/dpaa2/Makefile index 5e1a63200..46f7d061e 100644
> > --- a/drivers/event/dpaa2/Makefile
> > +++ b/drivers/event/dpaa2/Makefile
> > @@ -20,9 +20,10 @@ CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2 CFLAGS
> > += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal
> > LDLIBS += -lrte_eal -lrte_eventdev
> > LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2 -LDLIBS
> > += -lrte_bus_vdev
> > +LDLIBS += -lrte_bus_vdev -lrte_pmd_dpaa2_sec
> > CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2 CFLAGS +=
> > -I$(RTE_SDK)/drivers/net/dpaa2/mc
> > +CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec
> >
> > # versioning export map
> > EXPORT_MAP := rte_pmd_dpaa2_event_version.map diff --git
> > a/drivers/event/dpaa2/dpaa2_eventdev.c
> > b/drivers/event/dpaa2/dpaa2_eventdev.c
> > index cadbdb13b..890ab461c 100644
> > --- a/drivers/event/dpaa2/dpaa2_eventdev.c
> > +++ b/drivers/event/dpaa2/dpaa2_eventdev.c
> > @@ -27,6 +27,7 @@
> > #include <rte_pci.h>
> > #include <rte_bus_vdev.h>
> > #include <rte_ethdev_driver.h>
> > +#include <rte_cryptodev.h>
> > #include <rte_event_eth_rx_adapter.h>
> >
> > #include <fslmc_vfio.h>
> > @@ -34,6 +35,7 @@
> > #include <dpaa2_hw_mempool.h>
> > #include <dpaa2_hw_dpio.h>
> > #include <dpaa2_ethdev.h>
> > +#include <dpaa2_sec_event.h>
> > #include "dpaa2_eventdev.h"
> > #include "dpaa2_eventdev_logs.h"
> > #include <portal/dpaa2_hw_pvt.h>
> > @@ -793,6 +795,149 @@ dpaa2_eventdev_eth_stop(const struct
> rte_eventdev *dev,
> > return 0;
> > }
> >
> > +static int
> > +dpaa2_eventdev_crypto_caps_get(const struct rte_eventdev *dev,
> > + const struct rte_cryptodev *cdev,
> > + uint32_t *caps) {
> > + const char *name = cdev->data->name;
> > +
> > + EVENTDEV_INIT_FUNC_TRACE();
> > +
> > + RTE_SET_USED(dev);
> > +
> > + if (!strncmp(name, "dpsec-", 6))
> > + *caps = RTE_EVENT_CRYPTO_ADAPTER_DPAA2_CAP;
> > + else
> > + return -1;
> > +
> > + return 0;
> > +}
> > +
> > +static int
> > +dpaa2_eventdev_crypto_queue_add_all(const struct rte_eventdev *dev,
> > + const struct rte_cryptodev *cryptodev,
> > + const struct rte_event *ev) {
> > + struct dpaa2_eventdev *priv = dev->data->dev_private;
> > + uint8_t ev_qid = ev->queue_id;
> > + uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id;
> > + int i, ret;
> > +
> > + EVENTDEV_INIT_FUNC_TRACE();
> > +
> > + for (i = 0; i < cryptodev->data->nb_queue_pairs; i++) {
> > + ret = dpaa2_sec_eventq_attach(cryptodev, i,
> > + dpcon_id, ev);
> > + if (ret) {
> > + DPAA2_EVENTDEV_ERR("dpaa2_sec_eventq_attach failed:
> > ret
> %d\n",
> > + ret);
> > + goto fail;
> > + }
> > + }
> > + return 0;
> > +fail:
> > + for (i = (i - 1); i >= 0 ; i--)
> > + dpaa2_sec_eventq_detach(cryptodev, i);
> > +
> > + return ret;
> > +}
> > +
> > +static int
> > +dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev,
> > + const struct rte_cryptodev *cryptodev,
> > + int32_t rx_queue_id,
> > + const struct rte_event *ev) {
> > + struct dpaa2_eventdev *priv = dev->data->dev_private;
> > + uint8_t ev_qid = ev->queue_id;
> > + uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id;
> > + int ret;
> > +
> > + EVENTDEV_INIT_FUNC_TRACE();
> > +
> > + if (rx_queue_id == -1)
> > + return dpaa2_eventdev_crypto_queue_add_all(dev,
> > + cryptodev, ev);
> > +
> > + ret = dpaa2_sec_eventq_attach(cryptodev, rx_queue_id,
> > + dpcon_id, ev);
> > + if (ret) {
> > + DPAA2_EVENTDEV_ERR(
> > + "dpaa2_sec_eventq_attach failed: ret: %d\n", ret);
> > + return ret;
> > + }
> > + return 0;
> > +}
> > +
> > +static int
> > +dpaa2_eventdev_crypto_queue_del_all(const struct rte_eventdev *dev,
> > + const struct rte_cryptodev *cdev) {
> > + int i, ret;
> > +
> > + EVENTDEV_INIT_FUNC_TRACE();
> > +
> > + RTE_SET_USED(dev);
> > +
> > + for (i = 0; i < cdev->data->nb_queue_pairs; i++) {
> > + ret = dpaa2_sec_eventq_detach(cdev, i);
> > + if (ret) {
> > + DPAA2_EVENTDEV_ERR(
> > + "dpaa2_sec_eventq_detach failed:ret %d\n",
> > ret);
> > + return ret;
> > + }
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int
> > +dpaa2_eventdev_crypto_queue_del(const struct rte_eventdev *dev,
> > + const struct rte_cryptodev *cryptodev,
> > + int32_t rx_queue_id) {
> > + int ret;
> > +
> > + EVENTDEV_INIT_FUNC_TRACE();
> > +
> > + if (rx_queue_id == -1)
> > + return dpaa2_eventdev_crypto_queue_del_all(dev,
> > + cryptodev);
> > +
> > + ret = dpaa2_sec_eventq_detach(cryptodev, rx_queue_id);
> > + if (ret) {
> > + DPAA2_EVENTDEV_ERR(
> > + "dpaa2_sec_eventq_detach failed: ret: %d\n", ret);
> > + return ret;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int
> > +dpaa2_eventdev_crypto_start(const struct rte_eventdev *dev,
> > + const struct rte_cryptodev *cryptodev) {
> > + EVENTDEV_INIT_FUNC_TRACE();
> > +
> > + RTE_SET_USED(dev);
> > + RTE_SET_USED(cryptodev);
> > +
> > + return 0;
> > +}
> > +
> > +static int
> > +dpaa2_eventdev_crypto_stop(const struct rte_eventdev *dev,
> > + const struct rte_cryptodev *cryptodev) {
> > + EVENTDEV_INIT_FUNC_TRACE();
> > +
> > + RTE_SET_USED(dev);
> > + RTE_SET_USED(cryptodev);
> > +
> > + return 0;
> > +}
> > +
> > static struct rte_eventdev_ops dpaa2_eventdev_ops = {
> > .dev_infos_get = dpaa2_eventdev_info_get,
> > .dev_configure = dpaa2_eventdev_configure,
> > @@ -814,6 +959,11 @@ static struct rte_eventdev_ops dpaa2_eventdev_ops
> = {
> > .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,
> > + .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,
> > + .crypto_adapter_start = dpaa2_eventdev_crypto_start,
> > + .crypto_adapter_stop = dpaa2_eventdev_crypto_stop,
> > };
> >
> > static int
> > diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h
> > b/drivers/event/dpaa2/dpaa2_eventdev.h
> > index 720e0c63b..c847b3eab 100644
> > --- a/drivers/event/dpaa2/dpaa2_eventdev.h
> > +++ b/drivers/event/dpaa2/dpaa2_eventdev.h
> > @@ -42,6 +42,15 @@ enum {
> > (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)
> > +
> > +/**< Crypto Rx adapter cap to return If the packet transfers from
> > + * the cryptodev to eventdev with DPAA2 devices.
> > + */
> > +#define RTE_EVENT_CRYPTO_ADAPTER_DPAA2_CAP \
> > + (RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW | \
> > +
> RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND | \
> > + RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA)
> > +
> > /**< Ethernet Rx adapter cap to return If the packet transfers from
> > * the ethdev to eventdev with DPAA2 devices.
> > */
> > diff --git a/drivers/event/dpaa2/meson.build
> > b/drivers/event/dpaa2/meson.build index de7a46155..c1bd63384 100644
> > --- a/drivers/event/dpaa2/meson.build
> > +++ b/drivers/event/dpaa2/meson.build
> > @@ -4,8 +4,9 @@
> > if host_machine.system() != 'linux'
> > build = false
> > endif
> > -deps += ['bus_vdev', 'pmd_dpaa2']
> > +deps += ['bus_vdev', 'pmd_dpaa2', 'pmd_dpaa2_sec']
> > sources = files('dpaa2_hw_dpcon.c',
> > 'dpaa2_eventdev.c')
> >
> > allow_experimental_apis = true
> > +includes += include_directories('../../crypto/dpaa2_sec/')
> > --
> > 2.17.1
> >
