From nobody Thu Jun 25 04:45:00 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 384ECC433EF for ; Tue, 22 Feb 2022 15:10:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233056AbiBVPLM (ORCPT ); Tue, 22 Feb 2022 10:11:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232932AbiBVPLK (ORCPT ); Tue, 22 Feb 2022 10:11:10 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F6D010EC4D for ; Tue, 22 Feb 2022 07:10:44 -0800 (PST) Received: (Authenticated sender: clement.leger@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 43107FF80A; Tue, 22 Feb 2022 15:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1645542642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hAqjOk4kWjLAaNNND+MI5XvviLpLYiGq26sQVn42k3Q=; b=fHLB8ZlKlFqgYwJZ9PYUe3AcDj86qjrTmV/R4mG1RAg6gPc2JMNV48pgIs7hrjIvhL+flk nxr7Fg3xPpwCdOX7OVJL1CJJZ5Lds8wo2uDX77SgNx+saugqgXkBGDWDVXuCy6hV1n23Jy 1mwVZqLo+ccrrtymHytyT2ja6CIECqez/uI+v5qG3sDHJRKAMZwT15e31Q/ZD+T//8Ke/V VJWnBY0jkAj8UtdksUm+NmUSMy0qpAaM1o2OvgxMgSB5EBrTDmhLrk0jWAcYuX6NFOFiJB HR9Vx1WyzF5qwUAaCAJgUQGpsgzSKegAhKb+8Ek74Od5zSbaBZseCScwa1wuBw== From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Russell King , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Thomas Petazzoni , =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= Subject: [PATCH 1/4] ARM: at91: add code to handle secure calls Date: Tue, 22 Feb 2022 16:08:43 +0100 Message-Id: <20220222150846.255307-2-clement.leger@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220222150846.255307-1-clement.leger@bootlin.com> References: <20220222150846.255307-1-clement.leger@bootlin.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since OP-TEE now has a more complete support for sama5d2, add necessary code to perform SMC calls. The detection of OP-TEE is based on a specific device-tree node path (/firmware/optee) such has done by some other SoC. A check is added to avoid doing SMC calls without having OP-TEE. Signed-off-by: Cl=C3=A9ment L=C3=A9ger --- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/sam_secure.c | 46 +++++++++++++++++++++++++++++++++ arch/arm/mach-at91/sam_secure.h | 14 ++++++++++ arch/arm/mach-at91/sama5.c | 2 ++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-at91/sam_secure.c create mode 100644 arch/arm/mach-at91/sam_secure.h diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 522b680b6446..0dcc37180588 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -7,7 +7,7 @@ obj-$(CONFIG_SOC_AT91RM9200) +=3D at91rm9200.o obj-$(CONFIG_SOC_AT91SAM9) +=3D at91sam9.o obj-$(CONFIG_SOC_SAM9X60) +=3D sam9x60.o -obj-$(CONFIG_SOC_SAMA5) +=3D sama5.o +obj-$(CONFIG_SOC_SAMA5) +=3D sama5.o sam_secure.o obj-$(CONFIG_SOC_SAMA7) +=3D sama7.o obj-$(CONFIG_SOC_SAMV7) +=3D samv7.o =20 diff --git a/arch/arm/mach-at91/sam_secure.c b/arch/arm/mach-at91/sam_secur= e.c new file mode 100644 index 000000000000..979fc3c892a3 --- /dev/null +++ b/arch/arm/mach-at91/sam_secure.c @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2012, Bootlin + */ + +#include +#include + +#include "sam_secure.h" + +static bool optee_available; + +#define SAM_SIP_SMC_STD_CALL_VAL(func_num) \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL, ARM_SMCCC_SMC_32, \ + ARM_SMCCC_OWNER_SIP, (func_num)) + +struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1) +{ + struct arm_smccc_res res =3D {.a0 =3D -1}; + + if (WARN_ON(!optee_available)) + return res; + + arm_smccc_smc(SAM_SIP_SMC_STD_CALL_VAL(fn), arg0, arg1, + 0, 0, 0, 0, 0, &res); + + return res; +} + +void __init sam_secure_init(void) +{ + struct device_node *np; + + /* + * We only check that the OP-TEE node is present and available. The + * OP-TEE kernel driver is not needed for the type of interaction made + * with OP-TEE here so the driver's status is not checked. + */ + np =3D of_find_node_by_path("/firmware/optee"); + if (np && of_device_is_available(np)) + optee_available =3D true; + of_node_put(np); + + if (optee_available) + pr_info("Running under OP-TEE firmware\n"); +} diff --git a/arch/arm/mach-at91/sam_secure.h b/arch/arm/mach-at91/sam_secur= e.h new file mode 100644 index 000000000000..af19e24ca59e --- /dev/null +++ b/arch/arm/mach-at91/sam_secure.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2012, Bootlin + */ + +#ifndef SAM_SECURE_H +#define SAM_SECURE_H + +#include + +void __init sam_secure_init(void); +struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1); + +#endif /* SAM_SECURE_H */ diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c index 89dab7cf01e8..de5dd28b392e 100644 --- a/arch/arm/mach-at91/sama5.c +++ b/arch/arm/mach-at91/sama5.c @@ -14,6 +14,7 @@ #include =20 #include "generic.h" +#include "sam_secure.h" =20 static void __init sama5_dt_device_init(void) { @@ -47,6 +48,7 @@ MACHINE_END static void __init sama5d2_init(void) { of_platform_default_populate(NULL, NULL, NULL); + sam_secure_init(); sama5d2_pm_init(); } =20 --=20 2.34.1 From nobody Thu Jun 25 04:45:00 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B435DC433EF for ; Tue, 22 Feb 2022 15:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233186AbiBVPLO (ORCPT ); Tue, 22 Feb 2022 10:11:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232969AbiBVPLK (ORCPT ); Tue, 22 Feb 2022 10:11:10 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9C7710EC4A for ; Tue, 22 Feb 2022 07:10:44 -0800 (PST) Received: (Authenticated sender: clement.leger@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 0614AFF808; Tue, 22 Feb 2022 15:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1645542643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CtKL8F/Jq2zYU6K+/py9GTxpMsuM+hyFjUkbGMfpBM8=; b=fpCxi/gpQB8ymagHFzpSGHRh9evnDJfs8mijFq206mD+Yy/+eAZpotSk6Q7xmKRtKC7vsL 55v7gXCYcoCZ4WHRhrcnQX20PDTtRSc5GPGEf2AdetXvvvxPIz6byxlThuvejkgAyOLXKR 7uk48uZSRIKDZOeDP/VAwyeMJlZR1T9lJGs3SEgCkYtDuWAodQLkcbhbUAqQ10tlquglkw G70LtGtP2N0o+XEKKN28HP3TU249JHgbG1Hytv+wiyNRruTH08VjaPozBBG4e552gObvzh H7SSg3MRhTJtW6BKWxeewGMMeoUrVHK3CZ9ZfMSg779uR76bT3Ka0HItU0CI/g== From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Russell King , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Thomas Petazzoni , =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= Subject: [PATCH 2/4] ARM: at91: pm: move "atmel.pm_modes" parsing into a common file Date: Tue, 22 Feb 2022 16:08:44 +0100 Message-Id: <20220222150846.255307-3-clement.leger@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220222150846.255307-1-clement.leger@bootlin.com> References: <20220222150846.255307-1-clement.leger@bootlin.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to add secure suspend support, split out code that will be reused to parse the boot argument "atmel.pm_modes". Signed-off-by: Cl=C3=A9ment L=C3=A9ger Reported-by: kernel test robot --- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/pm.c | 31 ++------------------------- arch/arm/mach-at91/pm.h | 7 ++++++ arch/arm/mach-at91/pm_common.c | 39 ++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 30 deletions(-) create mode 100644 arch/arm/mach-at91/pm_common.c diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 0dcc37180588..23620ccf7ab6 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -12,7 +12,7 @@ obj-$(CONFIG_SOC_SAMA7) +=3D sama7.o obj-$(CONFIG_SOC_SAMV7) +=3D samv7.o =20 # Power Management -obj-$(CONFIG_ATMEL_PM) +=3D pm.o pm_suspend.o +obj-$(CONFIG_ATMEL_PM) +=3D pm.o pm_suspend.o pm_common.o =20 ifeq ($(CONFIG_CPU_V7),y) AFLAGS_pm_suspend.o :=3D -march=3Darmv7-a diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index dd6f4ce3f766..b575304ccf63 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -99,15 +99,6 @@ static struct at91_soc_pm soc_pm =3D { }, }; =20 -static const match_table_t pm_modes __initconst =3D { - { AT91_PM_STANDBY, "standby" }, - { AT91_PM_ULP0, "ulp0" }, - { AT91_PM_ULP0_FAST, "ulp0-fast" }, - { AT91_PM_ULP1, "ulp1" }, - { AT91_PM_BACKUP, "backup" }, - { -1, NULL }, -}; - #define at91_ramc_read(id, field) \ __raw_readl(soc_pm.data.ramc[id] + field) =20 @@ -1243,25 +1234,7 @@ void __init sama7_pm_init(void) =20 static int __init at91_pm_modes_select(char *str) { - char *s; - substring_t args[MAX_OPT_ARGS]; - int standby, suspend; - - if (!str) - return 0; - - s =3D strsep(&str, ","); - standby =3D match_token(s, pm_modes, args); - if (standby < 0) - return 0; - - suspend =3D match_token(str, pm_modes, args); - if (suspend < 0) - return 0; - - soc_pm.data.standby_mode =3D standby; - soc_pm.data.suspend_mode =3D suspend; - - return 0; + return at91_pm_common_modes_select(str, &soc_pm.data.standby_mode, + &soc_pm.data.suspend_mode); } early_param("atmel.pm_modes", at91_pm_modes_select); diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 53bdc9000e44..e9f7f9841afd 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -40,6 +40,13 @@ struct at91_pm_data { unsigned int pmc_mckr_offset; unsigned int pmc_version; }; + +#include + +extern const match_table_t pm_modes; + +int at91_pm_common_modes_select(char *str, int *standby_mode, int *suspend= _mode); + #endif =20 #endif diff --git a/arch/arm/mach-at91/pm_common.c b/arch/arm/mach-at91/pm_common.c new file mode 100644 index 000000000000..45b74fb0a211 --- /dev/null +++ b/arch/arm/mach-at91/pm_common.c @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#include +#include +#include + +#include "pm.h" + +const match_table_t pm_modes __initconst =3D { + { AT91_PM_STANDBY, "standby" }, + { AT91_PM_ULP0, "ulp0" }, + { AT91_PM_ULP0_FAST, "ulp0-fast" }, + { AT91_PM_ULP1, "ulp1" }, + { AT91_PM_BACKUP, "backup" }, + { -1, NULL }, +}; + +int at91_pm_common_modes_select(char *str, int *standby_mode, int *suspend= _mode) +{ + char *s; + substring_t args[MAX_OPT_ARGS]; + int standby, suspend; + + if (!str) + return 0; + + s =3D strsep(&str, ","); + standby =3D match_token(s, pm_modes, args); + if (standby < 0) + return 0; + + suspend =3D match_token(str, pm_modes, args); + if (suspend < 0) + return 0; + + *standby_mode =3D standby; + *suspend_mode =3D suspend; + + return 0; +} --=20 2.34.1 From nobody Thu Jun 25 04:45:00 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF003C433EF for ; Tue, 22 Feb 2022 15:10:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233216AbiBVPLR (ORCPT ); Tue, 22 Feb 2022 10:11:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233000AbiBVPLL (ORCPT ); Tue, 22 Feb 2022 10:11:11 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0F2810EC4D for ; Tue, 22 Feb 2022 07:10:45 -0800 (PST) Received: (Authenticated sender: clement.leger@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id B4240FF802; Tue, 22 Feb 2022 15:10:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1645542644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5OimyuXNq782pNwOtB/pBEMyzaWO+JIoSHKWQ8Ypj6U=; b=Kv5dL0wB6hkRopQz6doaUNuuJ+L4cBd0D4YI9/JE6dcGFAf03c+e44ZYpHqDQUjJB79w6x fYUIUroB7po1d3xLdYOvUqdfC+jeLStUz3USa7Gp1w3Ys8/HAfFKEIatest9KQBtcqdXBn Po5kU20En9IYv3HLLSsMrT8clkulscl16qfQplVGj5doSj2cobjY6NjmCgYapMis4+RP56 bi3aiRpHfaMr+tPC7BhGMWlV85s/XnFM+im1PTlbYrayFAi/ZhSn0j+AKJS6pjOd88PzzE 1pt6vAQpgyGNdYDUBfb4tz/75E7AWsPdXrut9+uJ+jGj1z5+XwPQJIm3bQRIRg== From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Russell King , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Thomas Petazzoni , =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= Subject: [PATCH 3/4] ARM: at91: pm: add support for sama5d2 secure suspend Date: Tue, 22 Feb 2022 16:08:45 +0100 Message-Id: <20220222150846.255307-4-clement.leger@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220222150846.255307-1-clement.leger@bootlin.com> References: <20220222150846.255307-1-clement.leger@bootlin.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When running with OP-TEE, the suspend control is handled securely. Since the sama5d2 supports multiple suspend modes add a new CONFIG_ATMEL_SECURE_PM which is mutually exclusive with CONFIG_ATMEL_PM and allows to issue a SMC call to select the suspend mode. "atmel.pm_modes" boot argument is still supported for compatibility purposes but the standby value is actually ignored since PSCI suspend is used and it only support one mode (suspend). Signed-off-by: Cl=C3=A9ment L=C3=A9ger Reported-by: kernel test robot --- arch/arm/mach-at91/Kconfig | 14 ++++++- arch/arm/mach-at91/Makefile | 1 + arch/arm/mach-at91/pm_secure.c | 64 +++++++++++++++++++++++++++++ arch/arm/mach-at91/sam_secure.h | 4 ++ include/linux/platform_data/atmel.h | 2 +- 5 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 arch/arm/mach-at91/pm_secure.c diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 02f6b108fd5d..bb11a914ad3e 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -201,14 +201,24 @@ config SOC_SAM_V7 config SOC_SAMA5 bool select ATMEL_AIC5_IRQ - select ATMEL_PM if PM select ATMEL_SDRAMC select MEMORY select SOC_SAM_V7 select SRAM if PM =20 config ATMEL_PM - bool + bool "Atmel PM support" + default y if SOC_SAMA5 && PM + depends on !ATMEL_SECURE_PM + +config ATMEL_SECURE_PM + bool "Atmel Secure PM support" + depends on SOC_SAMA5D2 && PM + help + When running under a TEE, the suspend mode must be requested to be set + at TEE level. When enable, this option will use secure monitor calls + to set the suspend level. + NOTE: This support is mutually exclusive with CONFIG_ATMEL_PM =20 config SOC_SAMA7 bool diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 23620ccf7ab6..ebd88de8d0e7 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_SOC_SAMV7) +=3D samv7.o =20 # Power Management obj-$(CONFIG_ATMEL_PM) +=3D pm.o pm_suspend.o pm_common.o +obj-$(CONFIG_ATMEL_SECURE_PM) +=3D pm_secure.o pm_common.o =20 ifeq ($(CONFIG_CPU_V7),y) AFLAGS_pm_suspend.o :=3D -march=3Darmv7-a diff --git a/arch/arm/mach-at91/pm_secure.c b/arch/arm/mach-at91/pm_secure.c new file mode 100644 index 000000000000..2f63ff8c6226 --- /dev/null +++ b/arch/arm/mach-at91/pm_secure.c @@ -0,0 +1,64 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2012, Bootlin + */ + +#include +#include +#include +#include +#include "generic.h" +#include "sam_secure.h" +#include "pm.h" + +static int suspend_mode =3D AT91_PM_ULP0; + +static void at91_pm_secure_init(void) +{ + struct arm_smccc_res res; + + res =3D sam_smccc_call(SAMA5_SMC_SIP_SET_SUSPEND_MODE, suspend_mode, 0); + if (res.a0 =3D=3D 0) { + pr_info("AT91: Secure PM: suspend mode set to %s\n", + pm_modes[suspend_mode].pattern); + return; + } + + pr_warn("AT91: Secure PM: %s mode not supported !\n", + pm_modes[suspend_mode].pattern); + + res =3D sam_smccc_call(SAMA5_SMC_SIP_GET_SUSPEND_MODE, 0, 0); + if (res.a0 =3D=3D 0) { + pr_warn("AT91: Secure PM: failed to get default mode\n"); + return; + } + suspend_mode =3D res.a1; + + pr_info("AT91: Secure PM: using default suspend mode %s\n", + pm_modes[suspend_mode].pattern); +} + +void __init sama5_pm_init(void) +{ +} + +void __init sama5d2_pm_init(void) +{ + at91_pm_secure_init(); +} + +int at91_suspend_entering_slow_clock(void) +{ + return (suspend_mode >=3D AT91_PM_ULP0); +} +EXPORT_SYMBOL(at91_suspend_entering_slow_clock); + +static int __init at91_pm_modes_select(char *str) +{ + int dummy; + + pr_warn("AT91: Secure PM: ignoring standby mode\n"); + + return at91_pm_common_modes_select(str, &dummy, &suspend_mode); +} +early_param("atmel.pm_modes", at91_pm_modes_select); diff --git a/arch/arm/mach-at91/sam_secure.h b/arch/arm/mach-at91/sam_secur= e.h index af19e24ca59e..b169317f61f6 100644 --- a/arch/arm/mach-at91/sam_secure.h +++ b/arch/arm/mach-at91/sam_secure.h @@ -8,6 +8,10 @@ =20 #include =20 +/* Secure Monitor mode APIs */ +#define SAMA5_SMC_SIP_SET_SUSPEND_MODE 0x400 +#define SAMA5_SMC_SIP_GET_SUSPEND_MODE 0x401 + void __init sam_secure_init(void); struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1); =20 diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_d= ata/atmel.h index 73f63be509c4..cbb19712b4f0 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -7,7 +7,7 @@ #define __ATMEL_H__ =20 /* FIXME: this needs a better location, but gets stuff building again */ -#ifdef CONFIG_ATMEL_PM +#if defined(CONFIG_ATMEL_PM) || defined(CONFIG_ATMEL_SECURE_PM) extern int at91_suspend_entering_slow_clock(void); #else static inline int at91_suspend_entering_slow_clock(void) --=20 2.34.1 From nobody Thu Jun 25 04:45:00 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 591AEC433EF for ; Tue, 22 Feb 2022 15:10:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233228AbiBVPLT (ORCPT ); Tue, 22 Feb 2022 10:11:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233003AbiBVPLL (ORCPT ); Tue, 22 Feb 2022 10:11:11 -0500 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96FDB10EC54 for ; Tue, 22 Feb 2022 07:10:46 -0800 (PST) Received: (Authenticated sender: clement.leger@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 898D9FF810; Tue, 22 Feb 2022 15:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1645542645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OOzUysK3jq7AptlFGEUXnbGP4YiZSWMiMjPJXH0yfpY=; b=KoqrDVr6S5OlXWjEh9c4iYJKN8olSySo1900gjM5a4ZLYyl6bswEjGjPjdRduSC94LCTO5 kj2rP9rEZ4nYnOwyqg10Fb1H74hEgYfy4E3V73F6j35Q0cSdz88m0kdOxtzB1kTan/mjXw 17Q9zmwPbQLPOQFB+CmydJ/NQy0CsVigvKTaoB5Wb0YAhre5bN9NyRtEpSKk6IKygezoxK +whlrdy29Xm7kZjgkZwugh/wIV0UlY55jBFvvV5ybxVzVL4cOmYr7XU05ZhNsEzCOuSCQF WGagLCDdZDvqrh0wlILMqm5AbS4ItvD/njce9TQMRQX3+3vwLOlF7DIGgmG0Ew== From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Russell King , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Thomas Petazzoni , =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= Subject: [PATCH 4/4] ARM: at91: pm: fix defines to select *_pm_init functions Date: Tue, 22 Feb 2022 16:08:46 +0100 Message-Id: <20220222150846.255307-5-clement.leger@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220222150846.255307-1-clement.leger@bootlin.com> References: <20220222150846.255307-1-clement.leger@bootlin.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These defines actually don't depend on CONFIG_PM but CONFIG_ATMEL_PM. In the same time, add a "or" with CONFIG_ATMEL_SECURE_PM since it can also provides these functions. Signed-off-by: Cl=C3=A9ment L=C3=A9ger --- arch/arm/mach-at91/generic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 0c3960a8b3eb..279ab7e0cdca 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -8,7 +8,7 @@ #ifndef _AT91_GENERIC_H #define _AT91_GENERIC_H =20 -#ifdef CONFIG_PM +#if defined(CONFIG_ATMEL_PM) || defined(CONFIG_ATMEL_SECURE_PM) extern void __init at91rm9200_pm_init(void); extern void __init at91sam9_pm_init(void); extern void __init sam9x60_pm_init(void); --=20 2.34.1