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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 0FBB6C432C1 for ; Tue, 24 Sep 2019 16:54:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD87C21BE5 for ; Tue, 24 Sep 2019 16:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569344041; bh=Rx6N0Sztt597jJ0U1M8H59Tn/bYkHwhyjGXmagEO2vU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yQ53hy4XR1TYcn2l/0Aefb7vlFGi3gGDeov2Bwhe7JzMUNN9rLyemO+94x89cOFaI EGkZga8Rt1GJgsZKFiH7Q55QPiSzV4nU3R94DTkhbU2aqCJo9AuJBaGHhQYrVROa8b NUu3pog3ttk48r1+An7XNbejRya5QZlWFmdDnYSU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437245AbfIXQw1 (ORCPT ); Tue, 24 Sep 2019 12:52:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:45424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405125AbfIXQvz (ORCPT ); Tue, 24 Sep 2019 12:51:55 -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 209DD21D80; Tue, 24 Sep 2019 16:51:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569343915; bh=Rx6N0Sztt597jJ0U1M8H59Tn/bYkHwhyjGXmagEO2vU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kRwBLW6VBb1dVvz6GVff5X5UaQJ2Wc4k+NLwaGtYyZ0niNHKFe9rMCrvR67Rz3+8X hUIyGeQKqa0RSYr6MZLTGTVOX+jh1B5eUufBwU++ewn8CO3qP8wOi1CMajN6596zRm n7Q7oL0aCccBmyzWZY352qWLieCgdekFcoUMyQ28= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sowjanya Komatineni , Thierry Reding , Dmitry Osipenko , Linus Walleij , Sasha Levin , linux-gpio@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 12/19] pinctrl: tegra: Fix write barrier placement in pmx_writel Date: Tue, 24 Sep 2019 12:51:23 -0400 Message-Id: <20190924165130.28625-12-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924165130.28625-1-sashal@kernel.org> References: <20190924165130.28625-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Sowjanya Komatineni [ Upstream commit c2cf351eba2ff6002ce8eb178452219d2521e38e ] pmx_writel uses writel which inserts write barrier before the register write. This patch has fix to replace writel with writel_relaxed followed by a readback and memory barrier to ensure write operation is completed for successful pinctrl change. Acked-by: Thierry Reding Reviewed-by: Dmitry Osipenko Signed-off-by: Sowjanya Komatineni Link: https://lore.kernel.org/r/1565984527-5272-2-git-send-email-skomatineni@nvidia.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/tegra/pinctrl-tegra.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c index 277622b4b6fb9..1d9f63e954c71 100644 --- a/drivers/pinctrl/tegra/pinctrl-tegra.c +++ b/drivers/pinctrl/tegra/pinctrl-tegra.c @@ -52,7 +52,9 @@ static inline u32 pmx_readl(struct tegra_pmx *pmx, u32 bank, u32 reg) static inline void pmx_writel(struct tegra_pmx *pmx, u32 val, u32 bank, u32 reg) { - writel(val, pmx->regs[bank] + reg); + writel_relaxed(val, pmx->regs[bank] + reg); + /* make sure pinmux register write completed */ + pmx_readl(pmx, bank, reg); } static int tegra_pinctrl_get_groups_count(struct pinctrl_dev *pctldev) -- 2.20.1