Return-Path: Received: from mail-wr0-f177.google.com ([209.85.128.177]:48576 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932817AbdIYJdn (ORCPT ); Mon, 25 Sep 2017 05:33:43 -0400 Received: by mail-wr0-f177.google.com with SMTP id 108so6673284wra.5 for ; Mon, 25 Sep 2017 02:33:43 -0700 (PDT) From: Anup Patel To: bcm-kernel-feedback-list@broadcom.com Cc: Anup Patel , stable@vger.kernel.org Subject: [PATCH INTERNAL 1/4] mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush sequence Date: Mon, 25 Sep 2017 15:03:20 +0530 Message-Id: <1506332003-31782-2-git-send-email-anup.patel@broadcom.com> In-Reply-To: <1506332003-31782-1-git-send-email-anup.patel@broadcom.com> References: <1506332003-31782-1-git-send-email-anup.patel@broadcom.com> Sender: stable-owner@vger.kernel.org List-ID: As-per suggestion from FlexRM HW folks, we have to first set FlexRM ring flush state and then clear it for FlexRM ring flush to work properly. Currently, the FlexRM driver has incomplete FlexRM ring flush sequence which causes repeated insmod+rmmod of mailbox client drivers to fail. This patch fixes FlexRM ring flush sequence in flexrm_shutdown() as described above. Fixes: dbc049eee730 ("mailbox: Add driver for Broadcom FlexRM ring manager") Signed-off-by: Anup Patel Reviewed-by: Scott Branden Cc: stable@vger.kernel.org --- drivers/mailbox/bcm-flexrm-mailbox.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c index ae61463..f052a3e 100644 --- a/drivers/mailbox/bcm-flexrm-mailbox.c +++ b/drivers/mailbox/bcm-flexrm-mailbox.c @@ -1365,8 +1365,8 @@ static void flexrm_shutdown(struct mbox_chan *chan) /* Disable/inactivate ring */ writel_relaxed(0x0, ring->regs + RING_CONTROL); - /* Flush ring with timeout of 1s */ - timeout = 1000; + /* Set ring flush state */ + timeout = 1000; /* timeout of 1s */ writel_relaxed(BIT(CONTROL_FLUSH_SHIFT), ring->regs + RING_CONTROL); do { @@ -1374,7 +1374,23 @@ static void flexrm_shutdown(struct mbox_chan *chan) FLUSH_DONE_MASK) break; mdelay(1); - } while (timeout--); + } while (--timeout); + if (!timeout) + dev_err(ring->mbox->dev, + "setting ring%d flush state timedout\n", ring->num); + + /* Clear ring flush state */ + timeout = 1000; /* timeout of 1s */ + writel_relaxed(0x0, ring + RING_CONTROL); + do { + if (!(readl_relaxed(ring + RING_FLUSH_DONE) & + FLUSH_DONE_MASK)) + break; + mdelay(1); + } while (--timeout); + if (!timeout) + dev_err(ring->mbox->dev, + "clearing ring%d flush state timedout\n", ring->num); /* Abort all in-flight requests */ for (reqid = 0; reqid < RING_MAX_REQ_COUNT; reqid++) { -- 2.7.4