Commit 196a6627 authored Apr 04, 2019 by Chris Wilson Committed by Zhenyu Wang Apr 08, 2019

drm/i915/gvt: Annotate iomem usage

Fix the sparse warning for blithely using iomem with normal memcpy:

drivers/gpu/drm/i915/gvt/kvmgt.c:916:21: warning: incorrect type in assignment (different address spaces)
drivers/gpu/drm/i915/gvt/kvmgt.c:916:21: expected void *aperture_va
drivers/gpu/drm/i915/gvt/kvmgt.c:916:21: got void [noderef] <asn:2> *
drivers/gpu/drm/i915/gvt/kvmgt.c:927:26: warning: incorrect type in argument 1 (different address spaces)
drivers/gpu/drm/i915/gvt/kvmgt.c:927:26: expected void [noderef] <asn:2> *vaddr
drivers/gpu/drm/i915/gvt/kvmgt.c:927:26: got void *aperture_va

Fixes: d480b28a ("drm/i915/gvt: Fix aperture read/write emulation when enable x-no-mmap=on")
Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Changbin Du <changbin.du@intel.com>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>

parent cf9ed666

drivers/gpu/drm/i915/gvt/kvmgt.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -905,7 +905,7 @@ static inline bool intel_vgpu_in_aperture(struct intel_vgpu *vgpu, u64 off)
		static int intel_vgpu_aperture_rw(struct intel_vgpu *vgpu, u64 off,
		void *buf, unsigned long count, bool is_write)
		{
		void *aperture_va;
		void __iomem *aperture_va;

		if (!intel_vgpu_in_aperture(vgpu, off) \|\|
		!intel_vgpu_in_aperture(vgpu, off + count)) {
		@@ -920,9 +920,9 @@ static int intel_vgpu_aperture_rw(struct intel_vgpu *vgpu, u64 off,
		return -EIO;

		if (is_write)
		memcpy(aperture_va + offset_in_page(off), buf, count);
		memcpy_toio(aperture_va + offset_in_page(off), buf, count);
		else
		memcpy(buf, aperture_va + offset_in_page(off), count);
		memcpy_fromio(buf, aperture_va + offset_in_page(off), count);

		io_mapping_unmap(aperture_va);

Admin message