Hi Urja,

This is a generic implementation. Add CONFIG_SYSRESET_CMD_POWEROFF to signal when we need it. Enable it from the STPMIC1 config and in sandbox.

The config flag is transitionary, that is it can be removed after all poweroff implementations use sysreset, and just have CMD_POWEROFF depend on sysreset.

Signed-off-by: Urja Rannikko urjaman@gmail.com

Reviewed-by: Patrick Delaunay patrick.delaunay@st.com

Tested on stm32mp1-ev1 with 2 other corrections: [U-Boot] pmic: stpmic1: add support for SYSRESET_POWER_OFF http://patchwork.ozlabs.org/patch/1101856/

[U-Boot] sysreset: syscon: add support for power off http://patchwork.ozlabs.org/patch/1101905/

Tested-by: Patrick Delaunay patrick.delaunay@st.com

---

v2: Fixup STPMIC1 config selection of CONFIG_SYSRESET_CMD_POWEROFF

arch/Kconfig | 1 + arch/arm/mach-stm32mp/Makefile | 3 --- arch/arm/mach-stm32mp/cmd_poweroff.c | 24 ------------------------ drivers/power/pmic/Kconfig | 1 + drivers/sysreset/Kconfig | 10 ++++++++++ drivers/sysreset/sysreset-uclass.c | 18 ++++++++++++++++++ 6 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 arch/arm/mach-stm32mp/cmd_poweroff.c

diff --git a/arch/Kconfig b/arch/Kconfig index 239289b885..83ff21dfd7 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -91,6 +91,7 @@ config SANDBOX select LZO select SPI select SUPPORT_OF_CONTROL

• select SYSRESET_CMD_POWEROFF if CMD_POWEROFF imply BITREVERSE select BLOBLIST imply CMD_DM

diff --git a/arch/arm/mach-stm32mp/Makefile b/arch/arm/mach-stm32mp/Makefile index 1493914a11..f59ced5ee1 100644 --- a/arch/arm/mach-stm32mp/Makefile +++ b/arch/arm/mach-stm32mp/Makefile @@ -11,9 +11,6 @@ ifdef CONFIG_SPL_BUILD obj-y += spl.o else obj-y += bsec.o -ifndef CONFIG_STM32MP1_TRUSTED -obj-$(CONFIG_SYSRESET) += cmd_poweroff.o -endif endif obj-$(CONFIG_ARMV7_PSCI) += psci.o obj-$(CONFIG_$(SPL_)DM_REGULATOR) += pwr_regulator.o diff --git a/arch/arm/mach-stm32mp/cmd_poweroff.c b/arch/arm/mach- stm32mp/cmd_poweroff.c deleted file mode 100644 index 62347425a0..0000000000 --- a/arch/arm/mach-stm32mp/cmd_poweroff.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause -/*

• • Copyright (C) 2019, STMicroelectronics - All Rights Reserved
• */

-#include <common.h> -#include <command.h> -#include <sysreset.h>

-int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{

• int ret;
• puts("poweroff ...\n");
• mdelay(100);
• ret = sysreset_walk(SYSRESET_POWER_OFF);
• if (ret == -EINPROGRESS)

• mdelay(1000);
  

• /*NOTREACHED when power off*/
• return CMD_RET_FAILURE;

-} diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig index b0cd260354..52edb29b48 100644 --- a/drivers/power/pmic/Kconfig +++ b/drivers/power/pmic/Kconfig @@ -234,6 +234,7 @@ config DM_PMIC_TPS65910 config PMIC_STPMIC1 bool "Enable support for STMicroelectronics STPMIC1 PMIC" depends on DM_PMIC && DM_I2C

• select SYSRESET_CMD_POWEROFF if CMD_POWEROFF &&

!ARM_PSCI_FW ---help--- The STPMIC1 PMIC provides 4 BUCKs, 6 LDOs, 1 VREF and 2 power switches. It is accessed via an I2C interface. The device is used with STM32MP1 diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig index 30aed2c4c1..4c883923bf 100644 --- a/drivers/sysreset/Kconfig +++ b/drivers/sysreset/Kconfig @@ -33,6 +33,16 @@ config TPL_SYSRESET

if SYSRESET

+if CMD_POWEROFF

+config SYSRESET_CMD_POWEROFF

• bool "sysreset implementation of the poweroff command"
• help

•  This should be selected by the appropriate PMIC driver if
  

•  the poweroff command is enabled.
  

+endif

config SYSRESET_GPIO bool "Enable support for GPIO reset driver" select DM_GPIO diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset- uclass.c index ad831c703a..39202588ae 100644 --- a/drivers/sysreset/sysreset-uclass.c +++ b/drivers/sysreset/sysreset-uclass.c @@ -118,6 +118,24 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }

+#if IS_ENABLED(CONFIG_SYSRESET_CMD_POWEROFF) +int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const +argv[]) {

• int ret;
• puts("poweroff ...\n");
• mdelay(100);
• ret = sysreset_walk(SYSRESET_POWER_OFF);
• if (ret == -EINPROGRESS)

• mdelay(1000);
  

• /*NOTREACHED when power off*/
• return CMD_RET_FAILURE;

+} +#endif

