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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 D59F4C742BA for ; Fri, 12 Jul 2019 12:26:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA1E82084B for ; Fri, 12 Jul 2019 12:26:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934371; bh=vQBdzWuLn1sqfRcFF+gUmWpDuYA8gg4YVK5T3Ukjz2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Yql4kt4ADg+PR/o6Gl5JrAQyADx+zTTwEPceQ5tkqQtcTdCurOvgUgzuWRRqCDDqB r/huXbJ4ODIGHmTu7O1QtgrBW4jyIgmJoFQR1Rg14FNH3RG3uAfJAMQR/7XawOsSUy ejQwZCorCKlpQ6AD5rPu765fiJvjtZHNLDOAk2kE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727788AbfGLM0K (ORCPT ); Fri, 12 Jul 2019 08:26:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:36876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728395AbfGLM0H (ORCPT ); Fri, 12 Jul 2019 08:26:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0DF682084B; Fri, 12 Jul 2019 12:26:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934366; bh=vQBdzWuLn1sqfRcFF+gUmWpDuYA8gg4YVK5T3Ukjz2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N9sVsrrhc+GeEMtUcQ0/NsIDwh6ML3Yc0tWS547HF7M2xB/Onp52h7k4gpdV9LrOS vHCwhs+TmQmpdKO9938cDoVdt33G0jC+rs0xjpZ7eyvoYwwMRQdJEC1HA5dWwjO27k zv0OUP1I/+RPvi40B/Cvp0UWHtqeAlGdreQPtw9Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , Sasha Levin Subject: [PATCH 5.1 009/138] soc: bcm: brcmstb: biuctrl: Register writes require a barrier Date: Fri, 12 Jul 2019 14:17:53 +0200 Message-Id: <20190712121629.069994333@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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