From: Hemant Agrawal <hemant.agrawal@nxp.com>
To: <dev@dpdk.org>
Cc: <thomas.monjalon@6wind.com>, <bruce.richardson@intel.com>,
<shreyansh.jain@nxp.com>, <john.mcnamara@intel.com>,
<ferruh.yigit@intel.com>, <jerin.jacob@caviumnetworks.com>
Subject: [dpdk-dev] [PATCH v2 13/22] bus/fslmc: introduce support for hardware mempool object
Date: Fri, 24 Mar 2017 18:11:23 +0530 [thread overview]
Message-ID: <1490359292-18773-14-git-send-email-hemant.agrawal@nxp.com> (raw)
In-Reply-To: <1490359292-18773-1-git-send-email-hemant.agrawal@nxp.com>
Each mempool instance is represented by a DPBP object
from the FSL-MC bus.
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/bus/fslmc/Makefile | 1 +
drivers/bus/fslmc/fslmc_vfio.c | 9 +-
drivers/bus/fslmc/fslmc_vfio.h | 2 +
drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 137 ++++++++++++++++++++++++++++
drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 21 +++++
drivers/bus/fslmc/rte_bus_fslmc_version.map | 2 +
6 files changed, 171 insertions(+), 1 deletion(-)
create mode 100644 drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile
index 1edbc63..564d663 100644
--- a/drivers/bus/fslmc/Makefile
+++ b/drivers/bus/fslmc/Makefile
@@ -68,6 +68,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \
mc/mc_sys.c
SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpio.c
+SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpbp.c
SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c
SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 2d7bcd9..fc017fc 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -270,7 +270,7 @@ int fslmc_vfio_process_group(void)
char path[PATH_MAX];
int64_t v_addr;
int ndev_count;
- int dpio_count = 0;
+ int dpio_count = 0, dpbp_count = 0;
struct fslmc_vfio_group *group = &vfio_groups[0];
static int process_once;
@@ -420,6 +420,11 @@ int fslmc_vfio_process_group(void)
if (!ret)
dpio_count++;
}
+ if (!strcmp(object_type, "dpbp")) {
+ ret = dpaa2_create_dpbp_device(object_id);
+ if (!ret)
+ dpbp_count++;
+ }
}
closedir(d);
@@ -427,6 +432,8 @@ int fslmc_vfio_process_group(void)
if (ret)
FSLMC_VFIO_LOG(DEBUG, "Error in affining qbman swp %d", ret);
+ FSLMC_VFIO_LOG(DEBUG, "DPAA2: Added dpbp_count = %d dpio_count=%d\n",
+ dpbp_count, dpio_count);
return 0;
FAILURE:
diff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h
index 39994dd..80c6869 100644
--- a/drivers/bus/fslmc/fslmc_vfio.h
+++ b/drivers/bus/fslmc/fslmc_vfio.h
@@ -76,4 +76,6 @@ int dpaa2_create_dpio_device(struct fslmc_vfio_device *vdev,
struct vfio_device_info *obj_info,
int object_id);
+int dpaa2_create_dpbp_device(int dpbp_id);
+
#endif /* _FSLMC_VFIO_H_ */
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
new file mode 100644
index 0000000..894f632
--- /dev/null
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
@@ -0,0 +1,137 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (c) 2016 NXP. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Freescale Semiconductor, Inc nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <string.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <rte_malloc.h>
+#include <rte_memcpy.h>
+#include <rte_string_fns.h>
+#include <rte_cycles.h>
+#include <rte_kvargs.h>
+#include <rte_dev.h>
+#include <rte_ethdev.h>
+
+#include <fslmc_logs.h>
+#include <fslmc_vfio.h>
+#include <mc/fsl_dpbp.h>
+#include "portal/dpaa2_hw_pvt.h"
+#include "portal/dpaa2_hw_dpio.h"
+
+TAILQ_HEAD(dpbp_device_list, dpaa2_dpbp_dev);
+static struct dpbp_device_list *dpbp_dev_list; /*!< DPBP device list */
+
+int
+dpaa2_create_dpbp_device(
+ int dpbp_id)
+{
+ struct dpaa2_dpbp_dev *dpbp_node;
+ int ret;
+
+ if (!dpbp_dev_list) {
+ dpbp_dev_list = malloc(sizeof(struct dpbp_device_list));
+ if (!dpbp_dev_list) {
+ PMD_INIT_LOG(ERR, "Memory alloc failed in DPBP list\n");
+ return -1;
+ }
+ /* Initialize the DPBP List */
+ TAILQ_INIT(dpbp_dev_list);
+ }
+
+ /* Allocate DPAA2 dpbp handle */
+ dpbp_node = (struct dpaa2_dpbp_dev *)
+ malloc(sizeof(struct dpaa2_dpbp_dev));
+ if (!dpbp_node) {
+ PMD_INIT_LOG(ERR, "Memory allocation failed for DPBP Device");
+ return -1;
+ }
+
+ /* Open the dpbp object */
+ dpbp_node->dpbp.regs = rte_mcp_ptr_list[MC_PORTAL_INDEX];
+ ret = dpbp_open(&dpbp_node->dpbp,
+ CMD_PRI_LOW, dpbp_id, &dpbp_node->token);
+ if (ret) {
+ PMD_INIT_LOG(ERR, "Resource alloc failure with err code: %d",
+ ret);
+ free(dpbp_node);
+ return -1;
+ }
+
+ /* Clean the device first */
+ ret = dpbp_reset(&dpbp_node->dpbp, CMD_PRI_LOW, dpbp_node->token);
+ if (ret) {
+ PMD_INIT_LOG(ERR, "Failure cleaning dpbp device with"
+ " error code %d\n", ret);
+ return -1;
+ }
+
+ dpbp_node->dpbp_id = dpbp_id;
+ rte_atomic16_init(&dpbp_node->in_use);
+
+ TAILQ_INSERT_HEAD(dpbp_dev_list, dpbp_node, next);
+
+ PMD_INIT_LOG(DEBUG, "Buffer pool resource initialized %d", dpbp_id);
+
+ return 0;
+}
+
+struct dpaa2_dpbp_dev *dpaa2_alloc_dpbp_dev(void)
+{
+ struct dpaa2_dpbp_dev *dpbp_dev = NULL;
+
+ /* Get DPBP dev handle from list using index */
+ TAILQ_FOREACH(dpbp_dev, dpbp_dev_list, next) {
+ if (dpbp_dev && rte_atomic16_test_and_set(&dpbp_dev->in_use))
+ break;
+ }
+
+ return dpbp_dev;
+}
+
+void dpaa2_free_dpbp_dev(struct dpaa2_dpbp_dev *dpbp)
+{
+ struct dpaa2_dpbp_dev *dpbp_dev = NULL;
+
+ /* Match DPBP handle and mark it free */
+ TAILQ_FOREACH(dpbp_dev, dpbp_dev_list, next) {
+ if (dpbp_dev == dpbp) {
+ rte_atomic16_dec(&dpbp_dev->in_use);
+ return;
+ }
+ }
+}
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
index 6b44314..a1cbbf2 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -41,6 +41,14 @@
#define MC_PORTAL_INDEX 0
#define NUM_DPIO_REGIONS 2
+#define MEMPOOL_F_HW_PKT_POOL (1 << ((sizeof(int) * 8) - 1))
+/**< mpool flag to check offloaded pool */
+
+/* Maximum release/acquire from QBMAN */
+#define DPAA2_MBUF_MAX_ACQ_REL 7
+
+#define MAX_BPID 256
+
struct dpaa2_dpio_dev {
TAILQ_ENTRY(dpaa2_dpio_dev) next;
/**< Pointer to Next device instance */
@@ -63,6 +71,19 @@ struct dpaa2_dpio_dev {
int32_t hw_id; /**< An unique ID of this DPIO device instance */
};
+struct dpaa2_dpbp_dev {
+ TAILQ_ENTRY(dpaa2_dpbp_dev) next;
+ /**< Pointer to Next device instance */
+ struct fsl_mc_io dpbp; /** handle to DPBP portal object */
+ uint16_t token;
+ rte_atomic16_t in_use;
+ uint32_t dpbp_id; /*HW ID for DPBP object */
+};
+
/*! Global MCP list */
extern void *(*rte_mcp_ptr_list);
+
+struct dpaa2_dpbp_dev *dpaa2_alloc_dpbp_dev(void);
+void dpaa2_free_dpbp_dev(struct dpaa2_dpbp_dev *dpbp);
+
#endif
diff --git a/drivers/bus/fslmc/rte_bus_fslmc_version.map b/drivers/bus/fslmc/rte_bus_fslmc_version.map
index 026b1be..3d5c1ad 100644
--- a/drivers/bus/fslmc/rte_bus_fslmc_version.map
+++ b/drivers/bus/fslmc/rte_bus_fslmc_version.map
@@ -2,6 +2,8 @@ DPDK_17.05 {
global:
dpaa2_affine_qbman_swp;
+ dpaa2_alloc_dpbp_dev;
+ dpaa2_free_dpbp_dev;
dpbp_disable;
dpbp_enable;
dpbp_get_attributes;
--
1.9.1
next prev parent reply other threads:[~2017-03-24 12:42 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-17 12:36 [dpdk-dev] [PATCH v1 00/22] NXP DPAA2 FSLMC Bus driver Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 01/22] mk/dpaa2: add the crc support to the machine type Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 02/22] mk: handle intra drivers dependencies for shared build Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 03/22] bus/fslmc: introducing fsl-mc bus driver Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 04/22] bus/fslmc: add QBMAN driver to bus Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 05/22] bus/fslmc: introduce MC object functions Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 06/22] bus/fslmc: add mc dpio object support Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 07/22] bus/fslmc: add mc dpbp " Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 08/22] eal/vfio: adding vfio utility functions in map file Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 09/22] bus/fslmc: add vfio support Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 10/22] bus/fslmc: scan for net and sec device Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 11/22] bus/fslmc: add debug log support Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 12/22] bus/fslmc: dpio portal driver Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 13/22] bus/fslmc: introduce support for hardware mempool object Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 14/22] bus/fslmc: affine dpio to crypto threads Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 15/22] bus/fslmc: define queues for DPAA2 devices Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 16/22] bus/fslmc: define hardware annotation area size Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 17/22] bus/fslmc: introduce true and false macros Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 18/22] bus/fslmc: define VLAN header length Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 19/22] bus/fslmc: add packet FLE definitions Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 20/22] bus/fslmc: add physical-virtual address translation helpers Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 21/22] bus/fslmc: add support for DMA mapping for ARM SMMU Hemant Agrawal
2017-03-17 12:36 ` [dpdk-dev] [PATCH v1 22/22] bus/fslmc: frame queue based dq storage alloc Hemant Agrawal
2017-03-23 14:32 ` [dpdk-dev] [PATCH v1 00/22] NXP DPAA2 FSLMC Bus driver Ferruh Yigit
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 " Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 01/22] mk/dpaa2: add the crc support to the machine type Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 02/22] mk: handle intra drivers dependencies for shared build Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 03/22] bus/fslmc: introducing fsl-mc bus driver Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 04/22] bus/fslmc: add QBMAN driver to bus Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 05/22] bus/fslmc: introduce MC object functions Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 06/22] bus/fslmc: add mc dpio object support Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 07/22] bus/fslmc: add mc dpbp " Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 08/22] eal/vfio: adding vfio utility functions in map file Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 09/22] bus/fslmc: add vfio support Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 10/22] bus/fslmc: scan for net and sec device Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 11/22] bus/fslmc: add debug log support Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 12/22] bus/fslmc: dpio portal driver Hemant Agrawal
2017-03-24 12:41 ` Hemant Agrawal [this message]
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 14/22] bus/fslmc: affine dpio to crypto threads Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 15/22] bus/fslmc: define queues for DPAA2 devices Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 16/22] bus/fslmc: define hardware annotation area size Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 17/22] bus/fslmc: introduce true and false macros Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 18/22] bus/fslmc: define VLAN header length Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 19/22] bus/fslmc: add packet FLE definitions Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 20/22] bus/fslmc: add physical-virtual address translation helpers Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 21/22] bus/fslmc: add support for DMA mapping for ARM SMMU Hemant Agrawal
2017-03-24 12:41 ` [dpdk-dev] [PATCH v2 22/22] bus/fslmc: frame queue based dq storage alloc Hemant Agrawal
2017-03-24 14:56 ` [dpdk-dev] [PATCH v2 00/22] NXP DPAA2 FSLMC Bus driver Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1490359292-18773-14-git-send-email-hemant.agrawal@nxp.com \
--to=hemant.agrawal@nxp.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=jerin.jacob@caviumnetworks.com \
--cc=john.mcnamara@intel.com \
--cc=shreyansh.jain@nxp.com \
--cc=thomas.monjalon@6wind.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).