Commit 0bc7474f authored by David Brazdil's avatar David Brazdil Committed by Marc Zyngier
Browse files

psci: Split functions to v0.1 and v0.2+ variants 



Refactor implementation of v0.1+ functions (CPU_SUSPEND, CPU_OFF,
CPU_ON, MIGRATE) to have two functions psci_0_1_foo / psci_0_2_foo that
select the function ID and call a common helper __psci_foo.

This is a small cleanup so that the function ID array is only used for
v0.1 configurations.

Signed-off-by: default avatarDavid Brazdil <dbrazdil@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20201202184122.26046-5-dbrazdil@google.com
parent e6dd9d89

drivers/firmware/psci/psci.c

+60 −34
Original line number Diff line number Diff line
@@ -168,46 +168,80 @@ int psci_set_osi_mode(bool enable) 
	return psci_to_linux_errno(err);

}



static int psci_cpu_suspend(u32 state, unsigned long entry_point)

static int __psci_cpu_suspend(u32 fn, u32 state, unsigned long entry_point)

{

	int err;

	u32 fn;



	fn = psci_function_id[PSCI_FN_CPU_SUSPEND];

	err = invoke_psci_fn(fn, state, entry_point, 0);

	return psci_to_linux_errno(err);

}



static int psci_cpu_off(u32 state)

static int psci_0_1_cpu_suspend(u32 state, unsigned long entry_point)

{

	return __psci_cpu_suspend(psci_function_id[PSCI_FN_CPU_SUSPEND],

				  state, entry_point);

}



static int psci_0_2_cpu_suspend(u32 state, unsigned long entry_point)

{

	return __psci_cpu_suspend(PSCI_FN_NATIVE(0_2, CPU_SUSPEND),

				  state, entry_point);

}



static int __psci_cpu_off(u32 fn, u32 state)

{

	int err;

	u32 fn;



	fn = psci_function_id[PSCI_FN_CPU_OFF];

	err = invoke_psci_fn(fn, state, 0, 0);

	return psci_to_linux_errno(err);

}



static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point)

static int psci_0_1_cpu_off(u32 state)

{

	return __psci_cpu_off(psci_function_id[PSCI_FN_CPU_OFF], state);

}



static int psci_0_2_cpu_off(u32 state)

{

	return __psci_cpu_off(PSCI_0_2_FN_CPU_OFF, state);

}



static int __psci_cpu_on(u32 fn, unsigned long cpuid, unsigned long entry_point)

{

	int err;

	u32 fn;



	fn = psci_function_id[PSCI_FN_CPU_ON];

	err = invoke_psci_fn(fn, cpuid, entry_point, 0);

	return psci_to_linux_errno(err);

}



static int psci_migrate(unsigned long cpuid)

static int psci_0_1_cpu_on(unsigned long cpuid, unsigned long entry_point)

{

	return __psci_cpu_on(psci_function_id[PSCI_FN_CPU_ON], cpuid, entry_point);

}



static int psci_0_2_cpu_on(unsigned long cpuid, unsigned long entry_point)

{

	return __psci_cpu_on(PSCI_FN_NATIVE(0_2, CPU_ON), cpuid, entry_point);

}



static int __psci_migrate(u32 fn, unsigned long cpuid)

{

	int err;

	u32 fn;



	fn = psci_function_id[PSCI_FN_MIGRATE];

	err = invoke_psci_fn(fn, cpuid, 0, 0);

	return psci_to_linux_errno(err);

}



static int psci_0_1_migrate(unsigned long cpuid)

{

	return __psci_migrate(psci_function_id[PSCI_FN_MIGRATE], cpuid);

}



static int psci_0_2_migrate(unsigned long cpuid)

{

	return __psci_migrate(PSCI_FN_NATIVE(0_2, MIGRATE), cpuid);

}



static int psci_affinity_info(unsigned long target_affinity,

		unsigned long lowest_affinity_level)

{
@@ -352,7 +386,7 @@ static void __init psci_init_system_suspend(void) 


static void __init psci_init_cpu_suspend(void)

{

	int feature = psci_features(psci_function_id[PSCI_FN_CPU_SUSPEND]);

	int feature = psci_features(PSCI_FN_NATIVE(0_2, CPU_SUSPEND));



	if (feature != PSCI_RET_NOT_SUPPORTED)

		psci_cpu_suspend_feature = feature;
@@ -426,24 +460,16 @@ static void __init psci_init_smccc(void) 
static void __init psci_0_2_set_functions(void)

{

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

	psci_ops.get_version = psci_0_2_get_version;



	psci_function_id[PSCI_FN_CPU_SUSPEND] =

					PSCI_FN_NATIVE(0_2, 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_FN_NATIVE(0_2, CPU_ON);

	psci_ops.cpu_on = psci_cpu_on;



	psci_function_id[PSCI_FN_MIGRATE] = PSCI_FN_NATIVE(0_2, MIGRATE);

	psci_ops.migrate = psci_migrate;



	psci_ops.affinity_info = psci_affinity_info;



	psci_ops.migrate_info_type = psci_migrate_info_type;

	psci_ops = (struct psci_operations){

		.get_version = psci_0_2_get_version,

		.cpu_suspend = psci_0_2_cpu_suspend,

		.cpu_off = psci_0_2_cpu_off,

		.cpu_on = psci_0_2_cpu_on,

		.migrate = psci_0_2_migrate,

		.affinity_info = psci_affinity_info,

		.migrate_info_type = psci_migrate_info_type,

	};



	arm_pm_restart = psci_sys_reset;
@@ -523,22 +549,22 @@ static int __init psci_0_1_init(struct device_node *np) 


	if (!of_property_read_u32(np, "cpu_suspend", &id)) {

		psci_function_id[PSCI_FN_CPU_SUSPEND] = id;

		psci_ops.cpu_suspend = psci_cpu_suspend;

		psci_ops.cpu_suspend = psci_0_1_cpu_suspend;

	}



	if (!of_property_read_u32(np, "cpu_off", &id)) {

		psci_function_id[PSCI_FN_CPU_OFF] = id;

		psci_ops.cpu_off = psci_cpu_off;

		psci_ops.cpu_off = psci_0_1_cpu_off;

	}



	if (!of_property_read_u32(np, "cpu_on", &id)) {

		psci_function_id[PSCI_FN_CPU_ON] = id;

		psci_ops.cpu_on = psci_cpu_on;

		psci_ops.cpu_on = psci_0_1_cpu_on;

	}



	if (!of_property_read_u32(np, "migrate", &id)) {

		psci_function_id[PSCI_FN_MIGRATE] = id;

		psci_ops.migrate = psci_migrate;

		psci_ops.migrate = psci_0_1_migrate;

	}



	return 0;