Commit a0372b38 authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'for-6.16/tsm' into tsm-next 

Pick up the drivers/virt/coco/guest/ split in preparation for TSM host
drivers.
parents fba4ceaa 7515f45c

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -24559,8 +24559,8 @@ TRUSTED SECURITY MODULE (TSM) ATTESTATION REPORTS 
M:	Dan Williams <dan.j.williams@intel.com>

L:	linux-coco@lists.linux.dev

S:	Maintained

F:	Documentation/ABI/testing/configfs-tsm

F:	drivers/virt/coco/tsm.c

F:	Documentation/ABI/testing/configfs-tsm-report

F:	drivers/virt/coco/guest/

F:	include/linux/tsm.h









TRUSTED SERVICES TEE DRIVER

























drivers/virt/coco/Kconfig



+2
−4






























Original line number
Diff line number
Diff line







@@ -3,10 +3,6 @@







# Confidential computing related collateral









#



















config TSM_REPORTS









	select CONFIGFS_FS









	tristate



















source "drivers/virt/coco/efi_secret/Kconfig"



















source "drivers/virt/coco/pkvm-guest/Kconfig"








@@ -16,3 +12,5 @@ source "drivers/virt/coco/sev-guest/Kconfig"







source "drivers/virt/coco/tdx-guest/Kconfig"



















source "drivers/virt/coco/arm-cca-guest/Kconfig"



















source "drivers/virt/coco/guest/Kconfig"
























drivers/virt/coco/Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,9 +2,9 @@







#









# Confidential computing related collateral









#









obj-$(CONFIG_TSM_REPORTS)	+= tsm.o









obj-$(CONFIG_EFI_SECRET)	+= efi_secret/









obj-$(CONFIG_ARM_PKVM_GUEST)	+= pkvm-guest/









obj-$(CONFIG_SEV_GUEST)		+= sev-guest/









obj-$(CONFIG_INTEL_TDX_GUEST)	+= tdx-guest/









obj-$(CONFIG_ARM_CCA_GUEST)	+= arm-cca-guest/









obj-$(CONFIG_TSM_REPORTS)	+= guest/
























drivers/virt/coco/arm-cca-guest/arm-cca-guest.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -96,7 +96,7 @@ static int arm_cca_report_new(struct tsm_report *report, void *data)







	struct arm_cca_token_info info;









	void *buf;









	u8 *token __free(kvfree) = NULL;









	struct tsm_desc *desc = &report->desc;









	struct tsm_report_desc *desc = &report->desc;



















	if (desc->inblob_len < 32 || desc->inblob_len > 64)









		return -EINVAL;








@@ -181,7 +181,7 @@ static int arm_cca_report_new(struct tsm_report *report, void *data)







	return ret;









}



















static const struct tsm_ops arm_cca_tsm_ops = {









static const struct tsm_report_ops arm_cca_tsm_ops = {









	.name = KBUILD_MODNAME,









	.report_new = arm_cca_report_new,









};








@@ -202,7 +202,7 @@ static int __init arm_cca_guest_init(void)







	if (!is_realm_world())









		return -ENODEV;



















	ret = tsm_register(&arm_cca_tsm_ops, NULL);









	ret = tsm_report_register(&arm_cca_tsm_ops, NULL);









	if (ret < 0)









		pr_err("Error %d registering with TSM\n", ret);


















@@ -216,7 +216,7 @@ module_init(arm_cca_guest_init);







 */









static void __exit arm_cca_guest_exit(void)









{









	tsm_unregister(&arm_cca_tsm_ops);









	tsm_report_unregister(&arm_cca_tsm_ops);









}









module_exit(arm_cca_guest_exit);