drivers/bus: use lcore accessors
authorStephen Hemminger <stephen@networkplumber.org>
Fri, 31 May 2019 15:37:00 +0000 (17:37 +0200)
committerThomas Monjalon <thomas@monjalon.net>
Mon, 3 Jun 2019 10:30:04 +0000 (12:30 +0200)
The lcore_config structure will be hidden in future release.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David Marchand <david.marchand@redhat.com>
drivers/bus/dpaa/dpaa_bus.c
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c

index ac20ecc..08c8227 100644 (file)
@@ -254,6 +254,7 @@ int rte_dpaa_portal_init(void *arg)
        unsigned int cpu, lcore = rte_lcore_id();
        int ret;
        struct dpaa_portal *dpaa_io_portal;
+       rte_cpuset_t cpuset;
 
        BUS_INIT_FUNC_TRACE();
 
@@ -263,12 +264,13 @@ int rte_dpaa_portal_init(void *arg)
                if (lcore >= RTE_MAX_LCORE)
                        return -1;
 
-       cpu = lcore_config[lcore].core_id;
+       cpu = rte_lcore_to_cpu_id(lcore);
 
        /* Set CPU affinity for this thread.*/
        id = pthread_self();
+       cpuset = rte_lcore_cpuset(lcore);
        ret = pthread_setaffinity_np(id, sizeof(cpu_set_t),
-                       &lcore_config[lcore].cpuset);
+                                    &cpuset);
        if (ret) {
                DPAA_BUS_LOG(ERR, "pthread_setaffinity_np failed on core :%u"
                             " (lcore=%u) with ret: %d", cpu, lcore, ret);
index 7bcbde8..8efb24a 100644 (file)
@@ -366,7 +366,9 @@ dpaa2_check_lcore_cpuset(void)
 
        for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
                for (i = 0; i < RTE_MAX_LCORE; i++) {
-                       if (CPU_ISSET(i, &lcore_config[lcore_id].cpuset)) {
+                       rte_cpuset_t cpuset = rte_lcore_cpuset(lcore_id);
+
+                       if (CPU_ISSET(i, &cpuset)) {
                                RTE_LOG(DEBUG, EAL, "lcore id = %u cpu=%u\n",
                                        lcore_id, i);
                                if (dpaa2_cpu[lcore_id] != 0xffffffff) {