From patchwork Tue Nov 20 17:19:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 10690965 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 9760713AD for ; Tue, 20 Nov 2018 17:44:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8277A27E01 for ; Tue, 20 Nov 2018 17:44:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7491728647; Tue, 20 Nov 2018 17:44:49 +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 E87ED27E01 for ; Tue, 20 Nov 2018 17:44:48 +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=KeqDgvXNZujRzssKTIIZfOapKz7BYGxwIkeUZTUOpGw=; b=MW8IVHFIkzY8i7 o52Vp5Rv8VWCJMIcq2Evrcn9eLpMRmEkIBbRhZ0R+6cUhdDjUf+1tUY0Des9Vz6FwAzPFJN2P5sm7 UnmNnoqoTVIjJlo8fFb9hi+GN6dpUFhq9xAA7Qy7wSnsqeAwkgCWP7n1ISQOFtThJhd80HKdNaCek FY4e4yTD23GSvpobU44P1POVzpo4R6OM+jPhFFVW806lAofBK+ny/cm79pbJ3I0WmHb+Xj+3nZD5E ufT+iwBDD9HImtoZP8DM3S4L2e9TGFJ0rF+4OgeygD6Oo+vl4ch5S74L+w2lCa06KU8MkEL2b+zlJ 2lg3uVBihz3fH6LWgJIw==; 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 1gPA4o-0005TQ-7G; Tue, 20 Nov 2018 17:44:42 +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-0004Ha-8W; Tue, 20 Nov 2018 17:29:31 +0000 Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id B989310A15F5; Tue, 20 Nov 2018 09:20:04 -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 Me05flsQgnvf; Tue, 20 Nov 2018 09:20:01 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 1B0B910A0396; Tue, 20 Nov 2018 09:20:01 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 197242FE1FEA; 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 4/8] soc: bcm: bcm2835-pm: Make some little accessor macros for the mmio area. Date: Tue, 20 Nov 2018 09:19:56 -0800 Message-Id: <20181120172000.15102-5-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_335260_DED5ADB6 X-CRM114-Status: GOOD ( 14.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 This is more legible than trying to remember to set PM_PASSWORD on everything. Signed-off-by: Eric Anholt --- drivers/soc/bcm/bcm2835-pm.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/soc/bcm/bcm2835-pm.c b/drivers/soc/bcm/bcm2835-pm.c index decc316fbe40..e504381556cf 100644 --- a/drivers/soc/bcm/bcm2835-pm.c +++ b/drivers/soc/bcm/bcm2835-pm.c @@ -32,6 +32,9 @@ #define PM_RSTC_WRCFG_FULL_RESET 0x00000020 #define PM_RSTC_RESET 0x00000102 +#define PM_READ(reg) readl(pm->base + (reg)) +#define PM_WRITE(reg, val) writel(PM_PASSWORD | (val), pm->base + (reg)) + /* * The Raspberry Pi firmware uses the RSTS register to know which partition * to boot from. The partition value is spread into bits 0, 2, 4, 6, 8, 10. @@ -54,7 +57,7 @@ static bool bcm2835_wdt_is_running(struct bcm2835_pm *pm) { uint32_t cur; - cur = readl(pm->base + PM_RSTC); + cur = PM_READ(PM_RSTC); return !!(cur & PM_RSTC_WRCFG_FULL_RESET); } @@ -67,11 +70,9 @@ static int bcm2835_wdt_start(struct watchdog_device *wdog) spin_lock_irqsave(&pm->lock, flags); - 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); + PM_WRITE(PM_WDOG, SECS_TO_WDOG_TICKS(wdog->timeout) & PM_WDOG_TIME_SET); + cur = PM_READ(PM_RSTC); + PM_WRITE(PM_RSTC, (cur & PM_RSTC_WRCFG_CLR) | PM_RSTC_WRCFG_FULL_RESET); spin_unlock_irqrestore(&pm->lock, flags); @@ -82,7 +83,7 @@ static int bcm2835_wdt_stop(struct watchdog_device *wdog) { struct bcm2835_pm *pm = watchdog_get_drvdata(wdog); - writel(PM_PASSWORD | PM_RSTC_RESET, pm->base + PM_RSTC); + PM_WRITE(PM_RSTC, PM_RSTC_RESET); return 0; } @@ -90,7 +91,7 @@ static unsigned int bcm2835_wdt_get_timeleft(struct watchdog_device *wdog) { struct bcm2835_pm *pm = watchdog_get_drvdata(wdog); - uint32_t ret = readl(pm->base + PM_WDOG); + uint32_t ret = PM_READ(PM_WDOG); return WDOG_TICKS_TO_SECS(ret & PM_WDOG_TIME_SET); } @@ -100,7 +101,7 @@ static void __bcm2835_restart(struct bcm2835_pm *pm) /* use a timeout of 10 ticks (~150us) */ writel(10 | PM_PASSWORD, pm->base + PM_WDOG); - val = readl(pm->base + PM_RSTC); + val = PM_READ(PM_RSTC); val &= PM_RSTC_WRCFG_CLR; val |= PM_PASSWORD | PM_RSTC_WRCFG_FULL_RESET; writel(val, pm->base + PM_RSTC); @@ -159,7 +160,7 @@ static void bcm2835_power_off(void) * from the normal (full) reset. bootcode.bin will not reboot after a * hard reset. */ - val = readl(pm->base + PM_RSTS); + val = PM_READ(PM_RSTS); val |= PM_PASSWORD | PM_RSTS_RASPBERRYPI_HALT; writel(val, pm->base + PM_RSTS);