queue-4.14/mailbox-bcm-flexrm-mailbox-fix-flexrm-ring-flush-tim.patch

   1 From 0bb42df6c9991ab7c90ed142c10d2da773b04a3f Mon Sep 17 00:00:00 2001
   2 From: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
   3 Date: Mon, 4 Feb 2019 11:21:29 -0800
   4 Subject: mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush timeout issue
   5
   6 [ Upstream commit d7bf31a0f85faaf63c63c39d55154825a1eaaea9 ]
   7
   8 RING_CONTROL reg was not written due to wrong address, hence all
   9 the subsequent ring flush was timing out.
  10
  11 Fixes: a371c10ea4b3 ("mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush sequence")
  12
  13 Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
  14 Signed-off-by: Ray Jui <ray.jui@broadcom.com>
  15 Reviewed-by: Scott Branden <scott.branden@broadcom.com>
  16 Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
  17 Signed-off-by: Sasha Levin <sashal@kernel.org>
  18 ---
  19  drivers/mailbox/bcm-flexrm-mailbox.c | 4 ++--
  20  1 file changed, 2 insertions(+), 2 deletions(-)
  21
  22 diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c
  23 index f052a3eb2098..7e3ed2714630 100644
  24 --- a/drivers/mailbox/bcm-flexrm-mailbox.c
  25 +++ b/drivers/mailbox/bcm-flexrm-mailbox.c
  26 @@ -1381,9 +1381,9 @@ static void flexrm_shutdown(struct mbox_chan *chan)
  27
  28         /* Clear ring flush state */
  29         timeout = 1000; /* timeout of 1s */
  30 -       writel_relaxed(0x0, ring + RING_CONTROL);
  31 +       writel_relaxed(0x0, ring->regs + RING_CONTROL);
  32         do {
  33 -               if (!(readl_relaxed(ring + RING_FLUSH_DONE) &
  34 +               if (!(readl_relaxed(ring->regs + RING_FLUSH_DONE) &
  35                       FLUSH_DONE_MASK))
  36                         break;
  37                 mdelay(1);
  38 --
  39 2.19.1
  40