[PATCH v2 0/3] Meson Secure PWRC Driver
Hello!
This patch set adds support (driver and sm functions) for working with power domain controller using secure monitor for Amlogic A1-series. Additionally, in the future, the driver can be used for other Amlgoic SoC series, such as S4.
Changes v1 -> v2:
* Move dt-bindings into separate patch. * Drop 'move pwrc node to bus' patch.
Alexey Romanov (3): arch/arm: meson: sm: introduce power domain functions dt-bindings: power: add Meson A1 PWRC bindings drivers: meson: introduce secure power controller driver
arch/arm/include/asm/arch-meson/sm.h | 30 ++++ arch/arm/mach-meson/sm.c | 14 ++ drivers/power/domain/Kconfig | 7 + drivers/power/domain/Makefile | 1 + drivers/power/domain/meson-secure-pwrc.c | 160 +++++++++++++++++++++ include/dt-bindings/power/meson-a1-power.h | 32 +++++ 6 files changed, 244 insertions(+) create mode 100644 drivers/power/domain/meson-secure-pwrc.c create mode 100644 include/dt-bindings/power/meson-a1-power.h
This commit adds functions to manage secure power domain for Amlogic SoC's using smc functionality.
Signed-off-by: Alexey Romanov avromanov@sberdevices.ru Reviewed-by: Neil Armstrong neil.armstrong@linaro.org --- arch/arm/include/asm/arch-meson/sm.h | 30 ++++++++++++++++++++++++++++ arch/arm/mach-meson/sm.c | 14 +++++++++++++ 2 files changed, 44 insertions(+)
diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h index 53b75176493..4b1d564bc48 100644 --- a/arch/arm/include/asm/arch-meson/sm.h +++ b/arch/arm/include/asm/arch-meson/sm.h @@ -58,4 +58,34 @@ enum { */ int meson_sm_get_reboot_reason(void);
+#define PWRDM_OFF 0 +#define PWRDM_ON 1 + +/** + * meson_sm_pwrdm_set - do command at specified power domain. + * + * @index: power domain index. + * @cmd: command index. + * @return: zero on success or error code on failure. + */ +int meson_sm_pwrdm_set(size_t index, int cmd); + +/** + * meson_sm_pwrdm_off - disable specified power domain. + * + * @index: power domain index. + * @return: zero on success or error code on failure. + */ +#define meson_sm_pwrdm_off(index) \ + meson_sm_pwrdm_set(index, PWRDM_OFF) + +/** + * meson_sm_pwrdm_on - enable specified power domain. + * + * @index: power domain index. + * @return: zero on success or error code on failure. + */ +#define meson_sm_pwrdm_on(index) \ + meson_sm_pwrdm_set(index, PWRDM_ON) + #endif /* __MESON_SM_H__ */ diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index f2ca7e76932..d600c64d0be 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -24,6 +24,7 @@ #define FN_EFUSE_READ 0x82000030 #define FN_EFUSE_WRITE 0x82000031 #define FN_CHIP_ID 0x82000044 +#define FN_PWRDM_SET 0x82000093
static void *shmem_input; static void *shmem_output; @@ -137,3 +138,16 @@ int meson_sm_get_reboot_reason(void) /* The SMC call is not used, we directly use AO_SEC_SD_CFG15 */ return FIELD_GET(REBOOT_REASON_MASK, reason); } + +int meson_sm_pwrdm_set(size_t index, int cmd) +{ + struct pt_regs regs; + + regs.regs[0] = FN_PWRDM_SET; + regs.regs[1] = index; + regs.regs[2] = cmd; + + smc_call(®s); + + return regs.regs[0]; +}
We can use them in secure pwrc driver.
Signed-off-by: Alexey Romanov avromanov@sberdevices.ru --- include/dt-bindings/power/meson-a1-power.h | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 include/dt-bindings/power/meson-a1-power.h
diff --git a/include/dt-bindings/power/meson-a1-power.h b/include/dt-bindings/power/meson-a1-power.h new file mode 100644 index 00000000000..8e39dfc0b62 --- /dev/null +++ b/include/dt-bindings/power/meson-a1-power.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* + * Copyright (c) 2023 SberDevices, Inc. + * Author: Alexey Romanov avromanov@sberdevices.ru + */ + +#ifndef _DT_BINDINGS_MESON_A1_POWER_H +#define _DT_BINDINGS_MESON_A1_POWER_H + +#define PWRC_DSPA_ID 8 +#define PWRC_DSPB_ID 9 +#define PWRC_UART_ID 10 +#define PWRC_DMC_ID 11 +#define PWRC_I2C_ID 12 +#define PWRC_PSRAM_ID 13 +#define PWRC_ACODEC_ID 14 +#define PWRC_AUDIO_ID 15 +#define PWRC_OTP_ID 16 +#define PWRC_DMA_ID 17 +#define PWRC_SD_EMMC_ID 18 +#define PWRC_RAMA_ID 19 +#define PWRC_RAMB_ID 20 +#define PWRC_IR_ID 21 +#define PWRC_SPICC_ID 22 +#define PWRC_SPIFC_ID 23 +#define PWRC_USB_ID 24 +#define PWRC_NIC_ID 25 +#define PWRC_PDMIN_ID 26 +#define PWRC_RSA_ID 27 +#define PWRC_MAX_ID 28 + +#endif
On 31/05/2023 11:31, Alexey Romanov wrote:
We can use them in secure pwrc driver.
Signed-off-by: Alexey Romanov avromanov@sberdevices.ru
include/dt-bindings/power/meson-a1-power.h | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 include/dt-bindings/power/meson-a1-power.h
diff --git a/include/dt-bindings/power/meson-a1-power.h b/include/dt-bindings/power/meson-a1-power.h new file mode 100644 index 00000000000..8e39dfc0b62 --- /dev/null +++ b/include/dt-bindings/power/meson-a1-power.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/*
- Copyright (c) 2023 SberDevices, Inc.
- Author: Alexey Romanov avromanov@sberdevices.ru
- */
+#ifndef _DT_BINDINGS_MESON_A1_POWER_H +#define _DT_BINDINGS_MESON_A1_POWER_H
+#define PWRC_DSPA_ID 8 +#define PWRC_DSPB_ID 9 +#define PWRC_UART_ID 10 +#define PWRC_DMC_ID 11 +#define PWRC_I2C_ID 12 +#define PWRC_PSRAM_ID 13 +#define PWRC_ACODEC_ID 14 +#define PWRC_AUDIO_ID 15 +#define PWRC_OTP_ID 16 +#define PWRC_DMA_ID 17 +#define PWRC_SD_EMMC_ID 18 +#define PWRC_RAMA_ID 19 +#define PWRC_RAMB_ID 20 +#define PWRC_IR_ID 21 +#define PWRC_SPICC_ID 22 +#define PWRC_SPIFC_ID 23 +#define PWRC_USB_ID 24 +#define PWRC_NIC_ID 25 +#define PWRC_PDMIN_ID 26 +#define PWRC_RSA_ID 27 +#define PWRC_MAX_ID 28
+#endif
Reviewed-by: Neil Armstrong neil.armstrong@linaro.org
This patch adds Power controller driver support for Amlogic A1 family using secure monitor calls. The power domains register only can access in secure world.
Signed-off-by: Alexey Romanov avromanov@sberdevices.ru --- drivers/power/domain/Kconfig | 7 + drivers/power/domain/Makefile | 1 + drivers/power/domain/meson-secure-pwrc.c | 160 +++++++++++++++++++++++ 3 files changed, 168 insertions(+) create mode 100644 drivers/power/domain/meson-secure-pwrc.c
diff --git a/drivers/power/domain/Kconfig b/drivers/power/domain/Kconfig index 7e1b8c072fa..411c210756a 100644 --- a/drivers/power/domain/Kconfig +++ b/drivers/power/domain/Kconfig @@ -68,6 +68,13 @@ config MESON_EE_POWER_DOMAIN Enable support for manipulating Amlogic Meson Everything-Else power domains.
+config MESON_SECURE_POWER_DOMAIN + bool "Enable Amlogic Secure power domain driver" + depends on POWER_DOMAIN && ARCH_MESON && MESON_A1 + help + Enable support for manipulating Amlogic Meson Secure power domains. + Support for Amlogic A1 series. + config SANDBOX_POWER_DOMAIN bool "Enable the sandbox power domain test driver" depends on POWER_DOMAIN && SANDBOX diff --git a/drivers/power/domain/Makefile b/drivers/power/domain/Makefile index e6244776216..aa5a4ba57cd 100644 --- a/drivers/power/domain/Makefile +++ b/drivers/power/domain/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_IMX8MP_HSIOMIX_BLKCTRL) += imx8mp-hsiomix.o obj-$(CONFIG_MTK_POWER_DOMAIN) += mtk-power-domain.o obj-$(CONFIG_MESON_GX_VPU_POWER_DOMAIN) += meson-gx-pwrc-vpu.o obj-$(CONFIG_MESON_EE_POWER_DOMAIN) += meson-ee-pwrc.o +obj-$(CONFIG_MESON_SECURE_POWER_DOMAIN) += meson-secure-pwrc.o obj-$(CONFIG_SANDBOX_POWER_DOMAIN) += sandbox-power-domain.o obj-$(CONFIG_SANDBOX_POWER_DOMAIN) += sandbox-power-domain-test.o obj-$(CONFIG_TEGRA186_POWER_DOMAIN) += tegra186-power-domain.o diff --git a/drivers/power/domain/meson-secure-pwrc.c b/drivers/power/domain/meson-secure-pwrc.c new file mode 100644 index 00000000000..f70f8e02423 --- /dev/null +++ b/drivers/power/domain/meson-secure-pwrc.c @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2023 SberDevices, Inc. + * Author: Alexey Romanov avromanov@sberdevices.ru + */ + +#include <dm.h> +#include <asm/arch/sm.h> +#include <power-domain.h> +#include <power-domain-uclass.h> +#include <dt-bindings/power/meson-a1-power.h> + +struct meson_secure_pwrc_domain_desc { + char *name; + size_t index; +}; + +struct meson_secure_pwrc_domain_data { + unsigned int count; + struct meson_secure_pwrc_domain_desc *domains; +}; + +struct meson_secure_pwrc_priv { + const struct meson_secure_pwrc_domain_data *data; +}; + +static int meson_secure_pwrc_on(struct power_domain *power_domain) +{ + struct meson_secure_pwrc_priv *priv = dev_get_priv(power_domain->dev); + struct meson_secure_pwrc_domain_desc *pwrc_domain; + int err; + + pwrc_domain = &priv->data->domains[power_domain->id]; + + err = meson_sm_pwrdm_on(pwrc_domain->index); + if (err) { + pr_err("meson_sm_pwrdm_on() failed (%d)\n", err); + return err; + } + + pr_debug("enable %s power domain\n", pwrc_domain->name); + + return 0; +} + +static int meson_secure_pwrc_off(struct power_domain *power_domain) +{ + struct meson_secure_pwrc_priv *priv = dev_get_priv(power_domain->dev); + struct meson_secure_pwrc_domain_desc *pwrc_domain; + int err; + + pwrc_domain = &priv->data->domains[power_domain->id]; + + err = meson_sm_pwrdm_off(pwrc_domain->index); + if (err) { + pr_err("meson_sm_pwrdm_off() failed (%d)\n", err); + return err; + } + + pr_debug("disable %s power domain\n", pwrc_domain->name); + + return 0; +} + +static int meson_secure_pwrc_of_xlate(struct power_domain *power_domain, + struct ofnode_phandle_args *args) +{ + struct meson_secure_pwrc_priv *priv = dev_get_priv(power_domain->dev); + struct meson_secure_pwrc_domain_desc *pwrc_domain; + + if (args->args_count < 1) { + pr_err("invalid args count: %d\n", args->args_count); + return -EINVAL; + } + + power_domain->id = args->args[0]; + + if (power_domain->id >= priv->data->count) { + pr_err("domain with ID=%lu is invalid\n", power_domain->id); + return -EINVAL; + } + + pwrc_domain = &priv->data->domains[power_domain->id]; + + if (!pwrc_domain->name) { + pr_err("domain with ID=%lu is invalid\n", power_domain->id); + return -EINVAL; + } + + return 0; +} + +#define SEC_PD(__name) \ +[PWRC_##__name##_ID] = \ +{ \ + .name = #__name, \ + .index = PWRC_##__name##_ID, \ +} + +static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = { + SEC_PD(DSPA), + SEC_PD(DSPB), + SEC_PD(UART), + SEC_PD(DMC), + SEC_PD(I2C), + SEC_PD(PSRAM), + SEC_PD(ACODEC), + SEC_PD(AUDIO), + SEC_PD(OTP), + SEC_PD(DMA), + SEC_PD(SD_EMMC), + SEC_PD(RAMA), + SEC_PD(RAMB), + SEC_PD(IR), + SEC_PD(SPICC), + SEC_PD(SPIFC), + SEC_PD(USB), + SEC_PD(NIC), + SEC_PD(PDMIN), + SEC_PD(RSA), +}; + +struct power_domain_ops meson_secure_pwrc_ops = { + .on = meson_secure_pwrc_on, + .off = meson_secure_pwrc_off, + .of_xlate = meson_secure_pwrc_of_xlate, +}; + +static struct meson_secure_pwrc_domain_data meson_secure_a1_pwrc_data = { + .count = ARRAY_SIZE(a1_pwrc_domains), + .domains = a1_pwrc_domains, +}; + +static const struct udevice_id meson_secure_pwrc_ids[] = { + { + .compatible = "amlogic,meson-a1-pwrc", + .data = (unsigned long)&meson_secure_a1_pwrc_data, + }, + { } +}; + +static int meson_secure_pwrc_probe(struct udevice *dev) +{ + struct meson_secure_pwrc_priv *priv = dev_get_priv(dev); + + priv->data = (void *)dev_get_driver_data(dev); + if (!priv->data) + return -EINVAL; + + return 0; +} + +U_BOOT_DRIVER(meson_secure_pwrc) = { + .name = "meson_secure_pwrc", + .id = UCLASS_POWER_DOMAIN, + .of_match = meson_secure_pwrc_ids, + .probe = meson_secure_pwrc_probe, + .ops = &meson_secure_pwrc_ops, + .priv_auto = sizeof(struct meson_secure_pwrc_priv), +};
On 31/05/2023 11:31, Alexey Romanov wrote:
This patch adds Power controller driver support for Amlogic A1 family using secure monitor calls. The power domains register only can access in secure world.
Signed-off-by: Alexey Romanov avromanov@sberdevices.ru
drivers/power/domain/Kconfig | 7 + drivers/power/domain/Makefile | 1 + drivers/power/domain/meson-secure-pwrc.c | 160 +++++++++++++++++++++++ 3 files changed, 168 insertions(+) create mode 100644 drivers/power/domain/meson-secure-pwrc.c
diff --git a/drivers/power/domain/Kconfig b/drivers/power/domain/Kconfig index 7e1b8c072fa..411c210756a 100644 --- a/drivers/power/domain/Kconfig +++ b/drivers/power/domain/Kconfig @@ -68,6 +68,13 @@ config MESON_EE_POWER_DOMAIN Enable support for manipulating Amlogic Meson Everything-Else power domains.
+config MESON_SECURE_POWER_DOMAIN
- bool "Enable Amlogic Secure power domain driver"
- depends on POWER_DOMAIN && ARCH_MESON && MESON_A1
- help
Enable support for manipulating Amlogic Meson Secure power domains.Support for Amlogic A1 series.- config SANDBOX_POWER_DOMAIN bool "Enable the sandbox power domain test driver" depends on POWER_DOMAIN && SANDBOX
diff --git a/drivers/power/domain/Makefile b/drivers/power/domain/Makefile index e6244776216..aa5a4ba57cd 100644 --- a/drivers/power/domain/Makefile +++ b/drivers/power/domain/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_IMX8MP_HSIOMIX_BLKCTRL) += imx8mp-hsiomix.o obj-$(CONFIG_MTK_POWER_DOMAIN) += mtk-power-domain.o obj-$(CONFIG_MESON_GX_VPU_POWER_DOMAIN) += meson-gx-pwrc-vpu.o obj-$(CONFIG_MESON_EE_POWER_DOMAIN) += meson-ee-pwrc.o +obj-$(CONFIG_MESON_SECURE_POWER_DOMAIN) += meson-secure-pwrc.o obj-$(CONFIG_SANDBOX_POWER_DOMAIN) += sandbox-power-domain.o obj-$(CONFIG_SANDBOX_POWER_DOMAIN) += sandbox-power-domain-test.o obj-$(CONFIG_TEGRA186_POWER_DOMAIN) += tegra186-power-domain.o diff --git a/drivers/power/domain/meson-secure-pwrc.c b/drivers/power/domain/meson-secure-pwrc.c new file mode 100644 index 00000000000..f70f8e02423 --- /dev/null +++ b/drivers/power/domain/meson-secure-pwrc.c @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright (c) 2023 SberDevices, Inc.
- Author: Alexey Romanov avromanov@sberdevices.ru
- */
+#include <dm.h> +#include <asm/arch/sm.h> +#include <power-domain.h> +#include <power-domain-uclass.h> +#include <dt-bindings/power/meson-a1-power.h>
+struct meson_secure_pwrc_domain_desc {
- char *name;
- size_t index;
+};
+struct meson_secure_pwrc_domain_data {
- unsigned int count;
- struct meson_secure_pwrc_domain_desc *domains;
+};
+struct meson_secure_pwrc_priv {
- const struct meson_secure_pwrc_domain_data *data;
+};
+static int meson_secure_pwrc_on(struct power_domain *power_domain) +{
- struct meson_secure_pwrc_priv *priv = dev_get_priv(power_domain->dev);
- struct meson_secure_pwrc_domain_desc *pwrc_domain;
- int err;
- pwrc_domain = &priv->data->domains[power_domain->id];
- err = meson_sm_pwrdm_on(pwrc_domain->index);
- if (err) {
pr_err("meson_sm_pwrdm_on() failed (%d)\n", err);return err;- }
- pr_debug("enable %s power domain\n", pwrc_domain->name);
- return 0;
+}
+static int meson_secure_pwrc_off(struct power_domain *power_domain) +{
- struct meson_secure_pwrc_priv *priv = dev_get_priv(power_domain->dev);
- struct meson_secure_pwrc_domain_desc *pwrc_domain;
- int err;
- pwrc_domain = &priv->data->domains[power_domain->id];
- err = meson_sm_pwrdm_off(pwrc_domain->index);
- if (err) {
pr_err("meson_sm_pwrdm_off() failed (%d)\n", err);return err;- }
- pr_debug("disable %s power domain\n", pwrc_domain->name);
- return 0;
+}
+static int meson_secure_pwrc_of_xlate(struct power_domain *power_domain,
struct ofnode_phandle_args *args)+{
- struct meson_secure_pwrc_priv *priv = dev_get_priv(power_domain->dev);
- struct meson_secure_pwrc_domain_desc *pwrc_domain;
- if (args->args_count < 1) {
pr_err("invalid args count: %d\n", args->args_count);return -EINVAL;- }
- power_domain->id = args->args[0];
- if (power_domain->id >= priv->data->count) {
pr_err("domain with ID=%lu is invalid\n", power_domain->id);return -EINVAL;- }
- pwrc_domain = &priv->data->domains[power_domain->id];
- if (!pwrc_domain->name) {
pr_err("domain with ID=%lu is invalid\n", power_domain->id);return -EINVAL;- }
- return 0;
+}
+#define SEC_PD(__name) \ +[PWRC_##__name##_ID] = \ +{ \
- .name = #__name, \
- .index = PWRC_##__name##_ID, \
+}
+static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = {
- SEC_PD(DSPA),
- SEC_PD(DSPB),
- SEC_PD(UART),
- SEC_PD(DMC),
- SEC_PD(I2C),
- SEC_PD(PSRAM),
- SEC_PD(ACODEC),
- SEC_PD(AUDIO),
- SEC_PD(OTP),
- SEC_PD(DMA),
- SEC_PD(SD_EMMC),
- SEC_PD(RAMA),
- SEC_PD(RAMB),
- SEC_PD(IR),
- SEC_PD(SPICC),
- SEC_PD(SPIFC),
- SEC_PD(USB),
- SEC_PD(NIC),
- SEC_PD(PDMIN),
- SEC_PD(RSA),
+};
+struct power_domain_ops meson_secure_pwrc_ops = {
- .on = meson_secure_pwrc_on,
- .off = meson_secure_pwrc_off,
- .of_xlate = meson_secure_pwrc_of_xlate,
+};
+static struct meson_secure_pwrc_domain_data meson_secure_a1_pwrc_data = {
- .count = ARRAY_SIZE(a1_pwrc_domains),
- .domains = a1_pwrc_domains,
+};
+static const struct udevice_id meson_secure_pwrc_ids[] = {
- {
.compatible = "amlogic,meson-a1-pwrc",.data = (unsigned long)&meson_secure_a1_pwrc_data,- },
- { }
+};
+static int meson_secure_pwrc_probe(struct udevice *dev) +{
- struct meson_secure_pwrc_priv *priv = dev_get_priv(dev);
- priv->data = (void *)dev_get_driver_data(dev);
- if (!priv->data)
return -EINVAL;- return 0;
+}
+U_BOOT_DRIVER(meson_secure_pwrc) = {
- .name = "meson_secure_pwrc",
- .id = UCLASS_POWER_DOMAIN,
- .of_match = meson_secure_pwrc_ids,
- .probe = meson_secure_pwrc_probe,
- .ops = &meson_secure_pwrc_ops,
- .priv_auto = sizeof(struct meson_secure_pwrc_priv),
+};
Reviewed-by: Neil Armstrong neil.armstrong@linaro.org
Hi,
On Wed, 31 May 2023 12:31:53 +0300, Alexey Romanov wrote:
This patch set adds support (driver and sm functions) for working with power domain controller using secure monitor for Amlogic A1-series. Additionally, in the future, the driver can be used for other Amlgoic SoC series, such as S4.
Changes v1 -> v2:
[...]
Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-amlogic (u-boot-amlogic)
[1/3] arch/arm: meson: sm: introduce power domain functions https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/9b5844975f3... [2/3] dt-bindings: power: add Meson A1 PWRC bindings https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/6dc3373d71e... [3/3] drivers: meson: introduce secure power controller driver https://source.denx.de/u-boot/custodians/u-boot-amlogic/-/commit/a1fd9cb41fb...
participants (3)
-
Alexey Romanov -
Neil Armstrong -
neil.armstrong＠linaro.org