Skip to content

Commit 7515f45

Browse files
committed
coco/guest: Move shared guest CC infrastructure to drivers/virt/coco/guest/
In preparation for creating a new drivers/virt/coco/host/ directory to house shared host driver infrastructure for confidential computing, move configfs-tsm to a guest/ sub-directory. The tsm.ko module is renamed to tsm_reports.ko. The old tsm.ko module was only ever demand loaded by kernel internal dependencies, so it should not affect existing userspace module install scripts. The new drivers/virt/coco/guest/ is also a preparatory landing spot for new / optional TSM Report mechanics like a TCB stability enumeration / watchdog mechanism. To be added later. Cc: Wu Hao <hao.wu@intel.com> Cc: Yilun Xu <yilun.xu@intel.com> Cc: Samuel Ortiz <sameo@rivosinc.com> Cc: Tom Lendacky <thomas.lendacky@amd.com> Reviewed-by: Alexey Kardashevskiy <aik@amd.com> Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> Link: https://patch.msgid.link/174107246641.1288555.208426916259466774.stgit@dwillia2-xfh.jf.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 71ded61 commit 7515f45

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24560,7 +24560,7 @@ M: Dan Williams <dan.j.williams@intel.com>
2456024560
L: linux-coco@lists.linux.dev
2456124561
S: Maintained
2456224562
F: Documentation/ABI/testing/configfs-tsm-report
24563-
F: drivers/virt/coco/tsm.c
24563+
F: drivers/virt/coco/guest/
2456424564
F: include/linux/tsm.h
2456524565

2456624566
TRUSTED SERVICES TEE DRIVER

drivers/virt/coco/Kconfig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
# Confidential computing related collateral
44
#
55

6-
config TSM_REPORTS
7-
select CONFIGFS_FS
8-
tristate
9-
106
source "drivers/virt/coco/efi_secret/Kconfig"
117

128
source "drivers/virt/coco/pkvm-guest/Kconfig"
@@ -16,3 +12,5 @@ source "drivers/virt/coco/sev-guest/Kconfig"
1612
source "drivers/virt/coco/tdx-guest/Kconfig"
1713

1814
source "drivers/virt/coco/arm-cca-guest/Kconfig"
15+
16+
source "drivers/virt/coco/guest/Kconfig"

drivers/virt/coco/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#
33
# Confidential computing related collateral
44
#
5-
obj-$(CONFIG_TSM_REPORTS) += tsm.o
65
obj-$(CONFIG_EFI_SECRET) += efi_secret/
76
obj-$(CONFIG_ARM_PKVM_GUEST) += pkvm-guest/
87
obj-$(CONFIG_SEV_GUEST) += sev-guest/
98
obj-$(CONFIG_INTEL_TDX_GUEST) += tdx-guest/
109
obj-$(CONFIG_ARM_CCA_GUEST) += arm-cca-guest/
10+
obj-$(CONFIG_TSM_REPORTS) += guest/

drivers/virt/coco/guest/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
#
3+
# Confidential computing shared guest collateral
4+
#
5+
config TSM_REPORTS
6+
select CONFIGFS_FS
7+
tristate

drivers/virt/coco/guest/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
obj-$(CONFIG_TSM_REPORTS) += tsm_report.o
3+
tsm_report-y := report.o
File renamed without changes.

0 commit comments

Comments
 (0)