From patchwork Wed Apr 26 16:04:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 9701675 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 040B660245 for ; Wed, 26 Apr 2017 16:04:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9D462847F for ; Wed, 26 Apr 2017 16:04:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE7F9285F4; Wed, 26 Apr 2017 16:04:51 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 676832847F for ; Wed, 26 Apr 2017 16:04:51 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=gf0ZSbPjqKjp5LpiLQZ8K4EJfYaCqWFb3lkaQeVqZpY=; b=iVD45kc+s3ZkBETPyK1QwgRzJE YcxruYJnqe85MR/R24P+/6M0vu5U9VaS7CA/TJuwHecSbHABiruTG08pnpiXwLgJ3HVm6xEn/ruOo PDSSxwN6BC4a0ovnvzlsShLM3PJSVdCKRlHNYbmcuvwxgDTyRkPVi0U5sTU0xkr5/SaG55YHf5WpC Xz4TCBcrqM7ZTMWwefypyUOojYsIyFuu5mx9Z7zVme10Z/CMluZ5E7BlLf/mA5ZC2nicNQRK5csbw wpt+b90ACGkoCugG4x1Wg3GN1l3p28PkO1HXJkMZ7r5M3tdPWTQ1UmxdYSuh8fT8YzjkzsmYQKMny HmLI81qA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d3PQx-0003nN-3H; Wed, 26 Apr 2017 16:04:51 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d3PQt-0003iR-5f for linux-arm-kernel@lists.infradead.org; Wed, 26 Apr 2017 16:04:49 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id CD2B120D88; Wed, 26 Apr 2017 18:04:21 +0200 (CEST) Received: from localhost (unknown [88.191.26.124]) by mail.free-electrons.com (Postfix) with ESMTPSA id A6C6420D23; Wed, 26 Apr 2017 18:04:21 +0200 (CEST) From: Alexandre Belloni To: Nicolas Ferre Subject: [PATCH 3/3] ARM: at91: pm: fallback to slowclock when backup mode fails Date: Wed, 26 Apr 2017 18:04:19 +0200 Message-Id: <20170426160419.22401-3-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170426160419.22401-1-alexandre.belloni@free-electrons.com> References: <20170426160419.22401-1-alexandre.belloni@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170426_090447_423630_B7C415D1 X-CRM114-Status: GOOD ( 11.18 ) 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: Alexandre Belloni , Wenyou.Yang@microchip.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 If the backup sram allocation fails, ensure we can suspend by falling back to the usual slow clock mode. Signed-off-by: Alexandre Belloni Acked-by: Wenyou Yang --- arch/arm/mach-at91/pm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index d08f032f9d94..02823d8f3ada 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -519,24 +519,30 @@ static void __init at91_pm_bu_sram_init(void) if (!pdev) { pr_warn("%s: failed to find securam device!\n", __func__); - return; + goto fallback; } sram_pool = gen_pool_get(&pdev->dev, NULL); if (!sram_pool) { pr_warn("%s: securam pool unavailable!\n", __func__); - return; + goto fallback; } pm_bu = (void *)gen_pool_alloc(sram_pool, sizeof(struct at91_pm_bu)); if (!pm_bu) { pr_warn("%s: unable to alloc securam!\n", __func__); - return; + goto fallback; } pm_bu->suspended = 0; pm_bu->canary = virt_to_phys(&canary); pm_bu->resume = virt_to_phys(cpu_resume); + +fallback: + if (pm_data.standby_mode == AT91_PM_BACKUP) + pm_data.standby_mode = AT91_PM_SLOW_CLOCK; + if (pm_data.suspend_mode != AT91_PM_BACKUP) + pm_data.suspend_mode = AT91_PM_SLOW_CLOCK; } struct pmc_info {