lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 085/280] mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush timeout issue
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit d7bf31a0f85faaf63c63c39d55154825a1eaaea9 ]

    RING_CONTROL reg was not written due to wrong address, hence all
    the subsequent ring flush was timing out.

    Fixes: a371c10ea4b3 ("mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush sequence")

    Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
    Signed-off-by: Ray Jui <ray.jui@broadcom.com>
    Reviewed-by: Scott Branden <scott.branden@broadcom.com>
    Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mailbox/bcm-flexrm-mailbox.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c
    index 8ab077ff58f4..96bcabfebc23 100644
    --- a/drivers/mailbox/bcm-flexrm-mailbox.c
    +++ b/drivers/mailbox/bcm-flexrm-mailbox.c
    @@ -1396,9 +1396,9 @@ static void flexrm_shutdown(struct mbox_chan *chan)

    /* Clear ring flush state */
    timeout = 1000; /* timeout of 1s */
    - writel_relaxed(0x0, ring + RING_CONTROL);
    + writel_relaxed(0x0, ring->regs + RING_CONTROL);
    do {
    - if (!(readl_relaxed(ring + RING_FLUSH_DONE) &
    + if (!(readl_relaxed(ring->regs + RING_FLUSH_DONE) &
    FLUSH_DONE_MASK))
    break;
    mdelay(1);
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-22 13:45    [W:2.692 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site