* [U-Boot] [PATCH V3 1/3] mx7_common: use psci 1.0 instead of 0.1
@ 2018-01-07 6:34 Anson Huang
2018-01-07 6:34 ` [U-Boot] [PATCH V3 2/3] imx: mx7: psci: add system reset support Anson Huang
2018-01-07 6:34 ` [U-Boot] [PATCH V3 3/3] imx: mx7: psci: add system power off support Anson Huang
0 siblings, 2 replies; 5+ messages in thread
From: Anson Huang @ 2018-01-07 6:34 UTC (permalink / raw)
To: u-boot
Use PSCI 1.0 instead of 0.1 to support more power
management feature like system reset, power off etc..
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
include/configs/mx7_common.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 16e4d95..7861712 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -62,6 +62,8 @@
#define CONFIG_ARMV7_SECURE_BASE 0x00900000
+#define CONFIG_ARMV7_PSCI_1_0
+
/* Secure boot (HAB) support */
#ifdef CONFIG_SECURE_BOOT
#define CONFIG_CSF_SIZE 0x2000
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH V3 2/3] imx: mx7: psci: add system reset support
2018-01-07 6:34 [U-Boot] [PATCH V3 1/3] mx7_common: use psci 1.0 instead of 0.1 Anson Huang
@ 2018-01-07 6:34 ` Anson Huang
2018-02-04 9:25 ` Stefano Babic
2018-01-07 6:34 ` [U-Boot] [PATCH V3 3/3] imx: mx7: psci: add system power off support Anson Huang
1 sibling, 1 reply; 5+ messages in thread
From: Anson Huang @ 2018-01-07 6:34 UTC (permalink / raw)
To: u-boot
Add i.MX7 PSCI system reset support, linux
kernel can use "reboot" command to reset
system even wdog driver is disabled in kernel.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
arch/arm/mach-imx/mx7/psci-mx7.c | 15 ++++++++++++++-
arch/arm/mach-imx/mx7/psci.S | 7 +++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
index 7f429b0..b26be89 100644
--- a/arch/arm/mach-imx/mx7/psci-mx7.c
+++ b/arch/arm/mach-imx/mx7/psci-mx7.c
@@ -10,7 +10,7 @@
#include <asm/secure.h>
#include <asm/arch/imx-regs.h>
#include <common.h>
-
+#include <fsl_wdog.h>
#define GPC_CPU_PGC_SW_PDN_REQ 0xfc
#define GPC_CPU_PGC_SW_PUP_REQ 0xf0
@@ -26,6 +26,9 @@
#define BP_SRC_A7RCR0_A7_CORE_RESET0 0
#define BP_SRC_A7RCR1_A7_CORE1_ENABLE 1
+#define CCM_ROOT_WDOG 0xbb80
+#define CCM_CCGR_WDOG1 0x49c0
+
static inline void imx_gpcv2_set_m_core_pgc(bool enable, u32 offset)
{
writel(enable, GPC_IPS_BASE_ADDR + offset);
@@ -74,3 +77,13 @@ __secure int imx_cpu_off(int cpu)
writel(0, SRC_BASE_ADDR + cpu * 8 + SRC_GPR1_MX7D + 4);
return 0;
}
+
+__secure void imx_system_reset(void)
+{
+ struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
+
+ /* make sure WDOG1 clock is enabled */
+ writel(0x1 << 28, CCM_BASE_ADDR + CCM_ROOT_WDOG);
+ writel(0x3, CCM_BASE_ADDR + CCM_CCGR_WDOG1);
+ writew(WCR_WDE, &wdog->wcr);
+}
diff --git a/arch/arm/mach-imx/mx7/psci.S b/arch/arm/mach-imx/mx7/psci.S
index fc5eb34..e23db24 100644
--- a/arch/arm/mach-imx/mx7/psci.S
+++ b/arch/arm/mach-imx/mx7/psci.S
@@ -43,4 +43,11 @@ psci_cpu_off:
1: wfi
b 1b
+.globl psci_system_reset
+psci_system_reset:
+ bl imx_system_reset
+
+2: wfi
+ b 2b
+
.popsection
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH V3 3/3] imx: mx7: psci: add system power off support
2018-01-07 6:34 [U-Boot] [PATCH V3 1/3] mx7_common: use psci 1.0 instead of 0.1 Anson Huang
2018-01-07 6:34 ` [U-Boot] [PATCH V3 2/3] imx: mx7: psci: add system reset support Anson Huang
@ 2018-01-07 6:34 ` Anson Huang
2018-02-04 9:25 ` Stefano Babic
1 sibling, 1 reply; 5+ messages in thread
From: Anson Huang @ 2018-01-07 6:34 UTC (permalink / raw)
To: u-boot
Add i.MX7 PSCI system power off support, linux
kernel can use "poweroff" command to power off
system via SNVS, PMIC power will be disabled.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
arch/arm/mach-imx/mx7/psci-mx7.c | 18 ++++++++++++++++++
arch/arm/mach-imx/mx7/psci.S | 7 +++++++
2 files changed, 25 insertions(+)
diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
index b26be89..d5db511 100644
--- a/arch/arm/mach-imx/mx7/psci-mx7.c
+++ b/arch/arm/mach-imx/mx7/psci-mx7.c
@@ -26,6 +26,12 @@
#define BP_SRC_A7RCR0_A7_CORE_RESET0 0
#define BP_SRC_A7RCR1_A7_CORE1_ENABLE 1
+#define SNVS_LPCR 0x38
+#define BP_SNVS_LPCR_DP_EN 0x20
+#define BP_SNVS_LPCR_TOP 0x40
+
+#define CCM_CCGR_SNVS 0x4250
+
#define CCM_ROOT_WDOG 0xbb80
#define CCM_CCGR_WDOG1 0x49c0
@@ -87,3 +93,15 @@ __secure void imx_system_reset(void)
writel(0x3, CCM_BASE_ADDR + CCM_CCGR_WDOG1);
writew(WCR_WDE, &wdog->wcr);
}
+
+__secure void imx_system_off(void)
+{
+ u32 val;
+
+ /* make sure SNVS clock is enabled */
+ writel(0x3, CCM_BASE_ADDR + CCM_CCGR_SNVS);
+
+ val = readl(SNVS_BASE_ADDR + SNVS_LPCR);
+ val |= BP_SNVS_LPCR_DP_EN | BP_SNVS_LPCR_TOP;
+ writel(val, SNVS_BASE_ADDR + SNVS_LPCR);
+}
diff --git a/arch/arm/mach-imx/mx7/psci.S b/arch/arm/mach-imx/mx7/psci.S
index e23db24..bc2cd8a 100644
--- a/arch/arm/mach-imx/mx7/psci.S
+++ b/arch/arm/mach-imx/mx7/psci.S
@@ -50,4 +50,11 @@ psci_system_reset:
2: wfi
b 2b
+.globl psci_system_off
+psci_system_off:
+ bl imx_system_off
+
+3: wfi
+ b 3b
+
.popsection
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH V3 2/3] imx: mx7: psci: add system reset support
2018-01-07 6:34 ` [U-Boot] [PATCH V3 2/3] imx: mx7: psci: add system reset support Anson Huang
@ 2018-02-04 9:25 ` Stefano Babic
0 siblings, 0 replies; 5+ messages in thread
From: Stefano Babic @ 2018-02-04 9:25 UTC (permalink / raw)
To: u-boot
On 07/01/2018 07:34, Anson Huang wrote:
> Add i.MX7 PSCI system reset support, linux
> kernel can use "reboot" command to reset
> system even wdog driver is disabled in kernel.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> arch/arm/mach-imx/mx7/psci-mx7.c | 15 ++++++++++++++-
> arch/arm/mach-imx/mx7/psci.S | 7 +++++++
> 2 files changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
> index 7f429b0..b26be89 100644
> --- a/arch/arm/mach-imx/mx7/psci-mx7.c
> +++ b/arch/arm/mach-imx/mx7/psci-mx7.c
> @@ -10,7 +10,7 @@
> #include <asm/secure.h>
> #include <asm/arch/imx-regs.h>
> #include <common.h>
> -
> +#include <fsl_wdog.h>
>
> #define GPC_CPU_PGC_SW_PDN_REQ 0xfc
> #define GPC_CPU_PGC_SW_PUP_REQ 0xf0
> @@ -26,6 +26,9 @@
> #define BP_SRC_A7RCR0_A7_CORE_RESET0 0
> #define BP_SRC_A7RCR1_A7_CORE1_ENABLE 1
>
> +#define CCM_ROOT_WDOG 0xbb80
> +#define CCM_CCGR_WDOG1 0x49c0
> +
> static inline void imx_gpcv2_set_m_core_pgc(bool enable, u32 offset)
> {
> writel(enable, GPC_IPS_BASE_ADDR + offset);
> @@ -74,3 +77,13 @@ __secure int imx_cpu_off(int cpu)
> writel(0, SRC_BASE_ADDR + cpu * 8 + SRC_GPR1_MX7D + 4);
> return 0;
> }
> +
> +__secure void imx_system_reset(void)
> +{
> + struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
> +
> + /* make sure WDOG1 clock is enabled */
> + writel(0x1 << 28, CCM_BASE_ADDR + CCM_ROOT_WDOG);
> + writel(0x3, CCM_BASE_ADDR + CCM_CCGR_WDOG1);
> + writew(WCR_WDE, &wdog->wcr);
> +}
> diff --git a/arch/arm/mach-imx/mx7/psci.S b/arch/arm/mach-imx/mx7/psci.S
> index fc5eb34..e23db24 100644
> --- a/arch/arm/mach-imx/mx7/psci.S
> +++ b/arch/arm/mach-imx/mx7/psci.S
> @@ -43,4 +43,11 @@ psci_cpu_off:
> 1: wfi
> b 1b
>
> +.globl psci_system_reset
> +psci_system_reset:
> + bl imx_system_reset
> +
> +2: wfi
> + b 2b
> +
> .popsection
>
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH V3 3/3] imx: mx7: psci: add system power off support
2018-01-07 6:34 ` [U-Boot] [PATCH V3 3/3] imx: mx7: psci: add system power off support Anson Huang
@ 2018-02-04 9:25 ` Stefano Babic
0 siblings, 0 replies; 5+ messages in thread
From: Stefano Babic @ 2018-02-04 9:25 UTC (permalink / raw)
To: u-boot
On 07/01/2018 07:34, Anson Huang wrote:
> Add i.MX7 PSCI system power off support, linux
> kernel can use "poweroff" command to power off
> system via SNVS, PMIC power will be disabled.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> arch/arm/mach-imx/mx7/psci-mx7.c | 18 ++++++++++++++++++
> arch/arm/mach-imx/mx7/psci.S | 7 +++++++
> 2 files changed, 25 insertions(+)
>
> diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c
> index b26be89..d5db511 100644
> --- a/arch/arm/mach-imx/mx7/psci-mx7.c
> +++ b/arch/arm/mach-imx/mx7/psci-mx7.c
> @@ -26,6 +26,12 @@
> #define BP_SRC_A7RCR0_A7_CORE_RESET0 0
> #define BP_SRC_A7RCR1_A7_CORE1_ENABLE 1
>
> +#define SNVS_LPCR 0x38
> +#define BP_SNVS_LPCR_DP_EN 0x20
> +#define BP_SNVS_LPCR_TOP 0x40
> +
> +#define CCM_CCGR_SNVS 0x4250
> +
> #define CCM_ROOT_WDOG 0xbb80
> #define CCM_CCGR_WDOG1 0x49c0
>
> @@ -87,3 +93,15 @@ __secure void imx_system_reset(void)
> writel(0x3, CCM_BASE_ADDR + CCM_CCGR_WDOG1);
> writew(WCR_WDE, &wdog->wcr);
> }
> +
> +__secure void imx_system_off(void)
> +{
> + u32 val;
> +
> + /* make sure SNVS clock is enabled */
> + writel(0x3, CCM_BASE_ADDR + CCM_CCGR_SNVS);
> +
> + val = readl(SNVS_BASE_ADDR + SNVS_LPCR);
> + val |= BP_SNVS_LPCR_DP_EN | BP_SNVS_LPCR_TOP;
> + writel(val, SNVS_BASE_ADDR + SNVS_LPCR);
> +}
> diff --git a/arch/arm/mach-imx/mx7/psci.S b/arch/arm/mach-imx/mx7/psci.S
> index e23db24..bc2cd8a 100644
> --- a/arch/arm/mach-imx/mx7/psci.S
> +++ b/arch/arm/mach-imx/mx7/psci.S
> @@ -50,4 +50,11 @@ psci_system_reset:
> 2: wfi
> b 2b
>
> +.globl psci_system_off
> +psci_system_off:
> + bl imx_system_off
> +
> +3: wfi
> + b 3b
> +
> .popsection
>
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-04 9:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-07 6:34 [U-Boot] [PATCH V3 1/3] mx7_common: use psci 1.0 instead of 0.1 Anson Huang
2018-01-07 6:34 ` [U-Boot] [PATCH V3 2/3] imx: mx7: psci: add system reset support Anson Huang
2018-02-04 9:25 ` Stefano Babic
2018-01-07 6:34 ` [U-Boot] [PATCH V3 3/3] imx: mx7: psci: add system power off support Anson Huang
2018-02-04 9:25 ` Stefano Babic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.