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_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 8FCFDC48BD3 for ; Thu, 27 Jun 2019 00:30:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 591D5216E3 for ; Thu, 27 Jun 2019 00:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595446; bh=rmZIhleNuh6lMVcv/6wYDZ+Aea04s6m61y6E95rWa/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Y+8qzKl+eusXlA29YOh9iPC0WPBpVUTlPBx+le5stiY9jMRRKlNJJtn05tI+Kpzg0 K+rqTCSrsZHEzpUZxuo8K1CXbQUW9AykLDb3ldqPTt3PmuDmWYfzglt6aW6OnbkwwP zqlF1Iim1r8J5n8z1coE2MIb0BBGHQ3U6PRS5yIQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726905AbfF0Aap (ORCPT ); Wed, 26 Jun 2019 20:30:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:33938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726862AbfF0Aan (ORCPT ); Wed, 26 Jun 2019 20:30:43 -0400 Received: from sasha-vm.mshome.net (unknown [107.242.116.147]) (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 48642216E3; Thu, 27 Jun 2019 00:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595442; bh=rmZIhleNuh6lMVcv/6wYDZ+Aea04s6m61y6E95rWa/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GOiTIyJe4slL7uc4jwwXLRw6kf45bXTpdWgKoTXy39lKtHtm+njODvdEraoPKoVWu mmKnnCaISIyKfgjNZ85TW5LreSC6S6oPoyAFC4ylyH2JhEm7GBurSt+1M6Rvt1JeV3 p3eqKk3FFhbO/Q3K3sa4IvbHuFuTP4S53yl8/0LE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Fainelli , Sasha Levin Subject: [PATCH AUTOSEL 5.1 06/95] soc: bcm: brcmstb: biuctrl: Register writes require a barrier Date: Wed, 26 Jun 2019 20:28:51 -0400 Message-Id: <20190627003021.19867-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627003021.19867-1-sashal@kernel.org> References: <20190627003021.19867-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: Florian Fainelli [ Upstream commit 6b23af0783a54efb348f0bd781b7850636023dbb ] The BIUCTRL register writes require that a data barrier be inserted after comitting the write to the register for the block to latch in the recently written values. Reads have no such requirement and are not changed. Fixes: 34642650e5bc ("soc: Move brcmstb to bcm/brcmstb") Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- drivers/soc/bcm/brcmstb/biuctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c index c16273b31b94..20b63bee5b09 100644 --- a/drivers/soc/bcm/brcmstb/biuctrl.c +++ b/drivers/soc/bcm/brcmstb/biuctrl.c @@ -56,7 +56,7 @@ static inline void cbc_writel(u32 val, int reg) if (offset == -1) return; - writel_relaxed(val, cpubiuctrl_base + offset); + writel(val, cpubiuctrl_base + offset); } enum cpubiuctrl_regs { -- 2.20.1