From patchwork Tue Nov 20 17:19:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 10690949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 57AA01709 for ; Tue, 20 Nov 2018 17:30:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DFF82ACAA for ; Tue, 20 Nov 2018 17:30:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 318A42ACCF; Tue, 20 Nov 2018 17:30:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BBE742ACAA for ; Tue, 20 Nov 2018 17:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=x/Tw979nXTuYG1KOUsfdhyvH7B95/AUJSpmpe2CqAfc=; b=LO+g2ZQc9pLRvO fZft2vkDrSR2VzkUQF3tUftA7nvZ9wZ/SapMG0tNLgZejQSV7phlBGHD7DeZLqS/cB444R4pLhB9V z/D7lbUkdD6EYZcb+17ZzyGeuTHZRcmJ7d9AZBH13sL+Y/ralJp9Ug7tUCHe2WYjxNKL+0f1lPclh MDsBPyLJeBc8lKC6LJW0bm4nDugq89FqoqGM/TMNd8277LZvN50Hno42sPxCqR42ExQdAMyTQ8wiv GxQ80jOm8jpdkg4hYEC40YBYUG8WpjO1XUE5Ct+6ycjI5TARpUN2IsuMe9LqIXWvQxtybBguaMH1y bvwW5/Ov0qnax9YpRFPg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP9qT-0004qc-PD; Tue, 20 Nov 2018 17:29:53 +0000 Received: from anholt.net ([50.246.234.109]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP9q1-0004Hb-8I; Tue, 20 Nov 2018 17:29:31 +0000 Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id D1A0810A0B73; Tue, 20 Nov 2018 09:20:06 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at anholt.net Received: from anholt.net ([127.0.0.1]) by localhost (kingsolver.anholt.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id U9zRuxXkSd8t; Tue, 20 Nov 2018 09:20:05 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 53A8B10A15B1; Tue, 20 Nov 2018 09:20:01 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 14F862FE1FE9; Tue, 20 Nov 2018 09:20:00 -0800 (PST) From: Eric Anholt To: Florian Fainelli , Rob Herring , Mark Rutland , Wim Van Sebroeck , Guenter Roeck , linux-watchdog@vger.kernel.org Subject: [PATCH 3/8] soc: bcm: bcm2835-pm: Stop using _relaxed mmio accessors. Date: Tue, 20 Nov 2018 09:19:55 -0800 Message-Id: <20181120172000.15102-4-eric@anholt.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181120172000.15102-1-eric@anholt.net> References: <20181120172000.15102-1-eric@anholt.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_092925_330998_369E27CE X-CRM114-Status: GOOD ( 13.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , linux-kernel@vger.kernel.org, Eric Anholt , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We definitely don't want I/O to be reordered here (like the setting of the WDT timeout before enabling the WDT). None of this is performance critical, anyway. Signed-off-by: Eric Anholt --- drivers/soc/bcm/bcm2835-pm.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/soc/bcm/bcm2835-pm.c b/drivers/soc/bcm/bcm2835-pm.c index ca37145e4e40..decc316fbe40 100644 --- a/drivers/soc/bcm/bcm2835-pm.c +++ b/drivers/soc/bcm/bcm2835-pm.c @@ -67,11 +67,11 @@ static int bcm2835_wdt_start(struct watchdog_device *wdog) spin_lock_irqsave(&pm->lock, flags); - writel_relaxed(PM_PASSWORD | (SECS_TO_WDOG_TICKS(wdog->timeout) & - PM_WDOG_TIME_SET), pm->base + PM_WDOG); - cur = readl_relaxed(pm->base + PM_RSTC); - writel_relaxed(PM_PASSWORD | (cur & PM_RSTC_WRCFG_CLR) | - PM_RSTC_WRCFG_FULL_RESET, pm->base + PM_RSTC); + writel(PM_PASSWORD | (SECS_TO_WDOG_TICKS(wdog->timeout) & + PM_WDOG_TIME_SET), pm->base + PM_WDOG); + cur = readl(pm->base + PM_RSTC); + writel(PM_PASSWORD | (cur & PM_RSTC_WRCFG_CLR) | + PM_RSTC_WRCFG_FULL_RESET, pm->base + PM_RSTC); spin_unlock_irqrestore(&pm->lock, flags); @@ -82,7 +82,7 @@ static int bcm2835_wdt_stop(struct watchdog_device *wdog) { struct bcm2835_pm *pm = watchdog_get_drvdata(wdog); - writel_relaxed(PM_PASSWORD | PM_RSTC_RESET, pm->base + PM_RSTC); + writel(PM_PASSWORD | PM_RSTC_RESET, pm->base + PM_RSTC); return 0; } @@ -90,7 +90,7 @@ static unsigned int bcm2835_wdt_get_timeleft(struct watchdog_device *wdog) { struct bcm2835_pm *pm = watchdog_get_drvdata(wdog); - uint32_t ret = readl_relaxed(pm->base + PM_WDOG); + uint32_t ret = readl(pm->base + PM_WDOG); return WDOG_TICKS_TO_SECS(ret & PM_WDOG_TIME_SET); } @@ -99,11 +99,11 @@ static void __bcm2835_restart(struct bcm2835_pm *pm) u32 val; /* use a timeout of 10 ticks (~150us) */ - writel_relaxed(10 | PM_PASSWORD, pm->base + PM_WDOG); - val = readl_relaxed(pm->base + PM_RSTC); + writel(10 | PM_PASSWORD, pm->base + PM_WDOG); + val = readl(pm->base + PM_RSTC); val &= PM_RSTC_WRCFG_CLR; val |= PM_PASSWORD | PM_RSTC_WRCFG_FULL_RESET; - writel_relaxed(val, pm->base + PM_RSTC); + writel(val, pm->base + PM_RSTC); /* No sleeping, possibly atomic. */ mdelay(1); @@ -159,9 +159,9 @@ static void bcm2835_power_off(void) * from the normal (full) reset. bootcode.bin will not reboot after a * hard reset. */ - val = readl_relaxed(pm->base + PM_RSTS); + val = readl(pm->base + PM_RSTS); val |= PM_PASSWORD | PM_RSTS_RASPBERRYPI_HALT; - writel_relaxed(val, pm->base + PM_RSTS); + writel(val, pm->base + PM_RSTS); /* Continue with normal reset mechanism */ __bcm2835_restart(pm);