svn commit: r326160 - in projects/bsd_rdma_4_9/sys: contrib/rdma/krping dev/mlx5/mlx5_ib

[Hans Petter Selasky]

Author: hselasky
Date: Fri Nov 24 12:08:50 2017
New Revision: 326160
URL: https://svnweb.freebsd.org/changeset/base/326160

Log:
  Compile fixes for 32-bit architectures.
  
  Sponsored by:	Mellanox Technologies

Modified:
  projects/bsd_rdma_4_9/sys/contrib/rdma/krping/krping.c
  projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c

Modified: projects/bsd_rdma_4_9/sys/contrib/rdma/krping/krping.c
==============================================================================
--- projects/bsd_rdma_4_9/sys/contrib/rdma/krping/krping.c	Fri Nov 24 12:05:49 2017	(r326159)
+++ projects/bsd_rdma_4_9/sys/contrib/rdma/krping/krping.c	Fri Nov 24 12:08:50 2017	(r326160)
@@ -1783,7 +1783,7 @@ static void krping_fr_test(struct krping_cb *cb)
 		return;
 	}
 
-	sg_dma_address(&sg) = 0xcafebabe0000UL;
+	sg_dma_address(&sg) = (dma_addr_t)0xcafebabe0000ULL;
 	sg_dma_len(&sg) = size;
 	ret = ib_map_mr_sg(mr, &sg, 1, NULL, PAGE_SIZE);
 	if (ret <= 0) {

Modified: projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
==============================================================================
--- projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c	Fri Nov 24 12:05:49 2017	(r326159)
+++ projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c	Fri Nov 24 12:08:50 2017	(r326160)
@@ -1355,14 +1355,14 @@ static int uar_mmap(struct mlx5_ib_dev *dev, enum mlx5
 	err = io_remap_pfn_range(vma, vma->vm_start, pfn,
 				 PAGE_SIZE, vma->vm_page_prot);
 	if (err) {
-		mlx5_ib_err(dev, "io_remap_pfn_range failed with error=%d, vm_start=0x%lx, pfn=%pa, mmap_cmd=%s\n",
-			    err, vma->vm_start, &pfn, mmap_cmd2str(cmd));
+		mlx5_ib_err(dev, "io_remap_pfn_range failed with error=%d, vm_start=0x%llx, pfn=%pa, mmap_cmd=%s\n",
+			    err, (unsigned long long)vma->vm_start, &pfn, mmap_cmd2str(cmd));
 		return -EAGAIN;
 	}
 
 	pa = pfn << PAGE_SHIFT;
-	mlx5_ib_dbg(dev, "mapped %s at 0x%lx, PA %pa\n", mmap_cmd2str(cmd),
-		    vma->vm_start, &pa);
+	mlx5_ib_dbg(dev, "mapped %s at 0x%llx, PA %pa\n", mmap_cmd2str(cmd),
+		    (unsigned long long)vma->vm_start, &pa);
 
 	return mlx5_ib_set_vma_data(vma, context);
 }
@@ -1403,8 +1403,8 @@ static int mlx5_ib_mmap(struct ib_ucontext *ibcontext,
 				       PAGE_SIZE, vma->vm_page_prot))
 			return -EAGAIN;
 
-		mlx5_ib_dbg(dev, "mapped internal timer at 0x%lx, PA 0x%llx\n",
-			    vma->vm_start,
+		mlx5_ib_dbg(dev, "mapped internal timer at 0x%llx, PA 0x%llx\n",
+			    (unsigned long long)vma->vm_start,
 			    (unsigned long long)pfn << PAGE_SHIFT);
 		break;