drm/i915/gvt: Cleanup struct intel_gvt_mmio_info

The size, length, addr_mask fields actually are not necessary. Every
tracked mmio has DWORD size, and addr_mask is a legacy field.

Signed-off-by: Changbin Du <[email protected]>
Signed-off-by: Zhenyu Wang <[email protected]>

diff --git a/drivers/gpu/drm/i915/gvt/firmware.c b/drivers/gpu/drm/i915/gvt/firmware.c
index dce8d15f706f58b4cf1019ddc1d5b609c903980c..5dad9298b2d5dbbe7b626895806e6008047bbd6a 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/firmware.c
+++ b/drivers/gpu/drm/i915/gvt/firmware.c
@@ -102,13 +102,8 @@ static int expose_firmware_sysfs(struct intel_gvt *gvt)
 
        p = firmware + h->mmio_offset;
 
-       hash_for_each(gvt->mmio.mmio_info_table, i, e, node) {
-               int j;
-
-               for (j = 0; j < e->length; j += 4)
-                       *(u32 *)(p + e->offset + j) =
-                               I915_READ_NOTRACE(_MMIO(e->offset + j));
-       }
+       hash_for_each(gvt->mmio.mmio_info_table, i, e, node)
+               *(u32 *)(p + e->offset) = I915_READ_NOTRACE(_MMIO(e->offset));
 
        memcpy(gvt->firmware.mmio, p, info->mmio_size);
 

diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index 60c0db10ae150dc89a2dc7df026cc21057d2b5ff..29de07f4d219941f36a1c5d120e523b4b0ede626 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -131,9 +131,7 @@ static int new_mmio_info(struct intel_gvt *gvt,
                if (p)
                        gvt_err("dup mmio definition offset %x\n",
                                info->offset);
-               info->size = size;
-               info->length = (i + 4) < end ? 4 : (end - i);
-               info->addr_mask = addr_mask;
+
                info->ro_mask = ro_mask;
                info->device = device;
                info->read = read ? read : intel_vgpu_default_mmio_read;
@@ -3114,9 +3112,6 @@ int intel_vgpu_mmio_reg_rw(struct intel_vgpu *vgpu, unsigned int offset,
                goto default_rw;
        }
 
-       if (WARN_ON(bytes > mmio_info->size))
-               return -EINVAL;
-
        if (is_read)
                return mmio_info->read(vgpu, offset, pdata, bytes);
        else {

diff --git a/drivers/gpu/drm/i915/gvt/mmio.h b/drivers/gpu/drm/i915/gvt/mmio.h
index 4410a323eea3b460161777a7bc8db71abfa1f6f6..0c89e10dcce439cd9135fd27bb6e49a686b20555 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/mmio.h
+++ b/drivers/gpu/drm/i915/gvt/mmio.h
@@ -57,9 +57,6 @@ typedef int (*gvt_mmio_func)(struct intel_vgpu *, unsigned int, void *,
 
 struct intel_gvt_mmio_info {
        u32 offset;
-       u32 size;
-       u32 length;
-       u32 addr_mask;
        u64 ro_mask;
        u32 device;
        gvt_mmio_func read;