]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'for-6.16/tsm' into tsm-next
authorDan Williams <dan.j.williams@intel.com>
Fri, 9 May 2025 01:12:06 +0000 (18:12 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 9 May 2025 01:12:06 +0000 (18:12 -0700)
Pick up the drivers/virt/coco/guest/ split in preparation for TSM host
drivers.

1  2 
drivers/virt/coco/guest/report.c

index 8a638bc34d4a9ee52642f762142893da41fc6c06,bcb515b50c689c27af9c79cfda1870947a276b38..d3d18fc22bc2e46c7d054a4ac66ce21be9222037
@@@ -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;