From owner-svn-src-projects@freebsd.org Fri Nov 24 12:08:51 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 916D3DE2CA0 for ; Fri, 24 Nov 2017 12:08:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 54F7471FE7; Fri, 24 Nov 2017 12:08:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAOC8oBm089985; Fri, 24 Nov 2017 12:08:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAOC8o2r089983; Fri, 24 Nov 2017 12:08:50 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201711241208.vAOC8o2r089983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 24 Nov 2017 12:08:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r326160 - in projects/bsd_rdma_4_9/sys: contrib/rdma/krping dev/mlx5/mlx5_ib X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in projects/bsd_rdma_4_9/sys: contrib/rdma/krping dev/mlx5/mlx5_ib X-SVN-Commit-Revision: 326160 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Nov 2017 12:08:51 -0000 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;