lkml.org 
[lkml]   [2021]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/29] drm/i915/gvt: remove the unused from_virt_to_mfn op
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    drivers/gpu/drm/i915/gvt/hypercall.h | 1 -
    drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ------
    drivers/gpu/drm/i915/gvt/mpt.h | 12 ------------
    3 files changed, 19 deletions(-)

    diff --git a/drivers/gpu/drm/i915/gvt/hypercall.h b/drivers/gpu/drm/i915/gvt/hypercall.h
    index f1a4926f6f1be..27890a5e2d828 100644
    --- a/drivers/gpu/drm/i915/gvt/hypercall.h
    +++ b/drivers/gpu/drm/i915/gvt/hypercall.h
    @@ -47,7 +47,6 @@ struct intel_gvt_mpt {
    int (*attach_vgpu)(void *vgpu, unsigned long *handle);
    void (*detach_vgpu)(void *vgpu);
    int (*inject_msi)(unsigned long handle, u32 addr, u16 data);
    - unsigned long (*from_virt_to_mfn)(void *p);
    int (*enable_page_track)(unsigned long handle, u64 gfn);
    int (*disable_page_track)(unsigned long handle, u64 gfn);
    int (*read_gpa)(unsigned long handle, unsigned long gpa, void *buf,
    diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
    index 8e06f3eecc440..61a107aeeb502 100644
    --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
    +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
    @@ -2174,11 +2174,6 @@ static int kvmgt_write_gpa(unsigned long handle, unsigned long gpa,
    return kvmgt_rw_gpa(handle, gpa, buf, len, true);
    }

    -static unsigned long kvmgt_virt_to_pfn(void *addr)
    -{
    - return PFN_DOWN(__pa(addr));
    -}
    -
    static bool kvmgt_is_valid_gfn(unsigned long handle, unsigned long gfn)
    {
    struct kvmgt_guest_info *info;
    @@ -2205,7 +2200,6 @@ static const struct intel_gvt_mpt kvmgt_mpt = {
    .attach_vgpu = kvmgt_attach_vgpu,
    .detach_vgpu = kvmgt_detach_vgpu,
    .inject_msi = kvmgt_inject_msi,
    - .from_virt_to_mfn = kvmgt_virt_to_pfn,
    .enable_page_track = kvmgt_page_track_add,
    .disable_page_track = kvmgt_page_track_remove,
    .read_gpa = kvmgt_read_gpa,
    diff --git a/drivers/gpu/drm/i915/gvt/mpt.h b/drivers/gpu/drm/i915/gvt/mpt.h
    index bb0e9e71d13e2..6d062cf71de92 100644
    --- a/drivers/gpu/drm/i915/gvt/mpt.h
    +++ b/drivers/gpu/drm/i915/gvt/mpt.h
    @@ -140,18 +140,6 @@ static inline int intel_gvt_hypervisor_inject_msi(struct intel_vgpu *vgpu)
    return 0;
    }

    -/**
    - * intel_gvt_hypervisor_set_wp_page - translate a host VA into MFN
    - * @p: host kernel virtual address
    - *
    - * Returns:
    - * MFN on success, INTEL_GVT_INVALID_ADDR if failed.
    - */
    -static inline unsigned long intel_gvt_hypervisor_virt_to_mfn(void *p)
    -{
    - return intel_gvt_host.mpt->from_virt_to_mfn(p);
    -}
    -
    /**
    * intel_gvt_hypervisor_enable_page_track - track a guest page
    * @vgpu: a vGPU
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-11-02 08:07    [W:2.885 / U:23.636 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site