On 3/2/2020 2:58 PM, Hemant Agrawal wrote:
> From: Nipun Gupta <nipun.gu...@nxp.com>
> 
> The patch adds support for portal migration by disabling stashing
> for the portals which is used in the non-affined threads, or on
> threads affined to multiple cores
> 
> Signed-off-by: Nipun Gupta <nipun.gu...@nxp.com>

<...>

> @@ -754,7 +856,7 @@ static int qbman_swp_enqueue_ring_mode_cinh_direct(
>                       return -EBUSY;
>       }
>  
> -     p = qbman_cena_write_start_wo_shadow(&s->sys,
> +     p = qbman_cinh_write_start_wo_shadow(&s->sys,
>                       QBMAN_CENA_SWP_EQCR(s->eqcr.pi & half_mask));
>       memcpy(&p[1], &cl[1], 28);
>       memcpy(&p[8], fd, sizeof(*fd));
> @@ -762,8 +864,44 @@ static int qbman_swp_enqueue_ring_mode_cinh_direct(
>  
>       /* Set the verb byte, have to substitute in the valid-bit */
>       p[0] = cl[0] | s->eqcr.pi_vb;
> -     qbman_cena_write_complete_wo_shadow(&s->sys,
> +     s->eqcr.pi++;
> +     s->eqcr.pi &= full_mask;
> +     s->eqcr.available--;
> +     if (!(s->eqcr.pi & half_mask))
> +             s->eqcr.pi_vb ^= QB_VALID_BIT;
> +
> +     return 0;
> +}
> +
> +static int qbman_swp_enqueue_ring_mode_cinh_direct(
> +             struct qbman_swp *s,
> +             const struct qbman_eq_desc *d,
> +             const struct qbman_fd *fd)
> +{

This patch is adding a second 'qbman_swp_enqueue_ring_mode_cinh_direct()'
function, it may be a git artifact.

The duplicated functions seems removed later but this patch is wrong, needs
fixing. Please make sure each patch in series is functional and compiles fine.

Reply via email to