lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 035/376] soc: fsl: dpio: properly compute the consumer index
    Date
    From: Ioana Ciornei <ioana.ciornei@nxp.com>

    [ Upstream commit 7596ac9d19a9df25707ecaac0675881f62dd8c18 ]

    Mask the consumer index before using it. Without this, we would be
    writing frame descriptors beyond the ring size supported by the QBMAN
    block.

    Fixes: 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array mode with ring mode enqueue")
    Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
    Acked-by: Li Yang <leoyang.li@nxp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/fsl/dpio/qbman-portal.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/soc/fsl/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c
    index 804b8ba9bf5c..23a1377971f4 100644
    --- a/drivers/soc/fsl/dpio/qbman-portal.c
    +++ b/drivers/soc/fsl/dpio/qbman-portal.c
    @@ -669,6 +669,7 @@ int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s,
    eqcr_ci = s->eqcr.ci;
    p = s->addr_cena + QBMAN_CENA_SWP_EQCR_CI;
    s->eqcr.ci = qbman_read_register(s, QBMAN_CINH_SWP_EQCR_CI);
    + s->eqcr.ci &= full_mask;

    s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
    eqcr_ci, s->eqcr.ci);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 17:59    [W:4.033 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site