(nuttx) branch master updated: virtio: fix compile error

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 6e3f8d0356 virtio: fix compile error
6e3f8d0356 is described below

commit 6e3f8d0356f0bc682d5d3bfdbb8a2b47266f4c53
Author: wangmingrong1 <wangmingro...@xiaomi.com>
AuthorDate: Fri Dec 6 12:16:48 2024 +0800

    virtio: fix compile error
    
    CC:  virtio/virtio-mmio.c virtio/virtio-mmio.c: In function 
'virtio_mmio_config_virtqueue':
    virtio/virtio-mmio.c:346:14: warning: cast from pointer to integer of 
different size [-Wpointer-to-int-cast]
      346 |       addr = (uint64_t)kasan_reset_tag((FAR void 
*)vq->vq_ring.desc);
          |              ^
    virtio/virtio-mmio.c:350:14: warning: cast from pointer to integer of 
different size [-Wpointer-to-int-cast]
      350 |       addr = (uint64_t)kasan_reset_tag((FAR void 
*)vq->vq_ring.avail);
          |              ^
    virtio/virtio-mmio.c:354:14: warning: cast from pointer to integer of 
different size [-Wpointer-to-int-cast]
      354 |       addr = (uint64_t)kasan_reset_tag((FAR void *)vq->vq_ring.used)
    
    Signed-off-by: wangmingrong1 <wangmingro...@xiaomi.com>
---
 drivers/virtio/virtio-mmio.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/virtio/virtio-mmio.c b/drivers/virtio/virtio-mmio.c
index 049eff9816..c98d9a8cd6 100644
--- a/drivers/virtio/virtio-mmio.c
+++ b/drivers/virtio/virtio-mmio.c
@@ -343,15 +343,18 @@ static int virtio_mmio_config_virtqueue(FAR struct 
metal_io_region *io,
     {
       metal_io_write32(io, VIRTIO_MMIO_QUEUE_NUM, vq->vq_nentries);
 
-      addr = (uint64_t)kasan_reset_tag((FAR void *)vq->vq_ring.desc);
+      addr = (uint64_t)((uintptr_t)
+                        kasan_reset_tag((FAR void *)vq->vq_ring.desc));
       metal_io_write32(io, VIRTIO_MMIO_QUEUE_DESC_LOW, addr);
       metal_io_write32(io, VIRTIO_MMIO_QUEUE_DESC_HIGH, addr >> 32);
 
-      addr = (uint64_t)kasan_reset_tag((FAR void *)vq->vq_ring.avail);
+      addr = (uint64_t)((uintptr_t)
+                        kasan_reset_tag((FAR void *)vq->vq_ring.avail));
       metal_io_write32(io, VIRTIO_MMIO_QUEUE_AVAIL_LOW, addr);
       metal_io_write32(io, VIRTIO_MMIO_QUEUE_AVAIL_HIGH, addr >> 32);
 
-      addr = (uint64_t)kasan_reset_tag((FAR void *)vq->vq_ring.used);
+      addr = (uint64_t)((uintptr_t)
+                        kasan_reset_tag((FAR void *)vq->vq_ring.used));
       metal_io_write32(io, VIRTIO_MMIO_QUEUE_USED_LOW, addr);
       metal_io_write32(io, VIRTIO_MMIO_QUEUE_USED_HIGH, addr >> 32);