Commit 7af92885 authored by Andrew Scull's avatar Andrew Scull Committed by Catalin Marinas
Browse files

smccc: Make constants available to assembly 



Move constants out of the C-only section of the header next to the other
constants that are available to assembly.

Signed-off-by: default avatarAndrew Scull <ascull@google.com>
Reviewed-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200618145511.69203-1-ascull@google.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent a1634a54

include/linux/arm-smccc.h

+22 −22
Original line number Diff line number Diff line
@@ -81,6 +81,28 @@ 
			   ARM_SMCCC_SMC_32,				\

			   0, 0x7fff)



/* Paravirtualised time calls (defined by ARM DEN0057A) */

#define ARM_SMCCC_HV_PV_TIME_FEATURES				\

	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,			\

			   ARM_SMCCC_SMC_64,			\

			   ARM_SMCCC_OWNER_STANDARD_HYP,	\

			   0x20)



#define ARM_SMCCC_HV_PV_TIME_ST					\

	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,			\

			   ARM_SMCCC_SMC_64,			\

			   ARM_SMCCC_OWNER_STANDARD_HYP,	\

			   0x21)



/*

 * Return codes defined in ARM DEN 0070A

 * ARM DEN 0070A is now merged/consolidated into ARM DEN 0028 C

 */

#define SMCCC_RET_SUCCESS			0

#define SMCCC_RET_NOT_SUPPORTED			-1

#define SMCCC_RET_NOT_REQUIRED			-2

#define SMCCC_RET_INVALID_PARAMETER		-3



#ifndef __ASSEMBLY__



#include <linux/linkage.h>
@@ -331,15 +353,6 @@ 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

 * ARM DEN 0070A is now merged/consolidated into ARM DEN 0028 C

 */

#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.

 * Used when the SMCCC conduit is not defined. The empty asm statement
@@ -385,18 +398,5 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, 
		method;							\

	})



/* Paravirtualised time calls (defined by ARM DEN0057A) */

#define ARM_SMCCC_HV_PV_TIME_FEATURES				\

	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,			\

			   ARM_SMCCC_SMC_64,			\

			   ARM_SMCCC_OWNER_STANDARD_HYP,	\

			   0x20)



#define ARM_SMCCC_HV_PV_TIME_ST					\

	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,			\

			   ARM_SMCCC_SMC_64,			\

			   ARM_SMCCC_OWNER_STANDARD_HYP,	\

			   0x21)



#endif /*__ASSEMBLY__*/

#endif /*__LINUX_ARM_SMCCC_H*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE