Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

firmware: smccc: Add function to fetch SMCCC version

For backward compatibility reasons, PSCI maintains SMCCC version as
SMCCC didn't provide ARM_SMCCC_VERSION_FUNC_ID until v1.1.

PSCI initialises both the SMCCC version and conduit. Similar to the
conduit, let us provide accessors to fetch the SMCCC version also so
that other SMCCC v1.1+ features can use it.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Tested-by: Etienne Carriere <etienne.carriere@st.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Etienne Carriere <etienne.carriere@st.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200518091222.27467-7-sudeep.holla@arm.com
Signed-off-by: Will Deacon <will@kernel.org>

authored by

Sudeep Holla and committed by
Will Deacon
a4fb1746 f2ae9706

+16
+5
drivers/firmware/smccc/smccc.c
··· 24 24 25 25 return smccc_conduit; 26 26 } 27 + 28 + u32 arm_smccc_get_version(void) 29 + { 30 + return smccc_version; 31 + }
+11
include/linux/arm-smccc.h
··· 101 101 enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void); 102 102 103 103 /** 104 + * arm_smccc_get_version() 105 + * 106 + * Returns the version to be used for SMCCCv1.1 or later. 107 + * 108 + * When SMCCCv1.1 or above is not present, returns SMCCCv1.0, but this 109 + * does not imply the presence of firmware or a valid conduit. Caller 110 + * handling SMCCCv1.0 must determine the conduit by other means. 111 + */ 112 + u32 arm_smccc_get_version(void); 113 + 114 + /** 104 115 * struct arm_smccc_res - Result from SMC/HVC call 105 116 * @a0-a3 result values from registers 0 to 3 106 117 */