projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'efi-2020-04-rc4-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
[oweals/u-boot.git]
/
arch
/
arm
/
mach-stm32mp
/
psci.c
diff --git
a/arch/arm/mach-stm32mp/psci.c
b/arch/arm/mach-stm32mp/psci.c
index 139bb09292263c5e8db9fb7e40a1d63ed607e3c5..1d91b2d324a8dd7a699f58ecaf1a9e87a6de87da 100644
(file)
--- a/
arch/arm/mach-stm32mp/psci.c
+++ b/
arch/arm/mach-stm32mp/psci.c
@@
-30,7
+30,7
@@
u8 psci_state[STM32MP1_PSCI_NR_CPUS] __secure_data = {
PSCI_AFFINITY_LEVEL_ON,
PSCI_AFFINITY_LEVEL_OFF};
PSCI_AFFINITY_LEVEL_ON,
PSCI_AFFINITY_LEVEL_OFF};
-
void __secure
psci_set_state(int cpu, u8 state)
+
static inline void
psci_set_state(int cpu, u8 state)
{
psci_state[cpu] = state;
dsb();
{
psci_state[cpu] = state;
dsb();
@@
-67,7
+67,7
@@
void __secure psci_arch_cpu_entry(void)
writel(0xFFFFFFFF, TAMP_BACKUP_MAGIC_NUMBER);
}
writel(0xFFFFFFFF, TAMP_BACKUP_MAGIC_NUMBER);
}
-
int
__secure psci_features(u32 function_id, u32 psci_fid)
+
s32
__secure psci_features(u32 function_id, u32 psci_fid)
{
switch (psci_fid) {
case ARM_PSCI_0_2_FN_PSCI_VERSION:
{
switch (psci_fid) {
case ARM_PSCI_0_2_FN_PSCI_VERSION:
@@
-82,12
+82,12
@@
int __secure psci_features(u32 function_id, u32 psci_fid)
return ARM_PSCI_RET_NI;
}
return ARM_PSCI_RET_NI;
}
-u
nsigned int __secure psci_version(u32 function_
id)
+u
32 __secure psci_version(vo
id)
{
return ARM_PSCI_VER_1_0;
}
{
return ARM_PSCI_VER_1_0;
}
-
int
__secure psci_affinity_info(u32 function_id, u32 target_affinity,
+
s32
__secure psci_affinity_info(u32 function_id, u32 target_affinity,
u32 lowest_affinity_level)
{
u32 cpu = target_affinity & MPIDR_AFF0;
u32 lowest_affinity_level)
{
u32 cpu = target_affinity & MPIDR_AFF0;
@@
-104,7
+104,7
@@
int __secure psci_affinity_info(u32 function_id, u32 target_affinity,
return psci_state[cpu];
}
return psci_state[cpu];
}
-
int __secure psci_migrate_info_type(u32 function_
id)
+
u32 __secure psci_migrate_info_type(vo
id)
{
/*
* in Power_State_Coordination_Interface_PDD_v1_1_DEN0022D.pdf
{
/*
* in Power_State_Coordination_Interface_PDD_v1_1_DEN0022D.pdf
@@
-116,7
+116,7
@@
int __secure psci_migrate_info_type(u32 function_id)
return 2;
}
return 2;
}
-
int
__secure psci_cpu_on(u32 function_id, u32 target_cpu, u32 pc,
+
s32
__secure psci_cpu_on(u32 function_id, u32 target_cpu, u32 pc,
u32 context_id)
{
u32 cpu = target_cpu & MPIDR_AFF0;
u32 context_id)
{
u32 cpu = target_cpu & MPIDR_AFF0;
@@
-161,7
+161,7
@@
int __secure psci_cpu_on(u32 function_id, u32 target_cpu, u32 pc,
return ARM_PSCI_RET_SUCCESS;
}
return ARM_PSCI_RET_SUCCESS;
}
-
int __secure psci_cpu_off(u32 function_
id)
+
s32 __secure psci_cpu_off(vo
id)
{
u32 cpu;
{
u32 cpu;
@@
-181,7
+181,7
@@
int __secure psci_cpu_off(u32 function_id)
wfi();
}
wfi();
}
-void __secure psci_system_reset(
u32 function_
id)
+void __secure psci_system_reset(
vo
id)
{
/* System reset */
writel(RCC_MP_GRSTCSETR_MPSYSRST, RCC_MP_GRSTCSETR);
{
/* System reset */
writel(RCC_MP_GRSTCSETR_MPSYSRST, RCC_MP_GRSTCSETR);
@@
-190,7
+190,7
@@
void __secure psci_system_reset(u32 function_id)
wfi();
}
wfi();
}
-void __secure psci_system_off(
u32 function_
id)
+void __secure psci_system_off(
vo
id)
{
/* System Off is not managed, waiting user power off
* TODO: handle I2C write in PMIC Main Control register bit 0 = SWOFF
{
/* System Off is not managed, waiting user power off
* TODO: handle I2C write in PMIC Main Control register bit 0 = SWOFF