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

Commit 5211df00 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

drivers: psci: support native SMC{32,64} calls 



A 32-bit OS cannot make calls with SMC64 IDs, while a 64-bit OS must
invoke some PSCI functions with SMC64 IDs.

This patch introduces and makes use of a new macro to choose the
appropriate IDs based on the register width of the OS, which will allow
32-bit callers to use the PSCI client code.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent bff60792

drivers/firmware/psci.c

+19 −6
Original line number Diff line number Diff line
@@ -27,6 +27,18 @@ 
#include <asm/system_misc.h>

#include <asm/smp_plat.h>



/*

 * While a 64-bit OS can make calls with SMC32 calling conventions, for some

 * calls it is necessary to use SMC64 to pass or return 64-bit values. For such

 * calls PSCI_0_2_FN_NATIVE(x) will choose the appropriate (native-width)

 * function ID.

 */

#ifdef CONFIG_64BIT

#define PSCI_0_2_FN_NATIVE(name)	PSCI_0_2_FN64_##name

#else

#define PSCI_0_2_FN_NATIVE(name)	PSCI_0_2_FN_##name

#endif



/*

 * The CPU any Trusted OS is resident on. The trusted OS may reject CPU_OFF

 * calls to its resident CPU, so we must avoid issuing those. We never migrate
@@ -122,8 +134,8 @@ static int psci_migrate(unsigned long cpuid) 
static int psci_affinity_info(unsigned long target_affinity,

		unsigned long lowest_affinity_level)

{

	return invoke_psci_fn(PSCI_0_2_FN64_AFFINITY_INFO, target_affinity,

			      lowest_affinity_level, 0);

	return invoke_psci_fn(PSCI_0_2_FN_NATIVE(AFFINITY_INFO),

			      target_affinity, lowest_affinity_level, 0);

}



static int psci_migrate_info_type(void)
@@ -133,7 +145,8 @@ static int psci_migrate_info_type(void) 


static unsigned long psci_migrate_info_up_cpu(void)

{

	return invoke_psci_fn(PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU, 0, 0, 0);

	return invoke_psci_fn(PSCI_0_2_FN_NATIVE(MIGRATE_INFO_UP_CPU),

			      0, 0, 0);

}



static int get_set_conduit_method(struct device_node *np)
@@ -211,16 +224,16 @@ static void __init psci_init_migrate(void) 
static void __init psci_0_2_set_functions(void)

{

	pr_info("Using standard PSCI v0.2 function IDs\n");

	psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN64_CPU_SUSPEND;

	psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN_NATIVE(CPU_SUSPEND);

	psci_ops.cpu_suspend = psci_cpu_suspend;



	psci_function_id[PSCI_FN_CPU_OFF] = PSCI_0_2_FN_CPU_OFF;

	psci_ops.cpu_off = psci_cpu_off;



	psci_function_id[PSCI_FN_CPU_ON] = PSCI_0_2_FN64_CPU_ON;

	psci_function_id[PSCI_FN_CPU_ON] = PSCI_0_2_FN_NATIVE(CPU_ON);

	psci_ops.cpu_on = psci_cpu_on;



	psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN64_MIGRATE;

	psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN_NATIVE(MIGRATE);

	psci_ops.migrate = psci_migrate;



	psci_ops.affinity_info = psci_affinity_info;