Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-17 22:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: uniphier: support system reset functionality for PSCI

Browse source 
This supports the system reset via PSCI for ARMv7 SoCs.

Because the system reset is not supported on PSCI 0.1, let's define
CONFIG_ARMV7_PSCI_1_0. (it is supported since PSCI 0.2, but there
is no CONFIG to enable it in U-Boot for now.)

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-08-25 21:03:41 +09:00
parent 4a89a24e26
commit 928f3248b3
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/mach-uniphier/arm32/psci.c
View file

@ -151,3 +151,8 @@ int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point)
return PSCI_RET_SUCCESS; return PSCI_RET_SUCCESS;
} }
void __secure psci_system_reset(u32 function_id)
{
reset_cpu(0);
}

14
arch/arm/mach-uniphier/reset.c
View file

@ -1,15 +1,25 @@
/* /*
* Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2012-2014 Panasonic Corporation
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include <common.h> #include <common.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/secure.h>
#include "sc-regs.h" #include "sc-regs.h"
void reset_cpu(unsigned long ignored) /* If PSCI is enabled, this is used for SYSTEM_RESET function */
#ifdef CONFIG_ARMV7_PSCI
#define __SECURE __secure
#else
#define __SECURE
#endif
void __SECURE reset_cpu(unsigned long ignored)
{ {
u32 tmp; u32 tmp;

1
include/configs/uniphier.h
View file

@ -12,6 +12,7 @@
#define __CONFIG_UNIPHIER_COMMON_H__ #define __CONFIG_UNIPHIER_COMMON_H__
#define CONFIG_ARMV7_PSCI #define CONFIG_ARMV7_PSCI
#define CONFIG_ARMV7_PSCI_1_0
#define CONFIG_ARMV7_PSCI_NR_CPUS 4 #define CONFIG_ARMV7_PSCI_NR_CPUS 4
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10