| Message ID | 20190712051610.15478-1-pagupta@redhat.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 8c2e408e73f735d2e6e8b43f9b038c9abb082939 |
| Headers | show |
| Series | [v3] virtio_pmem: fix sparse warning | expand |
On Fri, Jul 12, 2019 at 10:46:10AM +0530, Pankaj Gupta wrote: > This patch fixes below sparse warning related to __virtio > type in virtio pmem driver. This is reported by Intel test > bot on linux-next tree. > > nd_virtio.c:56:28: warning: incorrect type in assignment > (different base types) > nd_virtio.c:56:28: expected unsigned int [unsigned] [usertype] type > nd_virtio.c:56:28: got restricted __virtio32 > nd_virtio.c:93:59: warning: incorrect type in argument 2 > (different base types) > nd_virtio.c:93:59: expected restricted __virtio32 [usertype] val > nd_virtio.c:93:59: got unsigned int [unsigned] [usertype] ret > > Reported-by: kbuild test robot <lkp@intel.com> > Signed-off-by: Pankaj Gupta <pagupta@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Pls merge - I assume nvdimm tree? > --- > This fixes a warning, so submitting it as a separate > patch on top of virtio pmem series. > > v2-> v3 > Use __le for req/resp fields - Michael > > drivers/nvdimm/nd_virtio.c | 4 ++-- > include/uapi/linux/virtio_pmem.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/nvdimm/nd_virtio.c b/drivers/nvdimm/nd_virtio.c > index 8645275c08c2..10351d5b49fa 100644 > --- a/drivers/nvdimm/nd_virtio.c > +++ b/drivers/nvdimm/nd_virtio.c > @@ -53,7 +53,7 @@ static int virtio_pmem_flush(struct nd_region *nd_region) > init_waitqueue_head(&req_data->host_acked); > init_waitqueue_head(&req_data->wq_buf); > INIT_LIST_HEAD(&req_data->list); > - req_data->req.type = cpu_to_virtio32(vdev, VIRTIO_PMEM_REQ_TYPE_FLUSH); > + req_data->req.type = cpu_to_le32(VIRTIO_PMEM_REQ_TYPE_FLUSH); > sg_init_one(&sg, &req_data->req, sizeof(req_data->req)); > sgs[0] = &sg; > sg_init_one(&ret, &req_data->resp.ret, sizeof(req_data->resp)); > @@ -90,7 +90,7 @@ static int virtio_pmem_flush(struct nd_region *nd_region) > } else { > /* A host repsonse results in "host_ack" getting called */ > wait_event(req_data->host_acked, req_data->done); > - err = virtio32_to_cpu(vdev, req_data->resp.ret); > + err = le32_to_cpu(req_data->resp.ret); > } > > kfree(req_data); > diff --git a/include/uapi/linux/virtio_pmem.h b/include/uapi/linux/virtio_pmem.h > index efcd72f2d20d..9a63ed6d062f 100644 > --- a/include/uapi/linux/virtio_pmem.h > +++ b/include/uapi/linux/virtio_pmem.h > @@ -23,12 +23,12 @@ struct virtio_pmem_config { > > struct virtio_pmem_resp { > /* Host return status corresponding to flush request */ > - __u32 ret; > + __le32 ret; > }; > > struct virtio_pmem_req { > /* command type */ > - __u32 type; > + __le32 type; > }; > > #endif > -- > 2.14.5
On Fri, Jul 12, 2019 at 7:11 AM Michael S. Tsirkin <mst@redhat.com> wrote: > > On Fri, Jul 12, 2019 at 10:46:10AM +0530, Pankaj Gupta wrote: > > This patch fixes below sparse warning related to __virtio > > type in virtio pmem driver. This is reported by Intel test > > bot on linux-next tree. > > > > nd_virtio.c:56:28: warning: incorrect type in assignment > > (different base types) > > nd_virtio.c:56:28: expected unsigned int [unsigned] [usertype] type > > nd_virtio.c:56:28: got restricted __virtio32 > > nd_virtio.c:93:59: warning: incorrect type in argument 2 > > (different base types) > > nd_virtio.c:93:59: expected restricted __virtio32 [usertype] val > > nd_virtio.c:93:59: got unsigned int [unsigned] [usertype] ret > > > > Reported-by: kbuild test robot <lkp@intel.com> > > Signed-off-by: Pankaj Gupta <pagupta@redhat.com> > > Acked-by: Michael S. Tsirkin <mst@redhat.com> > > Pls merge - I assume nvdimm tree? Yes, I'll push this with the rest to Linus tomorrow morning.
diff --git a/drivers/nvdimm/nd_virtio.c b/drivers/nvdimm/nd_virtio.c index 8645275c08c2..10351d5b49fa 100644 --- a/drivers/nvdimm/nd_virtio.c +++ b/drivers/nvdimm/nd_virtio.c @@ -53,7 +53,7 @@ static int virtio_pmem_flush(struct nd_region *nd_region) init_waitqueue_head(&req_data->host_acked); init_waitqueue_head(&req_data->wq_buf); INIT_LIST_HEAD(&req_data->list); - req_data->req.type = cpu_to_virtio32(vdev, VIRTIO_PMEM_REQ_TYPE_FLUSH); + req_data->req.type = cpu_to_le32(VIRTIO_PMEM_REQ_TYPE_FLUSH); sg_init_one(&sg, &req_data->req, sizeof(req_data->req)); sgs[0] = &sg; sg_init_one(&ret, &req_data->resp.ret, sizeof(req_data->resp)); @@ -90,7 +90,7 @@ static int virtio_pmem_flush(struct nd_region *nd_region) } else { /* A host repsonse results in "host_ack" getting called */ wait_event(req_data->host_acked, req_data->done); - err = virtio32_to_cpu(vdev, req_data->resp.ret); + err = le32_to_cpu(req_data->resp.ret); } kfree(req_data); diff --git a/include/uapi/linux/virtio_pmem.h b/include/uapi/linux/virtio_pmem.h index efcd72f2d20d..9a63ed6d062f 100644 --- a/include/uapi/linux/virtio_pmem.h +++ b/include/uapi/linux/virtio_pmem.h @@ -23,12 +23,12 @@ struct virtio_pmem_config { struct virtio_pmem_resp { /* Host return status corresponding to flush request */ - __u32 ret; + __le32 ret; }; struct virtio_pmem_req { /* command type */ - __u32 type; + __le32 type; }; #endif
This patch fixes below sparse warning related to __virtio type in virtio pmem driver. This is reported by Intel test bot on linux-next tree. nd_virtio.c:56:28: warning: incorrect type in assignment (different base types) nd_virtio.c:56:28: expected unsigned int [unsigned] [usertype] type nd_virtio.c:56:28: got restricted __virtio32 nd_virtio.c:93:59: warning: incorrect type in argument 2 (different base types) nd_virtio.c:93:59: expected restricted __virtio32 [usertype] val nd_virtio.c:93:59: got unsigned int [unsigned] [usertype] ret Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Pankaj Gupta <pagupta@redhat.com> --- This fixes a warning, so submitting it as a separate patch on top of virtio pmem series. v2-> v3 Use __le for req/resp fields - Michael drivers/nvdimm/nd_virtio.c | 4 ++-- include/uapi/linux/virtio_pmem.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)