static int sysreset_post_bind(struct udevice *dev) { #if defined(CONFIG_NEEDS_MANUAL_RELOC) -- 2.21.0

Regards

Patrick Delaunay

Hi Urja, Simon,

This patch is not able to pass the sandbox_spl test, it reports: [1] 26463 segmentation fault (core dumped) ./u-boot

The driver looks good to me, no idea what cause the issue.

Thanks, - Kever

Urja Rannikko urjaman@gmail.com 于2019年5月17日周五 上午5:49写道：

Based on snooping around the linux kernel rk8xx driver. Tested on an ASUS C201.

Signed-off-by: Urja Rannikko urjaman@gmail.com

drivers/power/pmic/Kconfig | 1 + drivers/power/pmic/rk8xx.c | 62 +++++++++++++++++++++++++++++++++++--- include/power/rk8xx_pmic.h | 4 +++ 3 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig index 52edb29b48..3f6e30d503 100644 --- a/drivers/power/pmic/Kconfig +++ b/drivers/power/pmic/Kconfig @@ -124,6 +124,7 @@ config PMIC_PM8916 config PMIC_RK8XX bool "Enable support for Rockchip PMIC RK8XX" depends on DM_PMIC

•   select SYSRESET_CMD_POWEROFF if CMD_POWEROFF
    ---help---
    The Rockchip RK808 PMIC provides four buck DC-DC convertors, 8
  

LDOs, an RTC and two low Rds (resistance (drain to source)) switches. It is diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c index 25c339ab12..52e41051ae 100644 --- a/drivers/power/pmic/rk8xx.c +++ b/drivers/power/pmic/rk8xx.c @@ -6,6 +6,9 @@

#include <common.h> #include <dm.h> +#include <sysreset.h> +#include <dm/device.h> +#include <dm/lists.h> #include <errno.h> #include <power/rk8xx_pmic.h> #include <power/pmic.h> @@ -49,9 +52,9 @@ static int rk8xx_read(struct udevice *dev, uint reg, uint8_t *buff, int len) return 0; }

-#if CONFIG_IS_ENABLED(PMIC_CHILDREN) static int rk8xx_bind(struct udevice *dev) { +#if CONFIG_IS_ENABLED(PMIC_CHILDREN) ofnode regulators_node; int children;

@@ -68,10 +71,15 @@ static int rk8xx_bind(struct udevice *dev) if (!children) debug("%s: %s - no child found\n", __func__, dev->name);

+#endif

•   if (CONFIG_IS_ENABLED(SYSRESET))
  

•           return device_bind_driver(dev, "rk8xx-sysreset",
  

•                                     "rk8xx-sysreset", NULL);
  

•   /* Always return success for this device */
    return 0;
  

} -#endif

static int rk8xx_probe(struct udevice *dev) { @@ -103,10 +111,56 @@ U_BOOT_DRIVER(pmic_rk8xx) = { .name = "rk8xx pmic", .id = UCLASS_PMIC, .of_match = rk8xx_ids, -#if CONFIG_IS_ENABLED(PMIC_CHILDREN) .bind = rk8xx_bind, -#endif .priv_auto_alloc_size = sizeof(struct rk8xx_priv), .probe = rk8xx_probe, .ops = &rk8xx_ops, };

+#if IS_ENABLED(CONFIG_SYSRESET) +/* NOTE: Should only enable this function if the rockchip,system-power-manager

• • property is in the device tree node, but it is there in every board

that has

• • an rk8xx in u-boot currently, so this is left as an excercise for

later.

• */

+static int rk8xx_sysreset_request(struct udevice *dev, enum sysreset_t type) +{

•   struct udevice *pmic_dev;
  

•   struct rk8xx_priv *priv;
  

•   int ret;
  

•   u8 bits;
  

•   if (type != SYSRESET_POWER_OFF)
  

•           return -EPROTONOSUPPORT;
  

•   ret = uclass_get_device_by_driver(UCLASS_PMIC,
  

•                                     DM_GET_DRIVER(pmic_rk8xx),
  

•                                     &pmic_dev);
  

•   if (ret)
  

•           return -EOPNOTSUPP;
  

•   priv = dev_get_priv(pmic_dev);
  

•   if (priv->variant == RK818_ID)
  

•           bits = DEV_OFF;
  

•   else
  

•           bits = DEV_OFF_RST;
  

•   ret = pmic_clrsetbits(pmic_dev, REG_DEVCTRL, 0, bits);
  

•   if (ret < 0)
  

•           return ret;
  

•   return -EINPROGRESS;
  

+}

+static struct sysreset_ops rk8xx_sysreset_ops = {

•   .request = rk8xx_sysreset_request,
  

+};

+U_BOOT_DRIVER(rk8xx_sysreset) = {

•   .name = "rk8xx-sysreset",
  

•   .id = UCLASS_SYSRESET,
  

•   .ops = &rk8xx_sysreset_ops,
  

+}; +#endif diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h index c06248f751..565b35985e 100644 --- a/include/power/rk8xx_pmic.h +++ b/include/power/rk8xx_pmic.h @@ -177,6 +177,10 @@ enum {

#define RK8XX_ID_MSK 0xfff0

+/* DEVCTRL bits for poweroff */ +#define DEV_OFF_RST BIT(3) +#define DEV_OFF BIT(0)

struct rk8xx_reg_table { char *name; u8 reg_ctl; -- 2.21.0

---

U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot