drm/i915/gvt: verify functions types in new_mmio_info()
PATCH 1/1 drm/i915/gvt: verify functions types in new_mmio_info()
The current prototype of new_mmio_info() uses void* for parameters read and write, which are functions with precise calling conventions (argument types and return type). Write down these conventions in new_mmio_info() definition.
This has been reported by the following warnings when clang is used to build the kernel:
drivers/gpu/drm/i915/gvt/handlers.c:124:21: error: pointer type
mismatch ('void *' and 'int (*)(struct intel_vgpu *, unsigned int,
void *, unsigned int)') [-Werror,-Wpointer-type-mismatch]
info->read = read ? read : intel_vgpu_default_mmio_read;
^ ~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/handlers.c:125:23: error: pointer type
mismatch ('void *' and 'int (*)(struct intel_vgpu *, unsigned int,
void *, unsigned int)') [-Werror,-Wpointer-type-mismatch]
info->write = write ? write : intel_vgpu_default_mmio_write;
^ ~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~This allows the compiler to detect that sbi_ctl_mmio_write() returns a "bool" value instead of an expected "int" one. Fix this.
--- drivers/gpu/drm/i915/gvt/handlers.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gvt/handlers.c +3 -2
@@ -93,7 +93,8 @@ static void write_vreg(struct intel_vgpu *vgpu, unsigned int offset,static int new_mmio_info (struct intel_gvt *gvt,u32 offset,u32 flags,u32 size,u32 addr_mask,u32 ro_mask,u32 device, -void *read,void *write) +int (*read)(struct intel_vgpu *,unsigned int ,void *,unsigned int ), +int (*write)(struct intel_vgpu *,unsigned int ,void *,unsigned int )) {struct intel_gvt_mmio_info *info, *p;u32 start, end, i;
@@ -974,7 +975,7 @@ static int sbi_data_mmio_read(struct intel_vgpu *vgpu, unsigned int offset,return 0 ; } -static bool sbi_ctl_mmio_write (struct intel_vgpu *vgpu,unsigned int offset, +static int sbi_ctl_mmio_write (struct intel_vgpu *vgpu,unsigned int offset,void *p_data,unsigned int bytes) {u32 data;
Signature · 1 line
2.11.0
Patchwork
CI✗ Fi.CI.BAT: warning for series starting with [1/1] drm/i915/gvt: verify functions types in new_mmio_info()
== Series Details ==
== Series Details ==
Series: series starting with [1/1] drm/i915/gvt: verify functions types in new_mmio_info()
URL : https://patchwork.freedesktop.org/series/17210/
State : warning
== Summary ==
Series 17210v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/17210/revisions/1/mbox/
Test kms_force_connector_basic:
Subgroup force-connector-state:
pass -> SKIP (fi-ivb-3520m)
Subgroup force-edid:
pass -> SKIP (fi-ivb-3520m)
Subgroup force-load-detect:
pass -> SKIP (fi-ivb-3520m)
Subgroup prune-stale-modes:
pass -> SKIP (fi-ivb-3520m)fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:82 pass:69 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-ivb-3520m total:246 pass:221 dwarn:0 dfail:0 fail:0 skip:25 fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
34544fe6abaa651211d871af4978060e72abd040 drm-tip: 2016y-12m-24d-10h-12m-42s UTC integration manifest 607f2af drm/i915/gvt: verify functions types in new_mmio_info()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3391/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 19 lines · Nicolas Iooss
The current prototype of
new_mmio_info()uses void* for parameters read and write, which are functions with precise calling conventions (argument types and return type). Write down these conventions innew_mmio_info()definition.This has been reported by the following warnings when clang is used to build the kernel:
drivers/gpu/drm/i915/gvt/handlers.c:124:21: error: pointer type mismatch ('void *' and 'int (*)(struct intel_vgpu *, unsigned int, void *, unsigned int)') [-Werror,-Wpointer-type-mismatch] info->read = read ? read : intel_vgpu_default_mmio_read; ^ ~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/gvt/handlers.c:125:23: error: pointer type mismatch ('void *' and 'int (*)(struct intel_vgpu *, unsigned int, void *, unsigned int)') [-Werror,-Wpointer-type-mismatch] info->write = write ? write : intel_vgpu_default_mmio_write; ^ ~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 3 lines
This allows the compiler to detect that
sbi_ctl_mmio_write()returns a "bool" value instead of an expected "int" one. Fix this.
Looks good to me. Will queue this up. Thanks
Quoted 35 lines
Signed-off-by Nicolas Iooss <[email protected]>--- drivers/gpu/drm/i915/gvt/handlers.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/gvt/handlers.c +3
-2@@ -93,7 +93,8 @@ static void write_vreg(struct intel_vgpu *vgpu, unsigned int offset,static int new_mmio_info (struct intel_gvt *gvt,u32 offset,u32 flags,u32 size,u32 addr_mask,u32 ro_mask,u32 device, -void *read,void *write) +int (*read)(struct intel_vgpu *,unsigned int ,void *,unsigned int ), +int (*write)(struct intel_vgpu *,unsigned int ,void *,unsigned int )) {struct intel_gvt_mmio_info *info, *p;u32 start, end, i;@@ -974,7 +975,7 @@ static int sbi_data_mmio_read(struct intel_vgpu *vgpu, unsigned int offset,return 0 ; } -static bool sbi_ctl_mmio_write (struct intel_vgpu *vgpu,unsigned int offset, +static int sbi_ctl_mmio_write (struct intel_vgpu *vgpu,unsigned int offset,void *p_data,unsigned int bytes) {u32 data;Signature · 6 lines
2.11.0 _______________________________________________ igvt-g-dev mailing list [email protected] https://lists.01.org/mailman/listinfo/igvt-g-dev
Signature · 3 lines
Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx