drm/i915/gvt: remove unresolved vfio pin/unpin pages interface dependency

Instead of partially depending on vfio pin/unpin pages interface if
mdev is available, which would result in failure if vfio is not
on. But replace with a wrapper which need to be fixed till mdev
support got fully merged.

Cc: Jike Song <jike.song@intel.com>
Cc: Xiaoguang Chen <xiaoguang.chen@intel.com>
Reviewed-by: Xiaoguang Chen <Xiaoguang.chen@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 5bf4d73d57d9de434c344a4407af1cdf5cba8416..dc036503315741f266223486922ca4ed67afc6de 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -43,20 +43,16 @@
 #include "i915_drv.h"
 #include "gvt.h"
 
-#if IS_ENABLED(CONFIG_VFIO_MDEV)
-#include <linux/mdev.h>
-#else
-static inline long vfio_pin_pages(struct device *dev, unsigned long *user_pfn,
+static inline long kvmgt_pin_pages(struct device *dev, unsigned long *user_pfn,
                        long npage, int prot, unsigned long *phys_pfn)
 {
        return 0;
 }
-static inline long vfio_unpin_pages(struct device *dev, unsigned long *pfn,
+static inline long kvmgt_unpin_pages(struct device *dev, unsigned long *pfn,
                        long npage)
 {
        return 0;
 }
-#endif
 
 static const struct intel_gvt_ops *intel_gvt_ops;
 
@@ -183,7 +179,7 @@ static void gvt_cache_remove(struct intel_vgpu *vgpu, gfn_t gfn)
        }
 
        pfn = this->pfn;
-       WARN_ON((vfio_unpin_pages(dev, &pfn, 1) != 1));
+       WARN_ON((kvmgt_unpin_pages(dev, &pfn, 1) != 1));
        __gvt_cache_remove_entry(vgpu, this);
        mutex_unlock(&vgpu->vdev.cache_lock);
 }
@@ -206,7 +202,7 @@ static void gvt_cache_destroy(struct intel_vgpu *vgpu)
                dma = rb_entry(node, struct gvt_dma, node);
                pfn = dma->pfn;
 
-               vfio_unpin_pages(dev, &pfn, 1);
+               kvmgt_unpin_pages(dev, &pfn, 1);
                __gvt_cache_remove_entry(vgpu, dma);
        }
        mutex_unlock(&vgpu->vdev.cache_lock);
@@ -512,8 +508,8 @@ static unsigned long kvmgt_gfn_to_pfn(unsigned long handle, unsigned long gfn)
        if (pfn != 0)
                return pfn;
 
-       rc = vfio_pin_pages(info->vgpu->vdev.mdev, &gfn, 1,
-                               IOMMU_READ | IOMMU_WRITE, &pfn);
+       rc = kvmgt_pin_pages(info->vgpu->vdev.mdev, &gfn, 1,
+                            IOMMU_READ | IOMMU_WRITE, &pfn);
        if (rc != 1) {
                gvt_err("vfio_pin_pages failed for gfn: 0x%lx\n", gfn);
                return 0;