On Wed, May 06, 2020 at 05:44:08PM +0100, Sudeep Holla wrote:
> Instead of maintaining 2 sets of enums/macros for tracking SMCCC version,
> let us drop smccc_version enum and use ARM_SMCCC_VERSION_1_x directly
> instead.
>
> This is in preparation to drop smccc_version here and move it separately
> under drivers/firmware/smccc.
>
> Reviewed-by: Steven Price <steven.pr...@arm.com>
> Signed-off-by: Sudeep Holla <sudeep.ho...@arm.com>
Acked-by: Mark Rutland <mark.rutl...@arm.com>
Thanks,
Mark.
> ---
> arch/arm64/kernel/paravirt.c | 2 +-
> drivers/firmware/psci/psci.c | 8 ++++----
> include/linux/psci.h | 7 +------
> 3 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm64/kernel/paravirt.c b/arch/arm64/kernel/paravirt.c
> index 1ef702b0be2d..295d66490584 100644
> --- a/arch/arm64/kernel/paravirt.c
> +++ b/arch/arm64/kernel/paravirt.c
> @@ -120,7 +120,7 @@ static bool has_pv_steal_clock(void)
> struct arm_smccc_res res;
>
> /* To detect the presence of PV time support we require SMCCC 1.1+ */
> - if (psci_ops.smccc_version < SMCCC_VERSION_1_1)
> + if (arm_smccc_1_1_get_conduit() == SMCCC_CONDUIT_NONE)
> return false;
>
> arm_smccc_1_1_invoke(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
> diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
> index 2937d44b5df4..6a56d7196697 100644
> --- a/drivers/firmware/psci/psci.c
> +++ b/drivers/firmware/psci/psci.c
> @@ -54,12 +54,12 @@ bool psci_tos_resident_on(int cpu)
>
> struct psci_operations psci_ops = {
> .conduit = SMCCC_CONDUIT_NONE,
> - .smccc_version = SMCCC_VERSION_1_0,
> + .smccc_version = ARM_SMCCC_VERSION_1_0,
> };
>
> enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void)
> {
> - if (psci_ops.smccc_version < SMCCC_VERSION_1_1)
> + if (psci_ops.smccc_version < ARM_SMCCC_VERSION_1_1)
> return SMCCC_CONDUIT_NONE;
>
> return psci_ops.conduit;
> @@ -411,8 +411,8 @@ static void __init psci_init_smccc(void)
> if (feature != PSCI_RET_NOT_SUPPORTED) {
> u32 ret;
> ret = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0);
> - if (ret == ARM_SMCCC_VERSION_1_1) {
> - psci_ops.smccc_version = SMCCC_VERSION_1_1;
> + if (ret >= ARM_SMCCC_VERSION_1_1) {
> + psci_ops.smccc_version = ret;
> ver = ret;
> }
> }
> diff --git a/include/linux/psci.h b/include/linux/psci.h
> index a67712b73b6c..29bd0671e5bb 100644
> --- a/include/linux/psci.h
> +++ b/include/linux/psci.h
> @@ -21,11 +21,6 @@ bool psci_power_state_is_valid(u32 state);
> int psci_set_osi_mode(void);
> bool psci_has_osi_support(void);
>
> -enum smccc_version {
> - SMCCC_VERSION_1_0,
> - SMCCC_VERSION_1_1,
> -};
> -
> struct psci_operations {
> u32 (*get_version)(void);
> int (*cpu_suspend)(u32 state, unsigned long entry_point);
> @@ -36,7 +31,7 @@ struct psci_operations {
> unsigned long lowest_affinity_level);
> int (*migrate_info_type)(void);
> enum arm_smccc_conduit conduit;
> - enum smccc_version smccc_version;
> + u32 smccc_version;
> };
>
> extern struct psci_operations psci_ops;
> --
> 2.17.1
>
