From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2634CC43381 for ; Wed, 13 Mar 2019 19:13:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E614B2177E for ; Wed, 13 Mar 2019 19:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504427; bh=GdUHAWeYiOyha3GmjrPbeJGHLcwsMcLb0tBrMskunOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OrBev0RUhSWDLKuV1EM5fPbyFRP8HUiPV5cENSTk1Ud7+8hJs8RRAtXEtWe2c9gBR c8ulMOsthTqzq9YJGWXmJT5UaN88fAcspYxTutS3cbLlg4uIdzpKEqejMLe2WCVm9U 3DFtMC1zNkdX9nrxlDJ7oZnEYaWJVIKt5EEsD4eA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728065AbfCMTNp (ORCPT ); Wed, 13 Mar 2019 15:13:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:44162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728031AbfCMTNn (ORCPT ); Wed, 13 Mar 2019 15:13:43 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6F3B820693; Wed, 13 Mar 2019 19:13:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504422; bh=GdUHAWeYiOyha3GmjrPbeJGHLcwsMcLb0tBrMskunOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OYP79i+V89lhxUatJQtrWaET6GiH4sXjeEs8swTtK/U6DHrvruD9gNql7+o8B9udS nvKdXEk5U0Il+ALZo4pfrqY5RgwPyXnWqky4g36ewG9ljRlO+iZ7aW1VcPFdGXA/rf Hh/8mBB9H1gfXDydXdz9Vlt0flYJQ6bt5V882EzQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rayagonda Kokatanur , Ray Jui , Jassi Brar , Sasha Levin Subject: [PATCH AUTOSEL 4.19 19/48] mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush timeout issue Date: Wed, 13 Mar 2019 15:12:21 -0400 Message-Id: <20190313191250.158955-19-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191250.158955-1-sashal@kernel.org> References: <20190313191250.158955-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rayagonda Kokatanur [ 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 Signed-off-by: Ray Jui Reviewed-by: Scott Branden Signed-off-by: Jassi Brar Signed-off-by: Sasha Levin --- 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