Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 068654c2 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi
Browse files

drivers: firmware: psci: move power_state handling to generic code 



Functions implemented on arm64 to check if a power_state parameter
is valid and if the power_state implies context loss are not
arm64 specific and should be moved to generic code so that they
can be reused on arm systems too.

This patch moves the functions handling the power_state parameter
to generic PSCI firmware layer code.

Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Tested-by: default avatarJisheng Zhang <jszhang@marvell.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
parent 2217d7c6

arch/arm64/kernel/psci.c

+0 −14
Original line number Diff line number Diff line
@@ -30,20 +30,6 @@ 
#include <asm/smp_plat.h>

#include <asm/suspend.h>



static bool psci_power_state_loses_context(u32 state)

{

	return state & PSCI_0_2_POWER_STATE_TYPE_MASK;

}



static bool psci_power_state_is_valid(u32 state)

{

	const u32 valid_mask = PSCI_0_2_POWER_STATE_ID_MASK |

			       PSCI_0_2_POWER_STATE_TYPE_MASK |

			       PSCI_0_2_POWER_STATE_AFFL_MASK;



	return !(state & ~valid_mask);

}



static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state);



static int __maybe_unused cpu_psci_cpu_init_idle(unsigned int cpu)

drivers/firmware/psci.c

+15 −0
Original line number Diff line number Diff line
@@ -70,6 +70,21 @@ enum psci_function { 


static u32 psci_function_id[PSCI_FN_MAX];



#define PSCI_0_2_POWER_STATE_MASK		\

				(PSCI_0_2_POWER_STATE_ID_MASK | \

				PSCI_0_2_POWER_STATE_TYPE_MASK | \

				PSCI_0_2_POWER_STATE_AFFL_MASK)



bool psci_power_state_loses_context(u32 state)

{

	return state & PSCI_0_2_POWER_STATE_TYPE_MASK;

}



bool psci_power_state_is_valid(u32 state)

{

	return !(state & ~PSCI_0_2_POWER_STATE_MASK);

}



static int psci_to_linux_errno(int errno)

{

	switch (errno) {

include/linux/psci.h

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#define PSCI_POWER_STATE_TYPE_POWER_DOWN	1



bool psci_tos_resident_on(int cpu);

bool psci_power_state_loses_context(u32 state);

bool psci_power_state_is_valid(u32 state);



struct psci_operations {

	int (*cpu_suspend)(u32 state, unsigned long entry_point);