Skip to contentSkip to conversation

mx7_common: use psci 1.0 instead of 0.1

PATCH Superseded Anson Huang 2 participants 6 messages Jan 6, 2018 – Jan 7, 2018

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 mx7_common: use psci 1.0 instead of 0.1

Use PSCI 1.0 instead of 0.1 to support more power management feature like system reset, power off etc..

---
no changes since v1.

 include/configs/mx7_common.h | 2 ++
 1 file changed, 2 insertions(+)
include/configs/mx7_common.h +2 -0
index 16e4d95..7861712 100644
@@ -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
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 2/3 imx: mx7: psci: add system reset support

Add i.MX7 PSCI system reset support, linux
kernel can use "reboot" command to reset
system even wdog driver is disabled in kernel.

---
changes since v1:
use "bl" instead of "b" as we need the call to return back.

 arch/arm/mach-imx/mx7/psci-mx7.c | 5 +++++
 arch/arm/mach-imx/mx7/psci.S     | 7 +++++++
 2 files changed, 12 insertions(+)
arch/arm/mach-imx/mx7/psci-mx7.c +5 -0
index 7f429b0..66f6db6 100644
@@ -74,3 +74,8 @@ __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)
+{
+	writew(1 << 2, WDOG1_BASE_ADDR);
+}
arch/arm/mach-imx/mx7/psci.S +7 -0
index fc5eb34..e23db24 100644
@@ -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
Signature · 1 line
1.9.1
reviewer
#2 lore raw

PATCH v2 2/3 imx: mx7: psci: add system reset support

Hi Anson,

arch/arm/mach-imx/mx7/psci-mx7.c __secure int imx_cpu_off(int cpu) · line 80

Quoted 5 lines · Anson Huang

}

arch/arm/mach-imx/mx7/psci-mx7.c +4 -0
+
+__secure void imx_system_reset(void)
+{
+       writew(1 << 2, WDOG1_BASE_ADDR);

It would be safer to turn on the wdog1 clock prior to writing to this register. Better not assume that is already turned on.

Also this could be improved:

- Do not use hardcoded 1 << 2. There is a WCR_WDE define already available for that.

- Access this register via proper accessors:

struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; clrsetbits_le16(&wdog->wcr, 0, WCR_WDE);

#3 lore raw

PATCH v2 3/3 imx: mx7: psci: add system power off support

In reply to Anson Huang

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.

---
changes since v1:
use "bl" instead of "b" as we need the call to return back.

 arch/arm/mach-imx/mx7/psci-mx7.c | 18 ++++++++++++++++++
 arch/arm/mach-imx/mx7/psci.S     |  7 +++++++
 2 files changed, 25 insertions(+)
arch/arm/mach-imx/mx7/psci-mx7.c +18 -0
index 66f6db6..0e515f0 100644
@@ -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
+
 static inline void imx_gpcv2_set_m_core_pgc(bool enable, u32 offset)
 {
 	writel(enable, GPC_IPS_BASE_ADDR + offset);
@@ -79,3 +85,15 @@ __secure void imx_system_reset(void)
 {
 	writew(1 << 2, WDOG1_BASE_ADDR);
 }
+
+__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);
+}
arch/arm/mach-imx/mx7/psci.S +7 -0
index e23db24..bc2cd8a 100644
@@ -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
Signature · 1 line
1.9.1
reviewer
#4 lore raw

PATCH v2 1/3 mx7_common: use psci 1.0 instead of 0.1

In reply to Anson Huang

Hi Anson,

Quoted 4 lines · Anson Huang

Use PSCI 1.0 instead of 0.1 to support more power management feature like system reset, power off etc..

Thanks for this patch series.

Do you also plan to add suspend/resume support for i.MX7 via PSCI.

Thanks

#5 lore raw

PATCH v2 1/3 mx7_common: use psci 1.0 instead of 0.1

Best Regards!
Anson Huang

Quoted 17 lines

-----Original Message-----
From: Fabio Estevam [mailto:festevam at gmail.com]
Sent: 2018-01-07 12:05 AM
To: Anson Huang <[email protected]>
Cc: Stefano Babic <[email protected]>; Fabio Estevam <[email protected]>; Albert ARIBAUD <[email protected]>; Troy Kisky <[email protected]>; Christian Gmeiner <[email protected]>; Peng Fan <[email protected]>; U-Boot- Denx <[email protected]>
Subject: Re: [U-Boot] [PATCH V2 1/3] mx7_common: use psci 1.0 instead of 0.1

Hi Anson,

Quoted 3 lines · Anson Huang

Use PSCI 1.0 instead of 0.1 to support more power management feature like system reset, power off etc..

Quoted 7 lines
Quoted 1 line

Thanks for this patch series.

Do you also plan to add suspend/resume support for i.MX7 via PSCI.

Thanks

Yes, I plan to add suspend/resume & cpu-idle support for i.MX7 vis PSCI soon, will do it step by step.

Anson.