Unverified Commit e73153ba authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-ffa-5.14' of... 

Merge tag 'arm-ffa-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/drivers

Arm Firmware Framework for ARMv8-A(FFA) interface driver

The Arm FFA specification describes a software architecture to
leverages the virtualization extension to isolate software images
provided by an ecosystem of vendors from each other and describes
interfaces that standardize communication between the various software
images including communication between images in the Secure world and
Normal world. Any Hypervisor could use the FFA interfaces to enable
communication between VMs it manages.

The Hypervisor a.k.a Partition managers in FFA terminology can assign
system resources(Memory regions, Devices, CPU cycles) to the partitions
and manage isolation amongst them.

This is the initial and minimal support for the FFA interface to enable
communication between secure partitions and the normal world OS.

* tag 'arm-ffa-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_ffa: Add support for MEM_* interfaces
  firmware: arm_ffa: Setup in-kernel users of FFA partitions
  firmware: arm_ffa: Add support for SMCCC as transport to FFA driver
  firmware: arm_ffa: Add initial Arm FFA driver support
  firmware: arm_ffa: Add initial FFA bus support for device enumeration
  arm64: smccc: Add support for SMCCCv1.2 extended input/output registers

Link: https://lore.kernel.org/r/20210601095838.GA838783@bogus


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5dad6db1 cc2195fe

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7077,6 +7077,13 @@ F: include/linux/firewire.h 
F:	include/uapi/linux/firewire*.h

F:	tools/firewire/









FIRMWARE FRAMEWORK FOR ARMV8-A









M:	Sudeep Holla <sudeep.holla@arm.com>









L:	linux-arm-kernel@lists.infradead.org









S:	Maintained









F:	drivers/firmware/arm_ffa/









F:	include/linux/arm_ffa.h

















FIRMWARE LOADER (request_firmware)









M:	Luis Chamberlain <mcgrof@kernel.org>









L:	linux-kernel@vger.kernel.org
































arch/arm64/kernel/asm-offsets.c



+9
−0






























Original line number
Diff line number
Diff line







@@ -138,6 +138,15 @@ int main(void)







  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));









  DEFINE(ARM_SMCCC_1_2_REGS_X0_OFFS,	offsetof(struct arm_smccc_1_2_regs, a0));









  DEFINE(ARM_SMCCC_1_2_REGS_X2_OFFS,	offsetof(struct arm_smccc_1_2_regs, a2));









  DEFINE(ARM_SMCCC_1_2_REGS_X4_OFFS,	offsetof(struct arm_smccc_1_2_regs, a4));









  DEFINE(ARM_SMCCC_1_2_REGS_X6_OFFS,	offsetof(struct arm_smccc_1_2_regs, a6));









  DEFINE(ARM_SMCCC_1_2_REGS_X8_OFFS,	offsetof(struct arm_smccc_1_2_regs, a8));









  DEFINE(ARM_SMCCC_1_2_REGS_X10_OFFS,	offsetof(struct arm_smccc_1_2_regs, a10));









  DEFINE(ARM_SMCCC_1_2_REGS_X12_OFFS,	offsetof(struct arm_smccc_1_2_regs, a12));









  DEFINE(ARM_SMCCC_1_2_REGS_X14_OFFS,	offsetof(struct arm_smccc_1_2_regs, a14));









  DEFINE(ARM_SMCCC_1_2_REGS_X16_OFFS,	offsetof(struct arm_smccc_1_2_regs, a16));









  BLANK();









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









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
































arch/arm64/kernel/smccc-call.S



+57
−0






























Original line number
Diff line number
Diff line







@@ -43,3 +43,60 @@ SYM_FUNC_START(__arm_smccc_hvc)







	SMCCC	hvc









SYM_FUNC_END(__arm_smccc_hvc)









