Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 680a0873 authored by Andy Gross's avatar Andy Gross Committed by Will Deacon
Browse files

arm: kernel: Add SMC structure parameter 



This patch adds a quirk parameter to the arm_smccc_(smc/hvc) calls.
The quirk structure allows for specialized SMC operations due to SoC
specific requirements.  The current arm_smccc_(smc/hvc) is renamed and
macros are used instead to specify the standard arm_smccc_(smc/hvc) or
the arm_smccc_(smc/hvc)_quirk function.

This patch and partial implementation was suggested by Will Deacon.

Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 757b435a

arch/arm/kernel/armksyms.c

+2 −2
Original line number Diff line number Diff line
@@ -178,6 +178,6 @@ EXPORT_SYMBOL(__pv_offset); 
#endif



#ifdef CONFIG_HAVE_ARM_SMCCC

EXPORT_SYMBOL(arm_smccc_smc);

EXPORT_SYMBOL(arm_smccc_hvc);

EXPORT_SYMBOL(__arm_smccc_smc);

EXPORT_SYMBOL(__arm_smccc_hvc);

#endif

arch/arm/kernel/smccc-call.S

+8 −6
Original line number Diff line number Diff line
@@ -46,17 +46,19 @@ UNWIND( .fnend) 
/*

 * void smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2,

 *		  unsigned long a3, unsigned long a4, unsigned long a5,

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res,

 *		  struct arm_smccc_quirk *quirk)

 */

ENTRY(arm_smccc_smc)

ENTRY(__arm_smccc_smc)

	SMCCC SMCCC_SMC

ENDPROC(arm_smccc_smc)

ENDPROC(__arm_smccc_smc)



/*

 * void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,

 *		  unsigned long a3, unsigned long a4, unsigned long a5,

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res,

 *		  struct arm_smccc_quirk *quirk)

 */

ENTRY(arm_smccc_hvc)

ENTRY(__arm_smccc_hvc)

	SMCCC SMCCC_HVC

ENDPROC(arm_smccc_hvc)
 
ENDPROC(__arm_smccc_hvc)

arch/arm64/kernel/arm64ksyms.c

+2 −2
Original line number Diff line number Diff line
@@ -73,5 +73,5 @@ NOKPROBE_SYMBOL(_mcount); 
#endif



	/* arm-smccc */

EXPORT_SYMBOL(arm_smccc_smc);

EXPORT_SYMBOL(arm_smccc_hvc);
 
EXPORT_SYMBOL(__arm_smccc_smc);

EXPORT_SYMBOL(__arm_smccc_hvc);

arch/arm64/kernel/asm-offsets.c

+5 −2
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ int main(void) 
#endif

  DEFINE(ARM_SMCCC_RES_X0_OFFS,		offsetof(struct arm_smccc_res, a0));

  DEFINE(ARM_SMCCC_RES_X2_OFFS,		offsetof(struct arm_smccc_res, a2));

  DEFINE(ARM_SMCCC_QUIRK_ID_OFFS,	offsetof(struct arm_smccc_quirk, id));

  DEFINE(ARM_SMCCC_QUIRK_STATE_OFFS,	offsetof(struct arm_smccc_quirk, state));



  BLANK();

  DEFINE(HIBERN_PBE_ORIG,	offsetof(struct pbe, orig_address));

  DEFINE(HIBERN_PBE_ADDR,	offsetof(struct pbe, address));

arch/arm64/kernel/smccc-call.S

+8 −6
Original line number Diff line number Diff line
@@ -27,17 +27,19 @@ 
/*

 * void arm_smccc_smc(unsigned long a0, unsigned long a1, unsigned long a2,

 *		  unsigned long a3, unsigned long a4, unsigned long a5,

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res,

 *		  struct arm_smccc_quirk *quirk)

 */

ENTRY(arm_smccc_smc)

ENTRY(__arm_smccc_smc)

	SMCCC	smc

ENDPROC(arm_smccc_smc)

ENDPROC(__arm_smccc_smc)



/*

 * void arm_smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,

 *		  unsigned long a3, unsigned long a4, unsigned long a5,

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res)

 *		  unsigned long a6, unsigned long a7, struct arm_smccc_res *res,

 *		  struct arm_smccc_quirk *quirk)

 */

ENTRY(arm_smccc_hvc)

ENTRY(__arm_smccc_hvc)

	SMCCC	hvc

ENDPROC(arm_smccc_hvc)
 
ENDPROC(__arm_smccc_hvc)