X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fbus%2Fdpaa%2Fdpaa_bus.c;h=f27820db37d47ebdef5019f92cd0dce19eb80edc;hb=3684541b86f5277d9cd17667c13c08d93180fb04;hp=c7da96f8da9efc474104537f191d0dd1a86f89cd;hpb=afb2f8fd5a0fb82d38c51d6e100cc14220b7db7b;p=dpdk.git diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index c7da96f8da..f27820db37 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause * - * Copyright 2017 NXP + * Copyright 2017-2019 NXP * */ /* System headers */ @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include -#include #include int dpaa_logtype_bus; @@ -218,7 +218,7 @@ dpaa_create_device_list(void) * allocated for dev->name/ */ memset(dev->name, 0, RTE_ETH_NAME_MAX_LEN); - sprintf(dev->name, "dpaa-sec%d", i); + sprintf(dev->name, "dpaa_sec-%d", i+1); DPAA_BUS_LOG(INFO, "%s cryptodev added", dev->name); dev->device.name = dev->name; dev->device.devargs = dpaa_devargs_lookup(dev); @@ -250,7 +250,6 @@ dpaa_clean_device_list(void) int rte_dpaa_portal_init(void *arg) { - pthread_t id; unsigned int cpu, lcore = rte_lcore_id(); int ret; struct dpaa_portal *dpaa_io_portal; @@ -263,17 +262,7 @@ int rte_dpaa_portal_init(void *arg) if (lcore >= RTE_MAX_LCORE) return -1; - cpu = lcore_config[lcore].core_id; - - /* Set CPU affinity for this thread.*/ - id = pthread_self(); - ret = pthread_setaffinity_np(id, sizeof(cpu_set_t), - &lcore_config[lcore].cpuset); - if (ret) { - DPAA_BUS_LOG(ERR, "pthread_setaffinity_np failed on core :%u" - " (lcore=%u) with ret: %d", cpu, lcore, ret); - return ret; - } + cpu = rte_lcore_to_cpu_id(lcore); /* Initialise bman thread portals */ ret = bman_thread_init(); @@ -332,7 +321,6 @@ rte_dpaa_portal_fq_init(void *arg, struct qman_fq *fq) { /* Affine above created portal with channel*/ u32 sdqcr; - struct qman_portal *qp; int ret; if (unlikely(!RTE_PER_LCORE(dpaa_io))) { @@ -344,21 +332,21 @@ rte_dpaa_portal_fq_init(void *arg, struct qman_fq *fq) } /* Initialise qman specific portals */ - qp = fsl_qman_portal_create(); - if (!qp) { - DPAA_BUS_LOG(ERR, "Unable to alloc fq portal"); + ret = fsl_qman_fq_portal_init(fq->qp); + if (ret) { + DPAA_BUS_LOG(ERR, "Unable to init fq portal"); return -1; } - fq->qp = qp; + sdqcr = QM_SDQCR_CHANNELS_POOL_CONV(fq->ch_id); - qman_static_dequeue_add(sdqcr, qp); + qman_static_dequeue_add(sdqcr, fq->qp); return 0; } int rte_dpaa_portal_fq_close(struct qman_fq *fq) { - return fsl_qman_portal_destroy(fq->qp); + return fsl_qman_fq_portal_destroy(fq->qp); } void @@ -387,19 +375,28 @@ rte_dpaa_bus_parse(const char *name, void *out_name) { int i, j; int max_fman = 2, max_macs = 16; - char *sep = strchr(name, ':'); - - if (strncmp(name, RTE_STR(FSL_DPAA_BUS_NAME), - strlen(RTE_STR(FSL_DPAA_BUS_NAME)))) { - return -EINVAL; - } - - if (!sep) { - DPAA_BUS_ERR("Incorrect device name observed"); - return -EINVAL; - } + char *dup_name; + char *sep = NULL; - sep = (char *) (sep + 1); + /* There are two ways of passing device name, with and without + * separator. "dpaa_bus:fm1-mac3" with separator, and "fm1-mac3" + * without separator. Both need to be handled. + * It is also possible that "name=fm1-mac3" is passed along. + */ + 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, '='); + + 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++) { @@ -408,6 +405,7 @@ rte_dpaa_bus_parse(const char *name, void *out_name) if (strcmp(fm_name, sep) == 0) { if (out_name) strcpy(out_name, sep); + free(dup_name); return 0; } } @@ -416,14 +414,16 @@ rte_dpaa_bus_parse(const char *name, void *out_name) for (i = 0; i < RTE_LIBRTE_DPAA_MAX_CRYPTODEV; i++) { char sec_name[16]; - snprintf(sec_name, 16, "dpaa-sec%d", i); + 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; } } + free(dup_name); return -EINVAL; } @@ -443,39 +443,10 @@ rte_dpaa_bus_scan(void) return 0; } - /* Load the device-tree driver */ - ret = of_init(); - if (ret) { - DPAA_BUS_LOG(ERR, "of_init failed with ret: %d", ret); - return -1; - } - - /* Get the interface configurations from device-tree */ - dpaa_netcfg = netcfg_acquire(); - if (!dpaa_netcfg) { - DPAA_BUS_LOG(ERR, "netcfg_acquire failed"); - return -EINVAL; - } - - RTE_LOG(NOTICE, EAL, "DPAA Bus Detected\n"); - - if (!dpaa_netcfg->num_ethports) { - DPAA_BUS_LOG(INFO, "no network interfaces available"); - /* This is not an error */ + if (rte_dpaa_bus.detected) return 0; - } - -#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER - dump_netcfg(dpaa_netcfg); -#endif - DPAA_BUS_LOG(DEBUG, "Number of ethernet devices = %d", - dpaa_netcfg->num_ethports); - ret = dpaa_create_device_list(); - if (ret) { - DPAA_BUS_LOG(ERR, "Unable to create device list. (%d)", ret); - return ret; - } + rte_dpaa_bus.detected = 1; /* create the key, supplying a function that'll be invoked * when a portal affined thread will be deleted. @@ -533,6 +504,47 @@ rte_dpaa_device_match(struct rte_dpaa_driver *drv, return -1; } +static int +rte_dpaa_bus_dev_build(void) +{ + int ret; + + /* Load the device-tree driver */ + ret = of_init(); + if (ret) { + DPAA_BUS_LOG(ERR, "of_init failed with ret: %d", ret); + return -1; + } + + /* Get the interface configurations from device-tree */ + dpaa_netcfg = netcfg_acquire(); + if (!dpaa_netcfg) { + DPAA_BUS_LOG(ERR, "netcfg_acquire failed"); + return -EINVAL; + } + + RTE_LOG(NOTICE, EAL, "DPAA Bus Detected\n"); + + if (!dpaa_netcfg->num_ethports) { + DPAA_BUS_LOG(INFO, "no network interfaces available"); + /* This is not an error */ + return 0; + } + +#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER + dump_netcfg(dpaa_netcfg); +#endif + + DPAA_BUS_LOG(DEBUG, "Number of ethernet devices = %d", + dpaa_netcfg->num_ethports); + ret = dpaa_create_device_list(); + if (ret) { + DPAA_BUS_LOG(ERR, "Unable to create device list. (%d)", ret); + return ret; + } + return 0; +} + static int rte_dpaa_bus_probe(void) { @@ -542,8 +554,34 @@ rte_dpaa_bus_probe(void) FILE *svr_file = NULL; unsigned int svr_ver; int probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST; + static int process_once; /* If DPAA bus is not present nothing needs to be done */ + if (!rte_dpaa_bus.detected) + return 0; + + /* 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_PMD_ERR("QMAN initialization failed: %d", + ret); + return ret; + } + ret = bman_global_init(); + if (ret) { + DPAA_PMD_ERR("BMAN initialization failed: %d", + ret); + return ret; + } + } + } + process_once = 1; + + /* If no device present on DPAA bus nothing needs to be done */ if (TAILQ_EMPTY(&rte_dpaa_bus.device_list)) return 0; @@ -578,7 +616,8 @@ rte_dpaa_bus_probe(void) RTE_DEV_WHITELISTED)) { ret = drv->probe(drv, dev); if (ret) { - DPAA_BUS_ERR("Unable to probe.\n"); + DPAA_BUS_ERR("unable to probe:%s", + dev->name); } else { dev->driver = drv; dev->device.driver = &drv->driver; @@ -601,17 +640,28 @@ rte_dpaa_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void *data) { struct rte_dpaa_device *dev; + const struct rte_dpaa_device *dstart; - TAILQ_FOREACH(dev, &rte_dpaa_bus.device_list, next) { - if (start && &dev->device == start) { - start = NULL; /* starting point found */ - continue; - } + /* find_device is called with 'data' as an opaque object - just call + * cmp with this and each device object on bus. + */ + + if (start != NULL) { + dstart = RTE_DEV_TO_DPAA_CONST(start); + dev = TAILQ_NEXT(dstart, next); + } else { + dev = TAILQ_FIRST(&rte_dpaa_bus.device_list); + } - if (cmp(&dev->device, data) == 0) + while (dev != NULL) { + if (cmp(&dev->device, data) == 0) { + DPAA_BUS_DEBUG("Found dev=(%s)\n", dev->device.name); return &dev->device; + } + dev = TAILQ_NEXT(dev, next); } + DPAA_BUS_DEBUG("Unable to find any device\n"); return NULL; } @@ -628,6 +678,57 @@ rte_dpaa_get_iommu_class(void) return RTE_IOVA_PA; } +static int +dpaa_bus_plug(struct rte_device *dev __rte_unused) +{ + /* No operation is performed while plugging the device */ + return 0; +} + +static int +dpaa_bus_unplug(struct rte_device *dev __rte_unused) +{ + /* No operation is performed while unplugging the device */ + return 0; +} + +static void * +dpaa_bus_dev_iterate(const void *start, const char *str, + const struct rte_dev_iterator *it __rte_unused) +{ + const struct rte_dpaa_device *dstart; + struct rte_dpaa_device *dev; + char *dup, *dev_name = NULL; + + /* Expectation is that device would be name=device_name */ + if (strncmp(str, "name=", 5) != 0) { + DPAA_BUS_DEBUG("Invalid device string (%s)\n", str); + return NULL; + } + + /* Now that name=device_name format is available, split */ + dup = strdup(str); + dev_name = dup + strlen("name="); + + if (start != NULL) { + dstart = RTE_DEV_TO_DPAA_CONST(start); + dev = TAILQ_NEXT(dstart, next); + } else { + dev = TAILQ_FIRST(&rte_dpaa_bus.device_list); + } + + while (dev != NULL) { + if (strcmp(dev->device.name, dev_name) == 0) { + free(dup); + return &dev->device; + } + dev = TAILQ_NEXT(dev, next); + } + + free(dup); + return NULL; +} + static struct rte_dpaa_bus rte_dpaa_bus = { .bus = { .scan = rte_dpaa_bus_scan, @@ -635,6 +736,9 @@ static struct rte_dpaa_bus rte_dpaa_bus = { .parse = rte_dpaa_bus_parse, .find_device = rte_dpaa_find_device, .get_iommu_class = rte_dpaa_get_iommu_class, + .plug = dpaa_bus_plug, + .unplug = dpaa_bus_unplug, + .dev_iterate = dpaa_bus_dev_iterate, }, .device_list = TAILQ_HEAD_INITIALIZER(rte_dpaa_bus.device_list), .driver_list = TAILQ_HEAD_INITIALIZER(rte_dpaa_bus.driver_list),