EXPORT_SYMBOL(__arm_smccc_hvc)



















	.macro SMCCC_1_2 instr









	/* Save `res` and free a GPR that won't be clobbered */









	stp     x1, x19, [sp, #-16]!



















	/* Ensure `args` won't be clobbered while loading regs in next step */









	mov	x19, x0



















	/* Load the registers x0 - x17 from the struct arm_smccc_1_2_regs */









	ldp	x0, x1, [x19, #ARM_SMCCC_1_2_REGS_X0_OFFS]









	ldp	x2, x3, [x19, #ARM_SMCCC_1_2_REGS_X2_OFFS]









	ldp	x4, x5, [x19, #ARM_SMCCC_1_2_REGS_X4_OFFS]









	ldp	x6, x7, [x19, #ARM_SMCCC_1_2_REGS_X6_OFFS]









	ldp	x8, x9, [x19, #ARM_SMCCC_1_2_REGS_X8_OFFS]









	ldp	x10, x11, [x19, #ARM_SMCCC_1_2_REGS_X10_OFFS]









	ldp	x12, x13, [x19, #ARM_SMCCC_1_2_REGS_X12_OFFS]









	ldp	x14, x15, [x19, #ARM_SMCCC_1_2_REGS_X14_OFFS]









	ldp	x16, x17, [x19, #ARM_SMCCC_1_2_REGS_X16_OFFS]



















	\instr #0



















	/* Load the `res` from the stack */









	ldr	x19, [sp]



















	/* Store the registers x0 - x17 into the result structure */









	stp	x0, x1, [x19, #ARM_SMCCC_1_2_REGS_X0_OFFS]









	stp	x2, x3, [x19, #ARM_SMCCC_1_2_REGS_X2_OFFS]









	stp	x4, x5, [x19, #ARM_SMCCC_1_2_REGS_X4_OFFS]









	stp	x6, x7, [x19, #ARM_SMCCC_1_2_REGS_X6_OFFS]









	stp	x8, x9, [x19, #ARM_SMCCC_1_2_REGS_X8_OFFS]









	stp	x10, x11, [x19, #ARM_SMCCC_1_2_REGS_X10_OFFS]









	stp	x12, x13, [x19, #ARM_SMCCC_1_2_REGS_X12_OFFS]









	stp	x14, x15, [x19, #ARM_SMCCC_1_2_REGS_X14_OFFS]









	stp	x16, x17, [x19, #ARM_SMCCC_1_2_REGS_X16_OFFS]



















	/* Restore original x19 */









	ldp     xzr, x19, [sp], #16









	ret









.endm



















/*









 * void arm_smccc_1_2_hvc(const struct arm_smccc_1_2_regs *args,









 *			  struct arm_smccc_1_2_regs *res);









 */









SYM_FUNC_START(arm_smccc_1_2_hvc)









	SMCCC_1_2 hvc









SYM_FUNC_END(arm_smccc_1_2_hvc)









EXPORT_SYMBOL(arm_smccc_1_2_hvc)



















/*









 * void arm_smccc_1_2_smc(const struct arm_smccc_1_2_regs *args,









 *			  struct arm_smccc_1_2_regs *res);









 */









SYM_FUNC_START(arm_smccc_1_2_smc)









	SMCCC_1_2 smc









SYM_FUNC_END(arm_smccc_1_2_smc)









EXPORT_SYMBOL(arm_smccc_1_2_smc)
























drivers/firmware/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -296,6 +296,7 @@ config TURRIS_MOX_RWTM







	  other manufacturing data and also utilize the Entropy Bit Generator









	  for hardware random number generation.



















source "drivers/firmware/arm_ffa/Kconfig"









source "drivers/firmware/broadcom/Kconfig"









source "drivers/firmware/google/Kconfig"









source "drivers/firmware/efi/Kconfig"
































drivers/firmware/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -22,6 +22,7 @@ obj-$(CONFIG_TI_SCI_PROTOCOL)	+= ti_sci.o







obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o









obj-$(CONFIG_TURRIS_MOX_RWTM)	+= turris-mox-rwtm.o



















obj-y				+= arm_ffa/









obj-y				+= arm_scmi/









obj-y				+= broadcom/









obj-y				+= meson/