From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 9 May 2025 01:12:06 +0000 (-0700)
Subject: Merge branch 'for-6.16/tsm' into tsm-next
X-Git-Tag: v6.16-rc1~119^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0372b3831785e15de605cd13d2ed78a79a9b435;p=thirdparty%2Fkernel%2Flinux.git

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

Pick up the drivers/virt/coco/guest/ split in preparation for TSM host
drivers.
---

a0372b3831785e15de605cd13d2ed78a79a9b435
diff --cc drivers/virt/coco/guest/report.c
index 8a638bc34d4a9,bcb515b50c689..d3d18fc22bc2e
--- a/drivers/virt/coco/guest/report.c
+++ b/drivers/virt/coco/guest/report.c
@@@ -13,9 -13,8 +13,9 @@@
  #include <linux/configfs.h>
  
  static struct tsm_provider {
- 	const struct tsm_ops *ops;
+ 	const struct tsm_report_ops *ops;
  	void *data;
 +	atomic_t count;
  } provider;
  static DECLARE_RWSEM(tsm_rwsem);
  
@@@ -103,9 -98,10 +103,9 @@@ static ssize_t tsm_report_privlevel_sto
  	 * SEV-SNP GHCB) and a minimum of a TSM selected floor value no less
  	 * than 0.
  	 */
- 	if (provider.ops->privlevel_floor > val || val > TSM_PRIVLEVEL_MAX)
+ 	if (provider.ops->privlevel_floor > val || val > TSM_REPORT_PRIVLEVEL_MAX)
  		return -EINVAL;
  
 -	guard(rwsem_write)(&tsm_rwsem);
  	rc = try_advance_write_generation(report);
  	if (rc)
  		return rc;