Skip to content

Commit 0441bfe

Browse files
sudeep-hollawilldeacon
authored andcommitted
firmware: smccc: Add the definition for SMCCCv1.2 version/error codes
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 <[email protected]> Tested-by: Etienne Carriere <[email protected]> Reviewed-by: Steven Price <[email protected]> Reviewed-by: Etienne Carriere <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 15c704a commit 0441bfe

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

include/linux/arm-smccc.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* specified in
1313
* https://developer.arm.com/docs/den0028/latest
1414
*
15-
* This code is up-to-date with version DEN 0028 B
15+
* This code is up-to-date with version DEN 0028 C
1616
*/
1717

1818
#define ARM_SMCCC_STD_CALL _AC(0,U)
@@ -58,6 +58,7 @@
5858

5959
#define ARM_SMCCC_VERSION_1_0 0x10000
6060
#define ARM_SMCCC_VERSION_1_1 0x10001
61+
#define ARM_SMCCC_VERSION_1_2 0x10002
6162

6263
#define ARM_SMCCC_VERSION_FUNC_ID \
6364
ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
@@ -316,10 +317,14 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
316317
*/
317318
#define arm_smccc_1_1_hvc(...) __arm_smccc_1_1(SMCCC_HVC_INST, __VA_ARGS__)
318319

319-
/* Return codes defined in ARM DEN 0070A */
320+
/*
321+
* Return codes defined in ARM DEN 0070A
322+
* ARM DEN 0070A is now merged/consolidated into ARM DEN 0028 C
323+
*/
320324
#define SMCCC_RET_SUCCESS 0
321325
#define SMCCC_RET_NOT_SUPPORTED -1
322326
#define SMCCC_RET_NOT_REQUIRED -2
327+
#define SMCCC_RET_INVALID_PARAMETER -3
323328

324329
/*
325330
* Like arm_smccc_1_1* but always returns SMCCC_RET_NOT_SUPPORTED.

0 commit comments

Comments
 (0)