LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
This commit is contained in:
Anson Huang 2018-01-07 14:34:31 +08:00 committed by Stefano Babic
parent 0ec3d98f76
commit 169c20e903
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/mach-imx/mx7/psci-mx7.c
View File

@ -10,7 +10,7 @@
#include <asm/secure.h> #include <asm/secure.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <common.h> #include <common.h>
#include <fsl_wdog.h>
#define GPC_CPU_PGC_SW_PDN_REQ 0xfc #define GPC_CPU_PGC_SW_PDN_REQ 0xfc
#define GPC_CPU_PGC_SW_PUP_REQ 0xf0 #define GPC_CPU_PGC_SW_PUP_REQ 0xf0
@ -26,6 +26,9 @@
#define BP_SRC_A7RCR0_A7_CORE_RESET0 0 #define BP_SRC_A7RCR0_A7_CORE_RESET0 0
#define BP_SRC_A7RCR1_A7_CORE1_ENABLE 1 #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) static inline void imx_gpcv2_set_m_core_pgc(bool enable, u32 offset)
{ {
writel(enable, GPC_IPS_BASE_ADDR + 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); writel(0, SRC_BASE_ADDR + cpu * 8 + SRC_GPR1_MX7D + 4);
return 0; 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);
}

7
arch/arm/mach-imx/mx7/psci.S
View File

@ -43,4 +43,11 @@ psci_cpu_off:
1: wfi 1: wfi
b 1b b 1b
.globl psci_system_reset
psci_system_reset:
bl imx_system_reset
2: wfi
b 2b
.popsection .popsection