/* SPDX-License-Identifier: BSD-3-Clause
*
- * Copyright 2017-2019 NXP
+ * Copyright 2017-2020 NXP
*
*/
/* System headers */
#include <signal.h>
#include <pthread.h>
#include <sys/types.h>
-#include <sys/syscall.h>
+#include <sys/eventfd.h>
#include <rte_byteorder.h>
#include <rte_common.h>
#include <rte_eal.h>
#include <rte_alarm.h>
#include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_malloc.h>
#include <rte_ring.h>
#include <rte_bus.h>
#include <rte_mbuf_pool_ops.h>
+#include <rte_mbuf_dyn.h>
#include <dpaa_of.h>
#include <rte_dpaa_bus.h>
RTE_DEFINE_PER_LCORE(struct dpaa_portal *, dpaa_io);
+#define DPAA_SEQN_DYNFIELD_NAME "dpaa_seqn_dynfield"
+int dpaa_seqn_dynfield_offset = -1;
+
struct fm_eth_port_cfg *
dpaa_get_eth_port_cfg(int dev_id)
{
int rte_dpaa_portal_init(void *arg)
{
+ static const struct rte_mbuf_dynfield dpaa_seqn_dynfield_desc = {
+ .name = DPAA_SEQN_DYNFIELD_NAME,
+ .size = sizeof(dpaa_seqn_t),
+ .align = __alignof__(dpaa_seqn_t),
+ };
unsigned int cpu, lcore = rte_lcore_id();
int ret;
BUS_INIT_FUNC_TRACE();
if ((size_t)arg == 1 || lcore == LCORE_ID_ANY)
- lcore = rte_get_master_lcore();
+ lcore = rte_get_main_lcore();
else
if (lcore >= RTE_MAX_LCORE)
return -1;
cpu = rte_lcore_to_cpu_id(lcore);
+ dpaa_seqn_dynfield_offset =
+ rte_mbuf_dynfield_register(&dpaa_seqn_dynfield_desc);
+ if (dpaa_seqn_dynfield_offset < 0) {
+ DPAA_BUS_LOG(ERR, "Failed to register mbuf field for dpaa sequence number\n");
+ return -rte_errno;
+ }
+
/* Initialise bman thread portals */
ret = bman_thread_init();
if (ret) {
DPAA_PER_LCORE_PORTAL->qman_idx = qman_get_portal_index();
DPAA_PER_LCORE_PORTAL->bman_idx = bman_get_portal_index();
- DPAA_PER_LCORE_PORTAL->tid = syscall(SYS_gettid);
+ DPAA_PER_LCORE_PORTAL->tid = rte_gettid();
ret = pthread_setspecific(dpaa_portal_key,
(void *)DPAA_PER_LCORE_PORTAL);
}
static int
-rte_dpaa_bus_parse(const char *name, void *out_name)
+rte_dpaa_bus_parse(const char *name, void *out)
{
- int i, j;
- int max_fman = 2, max_macs = 16;
- char *dup_name;
- char *sep = NULL;
+ unsigned int i, j;
+ size_t delta;
/* There are two ways of passing device name, with and without
* separator. "dpaa_bus:fm1-mac3" with separator, and "fm1-mac3"
*/
DPAA_BUS_DEBUG("Parse device name (%s)", name);
- /* Check for dpaa_bus:fm1-mac3 style */
- dup_name = strdup(name);
- sep = strchr(dup_name, ':');
- if (!sep)
- /* If not, check for name=fm1-mac3 style */
- sep = strchr(dup_name, '=');
+ delta = 0;
+ if (strncmp(name, "dpaa_bus:", 9) == 0) {
+ delta = 9;
+ } else if (strncmp(name, "name=", 5) == 0) {
+ delta = 5;
+ }
- if (sep)
- /* jump over the seprator */
- sep = (char *) (sep + 1);
- else
- sep = dup_name;
-
- for (i = 0; i < max_fman; i++) {
- for (j = 0; j < max_macs; j++) {
- char fm_name[16];
- snprintf(fm_name, 16, "fm%d-mac%d", i, j);
- if (strcmp(fm_name, sep) == 0) {
- if (out_name)
- strcpy(out_name, sep);
- free(dup_name);
- return 0;
- }
- }
+ if (sscanf(&name[delta], "fm%u-mac%u", &i, &j) != 2 ||
+ i >= 2 || j >= 16) {
+ return -EINVAL;
}
- for (i = 0; i < RTE_LIBRTE_DPAA_MAX_CRYPTODEV; i++) {
- char sec_name[16];
-
- snprintf(sec_name, 16, "dpaa_sec-%d", i+1);
- if (strcmp(sec_name, sep) == 0) {
- if (out_name)
- strcpy(out_name, sep);
- free(dup_name);
- return 0;
- }
+ if (out != NULL) {
+ char *out_name = out;
+ const size_t max_name_len = sizeof("fm.-mac..") - 1;
+
+ /* Do not check for truncation, either name ends with
+ * '\0' or the device name is followed by parameters and there
+ * will be a ',' instead. Not copying past this comma is not an
+ * error.
+ */
+ strlcpy(out_name, &name[delta], max_name_len + 1);
+
+ /* Second digit of mac%u could instead be ','. */
+ if ((strlen(out_name) == max_name_len) &&
+ out_name[max_name_len] == ',')
+ out_name[max_name_len] = '\0';
}
- free(dup_name);
- return -EINVAL;
+ return 0;
}
#define DPAA_DEV_PATH1 "/sys/devices/platform/soc/soc:fsl,dpaa"
/* Get the interface configurations from device-tree */
dpaa_netcfg = netcfg_acquire();
if (!dpaa_netcfg) {
- DPAA_BUS_LOG(ERR, "netcfg_acquire failed");
+ DPAA_BUS_LOG(ERR,
+ "netcfg failed: /dev/fsl_usdpaa device not available");
+ DPAA_BUS_WARN(
+ "Check if you are using USDPAA based device tree");
return -EINVAL;
}
RTE_LOG(NOTICE, EAL, "DPAA Bus Detected\n");
if (!dpaa_netcfg->num_ethports) {
- DPAA_BUS_LOG(INFO, "no network interfaces available");
+ DPAA_BUS_LOG(INFO, "NO DPDK mapped net interfaces available");
/* This is not an error */
- return 0;
}
#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
return 0;
}
+static int rte_dpaa_setup_intr(struct rte_intr_handle *intr_handle)
+{
+ int fd;
+
+ fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
+ if (fd < 0) {
+ DPAA_BUS_ERR("Cannot set up eventfd, error %i (%s)",
+ errno, strerror(errno));
+ return errno;
+ }
+
+ intr_handle->fd = fd;
+ intr_handle->type = RTE_INTR_HANDLE_EXT;
+
+ return 0;
+}
+
static int
rte_dpaa_bus_probe(void)
{
struct rte_dpaa_driver *drv;
FILE *svr_file = NULL;
unsigned int svr_ver;
- int probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST;
+ int probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_ALLOWLIST;
static int process_once;
/* If DPAA bus is not present nothing needs to be done */
/* Device list creation is only done once */
if (!process_once) {
rte_dpaa_bus_dev_build();
- if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- /* One time load of Qman/Bman drivers */
- ret = qman_global_init();
- if (ret) {
- DPAA_BUS_ERR("QMAN initialization failed: %d",
- ret);
- return ret;
- }
- ret = bman_global_init();
- if (ret) {
- DPAA_BUS_ERR("BMAN initialization failed: %d",
- ret);
- return ret;
- }
+ /* One time load of Qman/Bman drivers */
+ ret = qman_global_init();
+ if (ret) {
+ DPAA_BUS_ERR("QMAN initialization failed: %d",
+ ret);
+ return ret;
+ }
+ ret = bman_global_init();
+ if (ret) {
+ DPAA_BUS_ERR("BMAN initialization failed: %d",
+ ret);
+ return ret;
}
}
process_once = 1;
fclose(svr_file);
}
+ TAILQ_FOREACH(dev, &rte_dpaa_bus.device_list, next) {
+ if (dev->device_type == FSL_DPAA_ETH) {
+ ret = rte_dpaa_setup_intr(&dev->intr_handle);
+ if (ret)
+ DPAA_BUS_ERR("Error setting up interrupt.\n");
+ }
+ }
+
/* And initialize the PA->VA translation table */
dpaax_iova_table_populate();
if (!drv->probe ||
(dev->device.devargs &&
- dev->device.devargs->policy == RTE_DEV_BLACKLISTED))
+ dev->device.devargs->policy == RTE_DEV_BLOCKED))
continue;
if (probe_all ||
(dev->device.devargs &&
- dev->device.devargs->policy ==
- RTE_DEV_WHITELISTED)) {
+ dev->device.devargs->policy == RTE_DEV_ALLOWED)) {
ret = drv->probe(drv, dev);
if (ret) {
DPAA_BUS_ERR("unable to probe:%s",
};
RTE_REGISTER_BUS(FSL_DPAA_BUS_NAME, rte_dpaa_bus.bus);
-RTE_LOG_REGISTER(dpaa_logtype_bus, bus.dpaa, NOTICE);
+RTE_LOG_REGISTER_DEFAULT(dpaa_logtype_bus, NOTICE);