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

Merge measurement-register infrastructure for v6.16. Resolve conflicts
with the establishment of drivers/virt/coco/guest/ for cross-vendor
common TSM functionality.

diff --cc Documentation/driver-api/coco/measurement-registers.rst
index 0000000000000000000000000000000000000000,cef85945a9a74849dfec4fdc709bc72d4a595356..962a44efa2c0273ec353ab0dba2a871754ee0730
mode 000000,100644..100644
--- /dev/null
--- 2/Documentation/driver-api/coco/measurement-registers.rst
+++ b/Documentation/driver-api/coco/measurement-registers.rst
@@@ -1,0 -1,12 +1,12 @@@
 -.. kernel-doc:: drivers/virt/coco/tsm-mr.c
+ .. SPDX-License-Identifier: GPL-2.0
+ .. include:: <isonum.txt>
+ 
+ =====================
+ Measurement Registers
+ =====================
+ 
+ .. kernel-doc:: include/linux/tsm-mr.h
+    :internal:
+ 
++.. kernel-doc:: drivers/virt/coco/guest/tsm-mr.c
+    :export:

diff --cc MAINTAINERS
index 0a1ca9233ccf86be212af062a6d6e7ea90978559,912e16ace0b4affec1e84b5c78060db7e58d9243..f1a2f6699a81dabcb2f55b8264a548e3381097db
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -24555,13 -24643,15 +24643,16 @@@ M:        David Lechner <dlechner@baylibre.com
  S:    Maintained
  F:    Documentation/devicetree/bindings/trigger-source/pwm-trigger.yaml
  
--TRUSTED SECURITY MODULE (TSM) ATTESTATION REPORTS
++TRUSTED SECURITY MODULE (TSM) INFRASTRUCTURE
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-coco@lists.linux.dev
  S:    Maintained
 -F:    Documentation/ABI/testing/configfs-tsm
 +F:    Documentation/ABI/testing/configfs-tsm-report
+ F:    Documentation/driver-api/coco/
 +F:    drivers/virt/coco/guest/
- F:    include/linux/tsm.h
+ F:    drivers/virt/coco/tsm*.c
+ F:    include/linux/tsm*.h
+ F:    samples/tsm/
  
  TRUSTED SERVICES TEE DRIVER
  M:    Balint Dobszay <balint.dobszay@arm.com>

diff --cc drivers/virt/coco/Makefile
index 885c9ef4e9fc97b15b336426db447d812e96dc7e,eb6ec5c1d2e17427ebf83891c57cc723b8c8d660..f918bbb61737598561366e128e3e6247e399d6d4
--- 1/drivers/virt/coco/Makefile
--- 2/drivers/virt/coco/Makefile
+++ b/drivers/virt/coco/Makefile
@@@ -7,4 -9,3 +7,4 @@@ obj-$(CONFIG_ARM_PKVM_GUEST)     += pkvm-gu
  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/
++obj-$(CONFIG_TSM_GUEST)               += guest/

diff --cc drivers/virt/coco/guest/Kconfig
index ed9bafbdd8548726f608d9711c1c24759a3d9f3c,0000000000000000000000000000000000000000..3d5e1d05bf34382153c599522f020b512c49a60a
mode 100644,000000..100644
--- 1/drivers/virt/coco/guest/Kconfig
--- /dev/null
+++ b/drivers/virt/coco/guest/Kconfig
@@@ -1,7 -1,0 +1,17 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
 +#
 +# Confidential computing shared guest collateral
 +#
++config TSM_GUEST
++      bool
++
 +config TSM_REPORTS
++      select TSM_GUEST
 +      select CONFIGFS_FS
 +      tristate
++
++config TSM_MEASUREMENTS
++      select TSM_GUEST
++      select CRYPTO_HASH_INFO
++      select CRYPTO
++      bool

diff --cc drivers/virt/coco/guest/Makefile
index b3b217af77cf5dc9a2c9f8a1230b752835737c82,0000000000000000000000000000000000000000..9ec4860bd213ae3cc7b88ecf95e1f7b8d94ef56c
mode 100644,000000..100644
--- 1/drivers/virt/coco/guest/Makefile
--- /dev/null
+++ b/drivers/virt/coco/guest/Makefile
@@@ -1,3 -1,0 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0
 +obj-$(CONFIG_TSM_REPORTS)     += tsm_report.o
 +tsm_report-y := report.o
++obj-$(CONFIG_TSM_MEASUREMENTS)        += tsm-mr.o

diff --cc drivers/virt/coco/guest/tsm-mr.c
index 0000000000000000000000000000000000000000,1f0c43a516fb89af6f2bab41f2226f0e55d1276d..1f0c43a516fb89af6f2bab41f2226f0e55d1276d
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/virt/coco/tsm-mr.c
+++ b/drivers/virt/coco/guest/tsm-mr.c

diff --cc drivers/virt/coco/tdx-guest/tdx-guest.c
index bd043838ab2e1b173d651b0d13dda51aab75b22f,60466c439a4bc63cb59bc80d68840727d12462fd..4e239ec960c9b5edef91bb324ad64d0473357ad6
--- 1/drivers/virt/coco/tdx-guest/tdx-guest.c
--- 2/drivers/virt/coco/tdx-guest/tdx-guest.c
+++ b/drivers/virt/coco/tdx-guest/tdx-guest.c
@@@ -157,11 -262,11 +262,11 @@@ static int wait_for_quote_completion(st
        return (i == timeout) ? -ETIMEDOUT : 0;
  }
  
- static int tdx_report_new(struct tsm_report *report, void *data)
+ static int tdx_report_new_locked(struct tsm_report *report, void *data)
  {
-       u8 *buf, *reportdata = NULL, *tdreport = NULL;
+       u8 *buf;
        struct tdx_quote_buf *quote_buf = quote_data;
 -      struct tsm_desc *desc = &report->desc;
 +      struct tsm_report_desc *desc = &report->desc;
        int ret;
        u64 err;
  
@@@ -339,9 -429,10 +429,10 @@@ module_init(tdx_guest_init)
  
  static void __exit tdx_guest_exit(void)
  {
 -      tsm_unregister(&tdx_tsm_ops);
 +      tsm_report_unregister(&tdx_tsm_ops);
        free_quote_buf(quote_data);
        misc_deregister(&tdx_misc_dev);
+       tdx_mr_deinit(tdx_attr_groups[0]);
  }
  module_exit(tdx_guest_exit);