psci: Fix warnings when compiling with W=1
Subsystems (6)
PATCH v2 1/1 psci: Fix warnings when compiling with W=1
This patch solves the following warnings:arch/arm/mach-stm32mp/psci.c:
warning: no previous prototype for ‘psci_set_state’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_arch_cpu_entry’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_features’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_version’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_affinity_info’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_migrate_info_type’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_cpu_on’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_cpu_off’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_system_reset’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_system_off’ [-Wmissing-prototypes]
---
This the v2 of http://patchwork.ozlabs.org/patch/1120263/
reworked after travis error
Changes in v2:
- solve compilation issue for unipher
- add prototype for psci_arch_cpu_entry
arch/arm/cpu/armv7/sunxi/psci.c | 2 +- arch/arm/include/asm/system.h | 15 +++++++++++++++ arch/arm/mach-imx/mx7/psci-mx7.c | 2 +- arch/arm/mach-stm32mp/psci.c | 18 +++++++++--------- arch/arm/mach-uniphier/arm32/psci.c | 4 ++-- 5 files changed, 28 insertions(+), 13 deletions(-)
arch/arm/cpu/armv7/sunxi/psci.c +1 -1
@@ -276,7 +276,7 @@ int __secure psci_cpu_on(u32 __always_unused unused, u32 mpidr, u32 pc,return ARM_PSCI_RET_SUCCESS ; } -void __secure psci_cpu_off(void) +s32 __secure psci_cpu_off(void) {psci_cpu_off_common ();
arch/arm/include/asm/system.h +15 -0
@@ -516,6 +516,21 @@ enum {*/ void mmu_page_table_flush (unsigned long start,unsigned long stop); +#ifdef CONFIG_ARMV7_PSCI +void psci_arch_cpu_entry (void ); +u32 psci_version (void ); +s32 psci_features (u32 function_id,u32 psci_fid); +s32 psci_cpu_off (void ); +s32 psci_cpu_on (u32 function_id,u32 target_cpu,u32 pc, +u32 context_id); +s32 psci_affinity_info (u32 function_id,u32 target_affinity, +u32 lowest_affinity_level); +u32 psci_migrate_info_type (void ); +void psci_system_off (void ); +void psci_system_reset (void ); +s32 psci_features (u32 function_id,u32 psci_fid); +#endif +#endif /* __ASSEMBLY__ */ #define arch_align_stack (x) (x)
arch/arm/mach-imx/mx7/psci-mx7.c +1 -1
@@ -298,7 +298,7 @@ __secure s32 psci_affinity_info(u32 __always_unused function_id,return psci_state[cpu]; } -__secure s32 psci_migrate_info_type(u32 function_id) +__secure u32 psci_migrate_info_type(void) {/* Trusted OS is either not present or does not require migration */ return 2 ;
arch/arm/mach-stm32mp/psci.c +9 -9
@@ -30,7 +30,7 @@ u8 psci_state[STM32MP1_PSCI_NR_CPUS] __secure_data = {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 ();
@@ -67,7 +67,7 @@ void __secure psci_arch_cpu_entry(void)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 :
@@ -82,12 +82,12 @@ int __secure psci_features(u32 function_id, u32 psci_fid)return ARM_PSCI_RET_NI ; } -unsigned int __secure psci_version(u32 function_id) +u32 __secure psci_version(void) {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 ;
@@ -104,7 +104,7 @@ int __secure psci_affinity_info(u32 function_id, u32 target_affinity,return psci_state[cpu]; } -int __secure psci_migrate_info_type(u32 function_id) +u32 __secure psci_migrate_info_type(void) {/* * 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 ; } -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 ;
@@ -161,7 +161,7 @@ int __secure psci_cpu_on(u32 function_id, u32 target_cpu, u32 pc,return ARM_PSCI_RET_SUCCESS ; } -int __secure psci_cpu_off(u32 function_id) +s32 __secure psci_cpu_off(void) {u32 cpu;
@@ -181,7 +181,7 @@ int __secure psci_cpu_off(u32 function_id)wfi (); } -void __secure psci_system_reset(u32 function_id) +void __secure psci_system_reset(void) {/* System reset */ writel (RCC_MP_GRSTCSETR_MPSYSRST ,RCC_MP_GRSTCSETR );
@@ -190,7 +190,7 @@ void __secure psci_system_reset(u32 function_id)wfi (); } -void __secure psci_system_off(u32 function_id) +void __secure psci_system_off(void) {/* System Off is not managed, waiting user power off * TODO: handle I2C write in PMIC Main Control register bit 0 = SWOFF
arch/arm/mach-uniphier/arm32/psci.c +2 -2
@@ -130,7 +130,7 @@ void psci_arch_init(void) u32 uniphier_psci_holding_pen_release __secure_data = 0xffffffff; -int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point, +s32 __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point,u32 context_id) {u32 cpu = cpuid &0xff ;
@@ -155,7 +155,7 @@ int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point,return PSCI_RET_SUCCESS ; } -void __secure psci_system_reset(u32 function_id) +void __secure psci_system_reset(void) {reset_cpu (0 ); }
Signature · 1 line
2.7.4
PATCH v2 1/1 psci: Fix warnings when compiling with W=1
Quoted 14 lines · Patrick Delaunay
This patch solves the following warnings:
arch/arm/mach-stm32mp/psci.c:warning: no previous prototype for ‘psci_set_state’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_arch_cpu_entry’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_features’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_version’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_affinity_info’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_migrate_info_type’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_cpu_on’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_cpu_off’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_system_reset’ [-Wmissing-prototypes]
warning: no previous prototype for ‘psci_system_off’ [-Wmissing-prototypes]
Quoted 1 line
Signed-off-by Patrick Delaunay <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190724/08ae839a/attachment.sig>