| Message ID | 20200430114814.14116-3-sudeep.holla@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm/arm64: smccc: Add ARCH_SOC_ID support | expand |
On 30/04/2020 12:48, Sudeep Holla wrote: > Add the definition for SMCCC v1.2 version and new error code added. > While at it, also add a note that ARM DEN 0070A is deprecated and is > now merged into the main SMCCC specification(ARM DEN 0028C). > > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Reviewed-by: Steven Price <steven.price@arm.com> > --- > include/linux/arm-smccc.h | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h > index 6c1d1eda3be4..9d9a2e42e919 100644 > --- a/include/linux/arm-smccc.h > +++ b/include/linux/arm-smccc.h > @@ -56,6 +56,7 @@ > > #define ARM_SMCCC_VERSION_1_0 0x10000 > #define ARM_SMCCC_VERSION_1_1 0x10001 > +#define ARM_SMCCC_VERSION_1_2 0x10002 > > #define ARM_SMCCC_VERSION_FUNC_ID \ > ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ > @@ -314,10 +315,14 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, > */ > #define arm_smccc_1_1_hvc(...) __arm_smccc_1_1(SMCCC_HVC_INST, __VA_ARGS__) > > -/* Return codes defined in ARM DEN 0070A */ > +/* > + * Return codes defined in ARM DEN 0070A > + * ARM DEN 0070A is now merged/consolidated into ARM DEN 0028C > + */ > #define SMCCC_RET_SUCCESS 0 > #define SMCCC_RET_NOT_SUPPORTED -1 > #define SMCCC_RET_NOT_REQUIRED -2 > +#define SMCCC_RET_INVALID_PARAMETER -3 > > /* > * Like arm_smccc_1_1* but always returns SMCCC_RET_NOT_SUPPORTED. >
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index 6c1d1eda3be4..9d9a2e42e919 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -56,6 +56,7 @@ #define ARM_SMCCC_VERSION_1_0 0x10000 #define ARM_SMCCC_VERSION_1_1 0x10001 +#define ARM_SMCCC_VERSION_1_2 0x10002 #define ARM_SMCCC_VERSION_FUNC_ID \ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ @@ -314,10 +315,14 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, */ #define arm_smccc_1_1_hvc(...) __arm_smccc_1_1(SMCCC_HVC_INST, __VA_ARGS__) -/* Return codes defined in ARM DEN 0070A */ +/* + * Return codes defined in ARM DEN 0070A + * ARM DEN 0070A is now merged/consolidated into ARM DEN 0028C + */ #define SMCCC_RET_SUCCESS 0 #define SMCCC_RET_NOT_SUPPORTED -1 #define SMCCC_RET_NOT_REQUIRED -2 +#define SMCCC_RET_INVALID_PARAMETER -3 /* * Like arm_smccc_1_1* but always returns SMCCC_RET_NOT_SUPPORTED.
Add the definition for SMCCC v1.2 version and new error code added. While at it, also add a note that ARM DEN 0070A is deprecated and is now merged into the main SMCCC specification(ARM DEN 0028C). Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- include/linux/arm-smccc.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)