drm/i915/gvt: fix sparse warnings on different address spaces

Add proper __iomem annotation for pointers obtained via ioremap().

Signed-off-by: Du, Changbin <changbin.du@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/gvt/firmware.c b/drivers/gpu/drm/i915/gvt/firmware.c
index d068a524a6992767a0109200a755057ed7bef944..2fae2a2ca96f603d9388fcde3b5cf8e460dc9dd7 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/firmware.c
+++ b/drivers/gpu/drm/i915/gvt/firmware.c
@@ -51,7 +51,7 @@ struct gvt_firmware_header {
 #define RD(offset) (readl(mmio + offset.reg))
 #define WR(v, offset) (writel(v, mmio + offset.reg))
 
-static void bdw_forcewake_get(void *mmio)
+static void bdw_forcewake_get(void __iomem *mmio)
 {
        WR(_MASKED_BIT_DISABLE(0xffff), FORCEWAKE_MT);
 
@@ -91,7 +91,8 @@ static struct bin_attribute firmware_attr = {
        .mmap = NULL,
 };
 
-static int expose_firmware_sysfs(struct intel_gvt *gvt, void *mmio)
+static int expose_firmware_sysfs(struct intel_gvt *gvt,
+                                       void __iomem *mmio)
 {
        struct intel_gvt_device_info *info = &gvt->device_info;
        struct pci_dev *pdev = gvt->dev_priv->drm.pdev;
@@ -234,7 +235,8 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt)
        struct gvt_firmware_header *h;
        const struct firmware *fw;
        char *path;
-       void *mmio, *mem;
+       void __iomem *mmio;
+       void *mem;
        int ret;
 
        path = kmalloc(PATH_MAX, GFP_KERNEL);

diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 0722d1e61fceaff33b4fae176313d7d0c59bccf1..a8c2405f6f3e26af585614f394fd513c798fb4b9 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -269,7 +269,7 @@ static inline int get_pse_type(int type)
 
 static u64 read_pte64(struct drm_i915_private *dev_priv, unsigned long index)
 {
-       void *addr = (u64 *)dev_priv->ggtt.gsm + index;
+       void __iomem *addr = (gen8_pte_t __iomem *)dev_priv->ggtt.gsm + index;
        u64 pte;
 
 #ifdef readq
@@ -284,7 +284,7 @@ static u64 read_pte64(struct drm_i915_private *dev_priv, unsigned long index)
 static void write_pte64(struct drm_i915_private *dev_priv,
                unsigned long index, u64 pte)
 {
-       void *addr = (u64 *)dev_priv->ggtt.gsm + index;
+       void __iomem *addr = (gen8_pte_t __iomem *)dev_priv->ggtt.gsm + index;
 
 #ifdef writeq
        writeq(pte, addr);

diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 15c595e0a63b62893647b1a1429cd8acd057132f..11df62b542b19655e2dcc9c7e53caa13aa28491e 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -186,7 +186,7 @@ struct intel_gvt_firmware {
 };
 
 struct intel_gvt_opregion {
-       void *opregion_va;
+       void __iomem *opregion_va;
        u32 opregion_pa;
 };
 

diff --git a/drivers/gpu/drm/i915/gvt/opregion.c b/drivers/gpu/drm/i915/gvt/opregion.c
index 53ac81f63c6451b058b3bdf6666807da19b39bbb..973c8a9d0b1534c9125a00a2a6b584997871fbf5 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/opregion.c
+++ b/drivers/gpu/drm/i915/gvt/opregion.c
@@ -27,7 +27,7 @@
 
 static int init_vgpu_opregion(struct intel_vgpu *vgpu, u32 gpa)
 {
-       void *host_va = vgpu->gvt->opregion.opregion_va;
+       void __iomem *host_va = vgpu->gvt->opregion.opregion_va;
        u8 *buf;
        int i;