Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937254AbdDZQFF (ORCPT ); Wed, 26 Apr 2017 12:05:05 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:53421 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935383AbdDZQEf (ORCPT ); Wed, 26 Apr 2017 12:04:35 -0400 From: Alexandre Belloni To: Nicolas Ferre Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Wenyou.Yang@microchip.com, Alexandre Belloni 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1298 Lines: 48 If the backup sram allocation fails, ensure we can suspend by falling back to the usual slow clock mode. Signed-off-by: Alexandre Belloni --- 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 { -- 2.11.0