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=-10.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 7425EC433E0 for ; Mon, 3 Aug 2020 08:34:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 52D08206D7 for ; Mon, 3 Aug 2020 08:34:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726218AbgHCIek (ORCPT ); Mon, 3 Aug 2020 04:34:40 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:53323 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725831AbgHCIek (ORCPT ); Mon, 3 Aug 2020 04:34:40 -0400 X-Originating-IP: 90.66.108.79 Received: from localhost (lfbn-lyo-1-1932-79.w90-66.abo.wanadoo.fr [90.66.108.79]) (Authenticated sender: alexandre.belloni@bootlin.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 8DBF6E0006; Mon, 3 Aug 2020 08:34:36 +0000 (UTC) Date: Mon, 3 Aug 2020 10:34:36 +0200 From: Alexandre Belloni To: Claudiu Beznea Cc: nicolas.ferre@microchip.com, ludovic.desroches@microchip.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/3] ARM: at91: pm: add per soc validation of pm modes Message-ID: <20200803083436.GG3679@piout.net> References: <1596439517-12993-1-git-send-email-claudiu.beznea@microchip.com> <1596439517-12993-3-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1596439517-12993-3-git-send-email-claudiu.beznea@microchip.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/08/2020 10:25:16+0300, Claudiu Beznea wrote: > Not all SoCs supports all the PM mode. User may end up settings, > e.g. backup mode, on a non SAMA5D2 device, but the mode to not be valid. > If backup mode is used on a devices not supporting it there will be no > way of resuming other than rebooting. I don't think this actually happens as if backup mode is requested on a non sama5d2 device, of_find_compatible_node(NULL, NULL, "atmel,sama5d2-sfrbu") will fail and the PM will default to AT91_PM_ULP0. ULP1 will also default to ULP0 if the shdwc is not from sama5d2 or sam9x60. I'm guessing the actual issue is introduced with ulp0 fast. > > Signed-off-by: Claudiu Beznea > --- > arch/arm/mach-at91/at91rm9200.c | 10 +++++- > arch/arm/mach-at91/at91sam9.c | 9 +++++- > arch/arm/mach-at91/generic.h | 20 ++++++------ > arch/arm/mach-at91/pm.c | 69 +++++++++++++++++++++++++++++++++++++---- > arch/arm/mach-at91/sam9x60.c | 11 ++++++- > arch/arm/mach-at91/sama5.c | 21 +++++++++++-- > 6 files changed, 119 insertions(+), 21 deletions(-) > > diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c > index 4f8186211619..7318d8e16797 100644 > --- a/arch/arm/mach-at91/at91rm9200.c > +++ b/arch/arm/mach-at91/at91rm9200.c > @@ -13,12 +13,20 @@ > #include > > #include "generic.h" > +#include "pm.h" > + > +/* AT91RM9200 valid PM modes. */ > +static const int at91rm9200_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > +}; > > static void __init at91rm9200_dt_device_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > > - at91rm9200_pm_init(); > + at91rm9200_pm_init(at91rm9200_pm_modes, > + ARRAY_SIZE(at91rm9200_pm_modes)); > } > You can avoid the changes in the soc files and leave everything contained in pm.c as each _pm_init has a known list of mode that will very likely never change. Bonus points if you make the arrays __initdata. > static const char *const at91rm9200_dt_board_compat[] __initconst = { > diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c > index 7e572189a5eb..683f2c35a116 100644 > --- a/arch/arm/mach-at91/at91sam9.c > +++ b/arch/arm/mach-at91/at91sam9.c > @@ -13,12 +13,19 @@ > #include > > #include "generic.h" > +#include "pm.h" > + > +/* AT91SAM9 valid PM modes. */ > +static const int at91sam9_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > +}; > > static void __init at91sam9_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > > - at91sam9_pm_init(); > + at91sam9_pm_init(at91sam9_pm_modes, ARRAY_SIZE(at91sam9_pm_modes)); > } > > static const char *const at91_dt_board_compat[] __initconst = { > diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h > index 0a4cdcb4985b..610a12e5a71c 100644 > --- a/arch/arm/mach-at91/generic.h > +++ b/arch/arm/mach-at91/generic.h > @@ -9,17 +9,17 @@ > #define _AT91_GENERIC_H > > #ifdef CONFIG_PM > -extern void __init at91rm9200_pm_init(void); > -extern void __init at91sam9_pm_init(void); > -extern void __init sam9x60_pm_init(void); > -extern void __init sama5_pm_init(void); > -extern void __init sama5d2_pm_init(void); > +extern void __init at91rm9200_pm_init(const int *modes, int len); > +extern void __init at91sam9_pm_init(const int *modes, int len); > +extern void __init sam9x60_pm_init(const int *modes, int len); > +extern void __init sama5_pm_init(const int *modes, int len); > +extern void __init sama5d2_pm_init(const int *modes, int len); > #else > -static inline void __init at91rm9200_pm_init(void) { } > -static inline void __init at91sam9_pm_init(void) { } > -static inline void __init sam9x60_pm_init(void) { } > -static inline void __init sama5_pm_init(void) { } > -static inline void __init sama5d2_pm_init(void) { } > +static inline void __init at91rm9200_pm_init(const int *modes, int len) { } > +static inline void __init at91sam9_pm_init(const int *modes, int len) { } > +static inline void __init sam9x60_pm_init(const int *modes, int len) { } > +static inline void __init sama5_pm_init(const int *modes, int len) { } > +static inline void __init sama5d2_pm_init(const int *modes, int len) { } > #endif > Then this change is not necessary. > #endif /* _AT91_GENERIC_H */ > diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c > index 04fdcbd57100..caf87efc7eeb 100644 > --- a/arch/arm/mach-at91/pm.c > +++ b/arch/arm/mach-at91/pm.c > @@ -785,6 +785,59 @@ static const struct of_device_id atmel_pmc_ids[] __initconst = { > { /* sentinel */ }, > }; > > +static void __init at91_pm_modes_validate(const int *modes, int len) > +{ > + u8 i, located = 0; > + int mode; > + > +#define STANDBY BIT(0) > +#define SUSPEND BIT(1) > + > + for (i = 0; i < len; i++) { > + if ((located & STANDBY) && (located & SUSPEND)) > + break; > + > + if (modes[i] == soc_pm.data.standby_mode && > + !(located & STANDBY)) { > + located |= STANDBY; > + continue; > + } > + > + if (modes[i] == soc_pm.data.suspend_mode && > + !(located & SUSPEND)) { > + located |= SUSPEND; > + continue; > + } > + } > + > + if (!(located & STANDBY)) { > + if (soc_pm.data.suspend_mode == AT91_PM_STANDBY) > + mode = AT91_PM_ULP0; > + else > + mode = AT91_PM_STANDBY; > + > + pr_warn("AT91: PM: %s mode not supported! Using %s.\n", > + pm_modes[soc_pm.data.standby_mode].pattern, > + pm_modes[mode].pattern); > + soc_pm.data.standby_mode = mode; > + } > + > + if (!(located & SUSPEND)) { > + if (soc_pm.data.standby_mode == AT91_PM_ULP0) > + mode = AT91_PM_STANDBY; > + else > + mode = AT91_PM_ULP0; > + > + pr_warn("AT91: PM: %s mode not supported! Using %s.\n", > + pm_modes[soc_pm.data.suspend_mode].pattern, > + pm_modes[mode].pattern); > + soc_pm.data.suspend_mode = mode; > + } > + > +#undef STANDBY > +#undef SUSPEND You should use two booleans instead of a bit array, this would not make the code longer and will avoid this #def/#undef thing. > +} > + > static void __init at91_pm_init(void (*pm_idle)(void)) > { > struct device_node *pmc_np; > @@ -821,11 +874,12 @@ static void __init at91_pm_init(void (*pm_idle)(void)) > } > } > > -void __init at91rm9200_pm_init(void) > +void __init at91rm9200_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_AT91RM9200)) > return; > > + at91_pm_modes_validate(modes, len); > at91_dt_ramc(); > > /* > @@ -836,11 +890,12 @@ void __init at91rm9200_pm_init(void) > at91_pm_init(at91rm9200_idle); > } > > -void __init sam9x60_pm_init(void) > +void __init sam9x60_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_SAM9X60)) > return; > > + at91_pm_modes_validate(modes, len); > at91_pm_modes_init(); > at91_dt_ramc(); > at91_pm_init(at91sam9x60_idle); > @@ -849,31 +904,33 @@ void __init sam9x60_pm_init(void) > soc_pm.config_pmc_ws = at91_sam9x60_config_pmc_ws; > } > > -void __init at91sam9_pm_init(void) > +void __init at91sam9_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_AT91SAM9)) > return; > > + at91_pm_modes_validate(modes, len); > at91_dt_ramc(); > at91_pm_init(at91sam9_idle); > } > > -void __init sama5_pm_init(void) > +void __init sama5_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_SAMA5)) > return; > > + at91_pm_modes_validate(modes, len); > at91_dt_ramc(); > at91_pm_init(NULL); > } > > -void __init sama5d2_pm_init(void) > +void __init sama5d2_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_SAMA5D2)) > return; > > + sama5_pm_init(modes, len); > at91_pm_modes_init(); > - sama5_pm_init(); > > soc_pm.ws_ids = sama5d2_ws_ids; > soc_pm.config_shdwc_ws = at91_sama5d2_config_shdwc_ws; > diff --git a/arch/arm/mach-at91/sam9x60.c b/arch/arm/mach-at91/sam9x60.c > index d8c739d25458..d7c869c7b542 100644 > --- a/arch/arm/mach-at91/sam9x60.c > +++ b/arch/arm/mach-at91/sam9x60.c > @@ -14,12 +14,21 @@ > #include > > #include "generic.h" > +#include "pm.h" > + > +/* SAM9X60 valid PM modes. */ > +static const int sam9x60_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > + AT91_PM_ULP0_FAST, > + AT91_PM_ULP1, > +}; > > static void __init sam9x60_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > > - sam9x60_pm_init(); > + sam9x60_pm_init(sam9x60_pm_modes, ARRAY_SIZE(sam9x60_pm_modes)); > } > > static const char *const sam9x60_dt_board_compat[] __initconst = { > diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c > index 89dab7cf01e8..7eb124612a10 100644 > --- a/arch/arm/mach-at91/sama5.c > +++ b/arch/arm/mach-at91/sama5.c > @@ -14,11 +14,19 @@ > #include > > #include "generic.h" > +#include "pm.h" > + > +/* SAMA5 valid PM modes. */ > +static const int sama5_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > + AT91_PM_ULP0_FAST, > +}; > > static void __init sama5_dt_device_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > - sama5_pm_init(); > + sama5_pm_init(sama5_pm_modes, ARRAY_SIZE(sama5_pm_modes)); > } > > static const char *const sama5_dt_board_compat[] __initconst = { > @@ -44,10 +52,19 @@ DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5") > .l2c_aux_mask = ~0UL, > MACHINE_END > > +/* sama5d2 PM modes. */ > +static const int sama5d2_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > + AT91_PM_ULP0_FAST, > + AT91_PM_ULP1, > + AT91_PM_BACKUP, > +}; > + > static void __init sama5d2_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > - sama5d2_pm_init(); > + sama5d2_pm_init(sama5d2_pm_modes, ARRAY_SIZE(sama5d2_pm_modes)); > } > > static const char *const sama5d2_compat[] __initconst = { > -- > 2.7.4 > -- Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com 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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 A4D58C433E0 for ; Mon, 3 Aug 2020 08:36:17 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 652CA20678 for ; Mon, 3 Aug 2020 08:36:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CUYlFZRN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 652CA20678 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4WGag8ypz8PtPo/PIn8+As/CqhBwo4shJ0hHUAGf/IA=; b=CUYlFZRNDOoZTqoFGOF39IxEj XpBLpksZJsiCWKk70L55HOhEaInqEvifzlQArky+YGGJSMC0nfSOAZkr0GxdpIHj7AfJGo+KN7RQn Gsb7d0y2Vq3kU/frzQkyAJ4phOs+2QHPjb85hnIUUmfGLpJb31v7LLZXn2RyyepsHQL7maBDMB/xb XkDEzclCqF/w6Z038W/V3ZySR6mPG9otkkaCHyMUsBFwYdRqkYT7X0g6por4dN0OYM3mb2eDW90oj e/JuAUkS8N00o93egT6YoSh4leidnVEcNUjvQW7ICy6FvsKBnzmO8/8oY4yNHEkuHxbOtpgjgXHsW oN367yycA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2Vvg-0000w9-AB; Mon, 03 Aug 2020 08:34:44 +0000 Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2Vvc-0000uY-TT for linux-arm-kernel@lists.infradead.org; Mon, 03 Aug 2020 08:34:42 +0000 X-Originating-IP: 90.66.108.79 Received: from localhost (lfbn-lyo-1-1932-79.w90-66.abo.wanadoo.fr [90.66.108.79]) (Authenticated sender: alexandre.belloni@bootlin.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 8DBF6E0006; Mon, 3 Aug 2020 08:34:36 +0000 (UTC) Date: Mon, 3 Aug 2020 10:34:36 +0200 From: Alexandre Belloni To: Claudiu Beznea Subject: Re: [PATCH 2/3] ARM: at91: pm: add per soc validation of pm modes Message-ID: <20200803083436.GG3679@piout.net> References: <1596439517-12993-1-git-send-email-claudiu.beznea@microchip.com> <1596439517-12993-3-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1596439517-12993-3-git-send-email-claudiu.beznea@microchip.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200803_043441_142758_221DE2D8 X-CRM114-Status: GOOD ( 29.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ludovic.desroches@microchip.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 03/08/2020 10:25:16+0300, Claudiu Beznea wrote: > Not all SoCs supports all the PM mode. User may end up settings, > e.g. backup mode, on a non SAMA5D2 device, but the mode to not be valid. > If backup mode is used on a devices not supporting it there will be no > way of resuming other than rebooting. I don't think this actually happens as if backup mode is requested on a non sama5d2 device, of_find_compatible_node(NULL, NULL, "atmel,sama5d2-sfrbu") will fail and the PM will default to AT91_PM_ULP0. ULP1 will also default to ULP0 if the shdwc is not from sama5d2 or sam9x60. I'm guessing the actual issue is introduced with ulp0 fast. > > Signed-off-by: Claudiu Beznea > --- > arch/arm/mach-at91/at91rm9200.c | 10 +++++- > arch/arm/mach-at91/at91sam9.c | 9 +++++- > arch/arm/mach-at91/generic.h | 20 ++++++------ > arch/arm/mach-at91/pm.c | 69 +++++++++++++++++++++++++++++++++++++---- > arch/arm/mach-at91/sam9x60.c | 11 ++++++- > arch/arm/mach-at91/sama5.c | 21 +++++++++++-- > 6 files changed, 119 insertions(+), 21 deletions(-) > > diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c > index 4f8186211619..7318d8e16797 100644 > --- a/arch/arm/mach-at91/at91rm9200.c > +++ b/arch/arm/mach-at91/at91rm9200.c > @@ -13,12 +13,20 @@ > #include > > #include "generic.h" > +#include "pm.h" > + > +/* AT91RM9200 valid PM modes. */ > +static const int at91rm9200_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > +}; > > static void __init at91rm9200_dt_device_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > > - at91rm9200_pm_init(); > + at91rm9200_pm_init(at91rm9200_pm_modes, > + ARRAY_SIZE(at91rm9200_pm_modes)); > } > You can avoid the changes in the soc files and leave everything contained in pm.c as each _pm_init has a known list of mode that will very likely never change. Bonus points if you make the arrays __initdata. > static const char *const at91rm9200_dt_board_compat[] __initconst = { > diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c > index 7e572189a5eb..683f2c35a116 100644 > --- a/arch/arm/mach-at91/at91sam9.c > +++ b/arch/arm/mach-at91/at91sam9.c > @@ -13,12 +13,19 @@ > #include > > #include "generic.h" > +#include "pm.h" > + > +/* AT91SAM9 valid PM modes. */ > +static const int at91sam9_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > +}; > > static void __init at91sam9_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > > - at91sam9_pm_init(); > + at91sam9_pm_init(at91sam9_pm_modes, ARRAY_SIZE(at91sam9_pm_modes)); > } > > static const char *const at91_dt_board_compat[] __initconst = { > diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h > index 0a4cdcb4985b..610a12e5a71c 100644 > --- a/arch/arm/mach-at91/generic.h > +++ b/arch/arm/mach-at91/generic.h > @@ -9,17 +9,17 @@ > #define _AT91_GENERIC_H > > #ifdef CONFIG_PM > -extern void __init at91rm9200_pm_init(void); > -extern void __init at91sam9_pm_init(void); > -extern void __init sam9x60_pm_init(void); > -extern void __init sama5_pm_init(void); > -extern void __init sama5d2_pm_init(void); > +extern void __init at91rm9200_pm_init(const int *modes, int len); > +extern void __init at91sam9_pm_init(const int *modes, int len); > +extern void __init sam9x60_pm_init(const int *modes, int len); > +extern void __init sama5_pm_init(const int *modes, int len); > +extern void __init sama5d2_pm_init(const int *modes, int len); > #else > -static inline void __init at91rm9200_pm_init(void) { } > -static inline void __init at91sam9_pm_init(void) { } > -static inline void __init sam9x60_pm_init(void) { } > -static inline void __init sama5_pm_init(void) { } > -static inline void __init sama5d2_pm_init(void) { } > +static inline void __init at91rm9200_pm_init(const int *modes, int len) { } > +static inline void __init at91sam9_pm_init(const int *modes, int len) { } > +static inline void __init sam9x60_pm_init(const int *modes, int len) { } > +static inline void __init sama5_pm_init(const int *modes, int len) { } > +static inline void __init sama5d2_pm_init(const int *modes, int len) { } > #endif > Then this change is not necessary. > #endif /* _AT91_GENERIC_H */ > diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c > index 04fdcbd57100..caf87efc7eeb 100644 > --- a/arch/arm/mach-at91/pm.c > +++ b/arch/arm/mach-at91/pm.c > @@ -785,6 +785,59 @@ static const struct of_device_id atmel_pmc_ids[] __initconst = { > { /* sentinel */ }, > }; > > +static void __init at91_pm_modes_validate(const int *modes, int len) > +{ > + u8 i, located = 0; > + int mode; > + > +#define STANDBY BIT(0) > +#define SUSPEND BIT(1) > + > + for (i = 0; i < len; i++) { > + if ((located & STANDBY) && (located & SUSPEND)) > + break; > + > + if (modes[i] == soc_pm.data.standby_mode && > + !(located & STANDBY)) { > + located |= STANDBY; > + continue; > + } > + > + if (modes[i] == soc_pm.data.suspend_mode && > + !(located & SUSPEND)) { > + located |= SUSPEND; > + continue; > + } > + } > + > + if (!(located & STANDBY)) { > + if (soc_pm.data.suspend_mode == AT91_PM_STANDBY) > + mode = AT91_PM_ULP0; > + else > + mode = AT91_PM_STANDBY; > + > + pr_warn("AT91: PM: %s mode not supported! Using %s.\n", > + pm_modes[soc_pm.data.standby_mode].pattern, > + pm_modes[mode].pattern); > + soc_pm.data.standby_mode = mode; > + } > + > + if (!(located & SUSPEND)) { > + if (soc_pm.data.standby_mode == AT91_PM_ULP0) > + mode = AT91_PM_STANDBY; > + else > + mode = AT91_PM_ULP0; > + > + pr_warn("AT91: PM: %s mode not supported! Using %s.\n", > + pm_modes[soc_pm.data.suspend_mode].pattern, > + pm_modes[mode].pattern); > + soc_pm.data.suspend_mode = mode; > + } > + > +#undef STANDBY > +#undef SUSPEND You should use two booleans instead of a bit array, this would not make the code longer and will avoid this #def/#undef thing. > +} > + > static void __init at91_pm_init(void (*pm_idle)(void)) > { > struct device_node *pmc_np; > @@ -821,11 +874,12 @@ static void __init at91_pm_init(void (*pm_idle)(void)) > } > } > > -void __init at91rm9200_pm_init(void) > +void __init at91rm9200_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_AT91RM9200)) > return; > > + at91_pm_modes_validate(modes, len); > at91_dt_ramc(); > > /* > @@ -836,11 +890,12 @@ void __init at91rm9200_pm_init(void) > at91_pm_init(at91rm9200_idle); > } > > -void __init sam9x60_pm_init(void) > +void __init sam9x60_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_SAM9X60)) > return; > > + at91_pm_modes_validate(modes, len); > at91_pm_modes_init(); > at91_dt_ramc(); > at91_pm_init(at91sam9x60_idle); > @@ -849,31 +904,33 @@ void __init sam9x60_pm_init(void) > soc_pm.config_pmc_ws = at91_sam9x60_config_pmc_ws; > } > > -void __init at91sam9_pm_init(void) > +void __init at91sam9_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_AT91SAM9)) > return; > > + at91_pm_modes_validate(modes, len); > at91_dt_ramc(); > at91_pm_init(at91sam9_idle); > } > > -void __init sama5_pm_init(void) > +void __init sama5_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_SAMA5)) > return; > > + at91_pm_modes_validate(modes, len); > at91_dt_ramc(); > at91_pm_init(NULL); > } > > -void __init sama5d2_pm_init(void) > +void __init sama5d2_pm_init(const int *modes, int len) > { > if (!IS_ENABLED(CONFIG_SOC_SAMA5D2)) > return; > > + sama5_pm_init(modes, len); > at91_pm_modes_init(); > - sama5_pm_init(); > > soc_pm.ws_ids = sama5d2_ws_ids; > soc_pm.config_shdwc_ws = at91_sama5d2_config_shdwc_ws; > diff --git a/arch/arm/mach-at91/sam9x60.c b/arch/arm/mach-at91/sam9x60.c > index d8c739d25458..d7c869c7b542 100644 > --- a/arch/arm/mach-at91/sam9x60.c > +++ b/arch/arm/mach-at91/sam9x60.c > @@ -14,12 +14,21 @@ > #include > > #include "generic.h" > +#include "pm.h" > + > +/* SAM9X60 valid PM modes. */ > +static const int sam9x60_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > + AT91_PM_ULP0_FAST, > + AT91_PM_ULP1, > +}; > > static void __init sam9x60_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > > - sam9x60_pm_init(); > + sam9x60_pm_init(sam9x60_pm_modes, ARRAY_SIZE(sam9x60_pm_modes)); > } > > static const char *const sam9x60_dt_board_compat[] __initconst = { > diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c > index 89dab7cf01e8..7eb124612a10 100644 > --- a/arch/arm/mach-at91/sama5.c > +++ b/arch/arm/mach-at91/sama5.c > @@ -14,11 +14,19 @@ > #include > > #include "generic.h" > +#include "pm.h" > + > +/* SAMA5 valid PM modes. */ > +static const int sama5_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > + AT91_PM_ULP0_FAST, > +}; > > static void __init sama5_dt_device_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > - sama5_pm_init(); > + sama5_pm_init(sama5_pm_modes, ARRAY_SIZE(sama5_pm_modes)); > } > > static const char *const sama5_dt_board_compat[] __initconst = { > @@ -44,10 +52,19 @@ DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5") > .l2c_aux_mask = ~0UL, > MACHINE_END > > +/* sama5d2 PM modes. */ > +static const int sama5d2_pm_modes[] = { > + AT91_PM_STANDBY, > + AT91_PM_ULP0, > + AT91_PM_ULP0_FAST, > + AT91_PM_ULP1, > + AT91_PM_BACKUP, > +}; > + > static void __init sama5d2_init(void) > { > of_platform_default_populate(NULL, NULL, NULL); > - sama5d2_pm_init(); > + sama5d2_pm_init(sama5d2_pm_modes, ARRAY_SIZE(sama5d2_pm_modes)); > } > > static const char *const sama5d2_compat[] __initconst = { > -- > 2.7.4 > -- Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel