soc: fsl: dpio: Prefer the CPU affine DPIO

Use the cpu affine DPIO unless there isn't one which can happen
if less DPIOs than cores are assign to the kernel.

Signed-off-by: Roy Pledge <[email protected]>
Signed-off-by: Ioana Ciornei <[email protected]>
Signed-off-by: Li Yang <[email protected]>

diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
index cd4f6410e8c2f89cdf94c3f2c1ab356449f7a205..f1080c7a3fe190f6c6475d1efe4d66b897a2041e 100644 (file)
--- a/drivers/soc/fsl/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -58,7 +58,7 @@ static inline struct dpaa2_io *service_select_by_cpu(struct dpaa2_io *d,
         * If cpu == -1, choose the current cpu, with no guarantees about
         * potentially being migrated away.
         */
         * If cpu == -1, choose the current cpu, with no guarantees about
         * potentially being migrated away.
         */

-       if (unlikely(cpu < 0))
+       if (cpu < 0)

                cpu = smp_processor_id();
 
        /* If a specific cpu was requested, pick it up immediately */
                cpu = smp_processor_id();
 
        /* If a specific cpu was requested, pick it up immediately */


@@ -70,6 +70,10 @@ static inline struct dpaa2_io *service_select(struct dpaa2_io *d)
        if (d)
                return d;
 
        if (d)
                return d;
 

+       d = service_select_by_cpu(d, -1);
+       if (d)
+               return d;
+

        spin_lock(&dpio_list_lock);
        d = list_entry(dpio_list.next, struct dpaa2_io, node);
        list_del(&d->node);
        spin_lock(&dpio_list_lock);
        d = list_entry(dpio_list.next, struct dpaa2_io, node);
        list_del(&d->node);