From owner-svn-src-projects@FreeBSD.ORG Tue Mar 8 23:33:29 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC3F6106564A; Tue, 8 Mar 2011 23:33:29 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C177F8FC0A; Tue, 8 Mar 2011 23:33:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p28NXTDc090294; Tue, 8 Mar 2011 23:33:29 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p28NXTi7090291; Tue, 8 Mar 2011 23:33:29 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201103082333.p28NXTi7090291@svn.freebsd.org> From: Jeff Roberson Date: Tue, 8 Mar 2011 23:33:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219417 - projects/ofed/head/sys/ofed/drivers/net/mlx4 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 08 Mar 2011 23:33:30 -0000 Author: jeff Date: Tue Mar 8 23:33:29 2011 New Revision: 219417 URL: http://svn.freebsd.org/changeset/base/219417 Log: - Handle the direct map properly using the new vmap() implementation. - Only assume the memory is contiguous if direct.map is set, otherwise use the page list. Modified: projects/ofed/head/sys/ofed/drivers/net/mlx4/alloc.c projects/ofed/head/sys/ofed/drivers/net/mlx4/mr.c Modified: projects/ofed/head/sys/ofed/drivers/net/mlx4/alloc.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/net/mlx4/alloc.c Tue Mar 8 22:01:47 2011 (r219416) +++ projects/ofed/head/sys/ofed/drivers/net/mlx4/alloc.c Tue Mar 8 23:33:29 2011 (r219417) @@ -229,6 +229,7 @@ int mlx4_buf_alloc(struct mlx4_dev *dev, int i; buf->direct.buf = NULL; + buf->direct.map = 0; buf->nbufs = (size + PAGE_SIZE - 1) / PAGE_SIZE; buf->npages = buf->nbufs; buf->page_shift = PAGE_SHIFT; @@ -249,7 +250,6 @@ int mlx4_buf_alloc(struct mlx4_dev *dev, memset(buf->page_list[i].buf, 0, PAGE_SIZE); } -#ifdef __linux__ if (BITS_PER_LONG == 64) { struct page **pages; pages = kmalloc(sizeof *pages * buf->nbufs, GFP_KERNEL); @@ -262,7 +262,6 @@ int mlx4_buf_alloc(struct mlx4_dev *dev, if (!buf->direct.buf) goto err_free; } -#endif } return 0; @@ -282,10 +281,8 @@ void mlx4_buf_free(struct mlx4_dev *dev, dma_free_coherent(&dev->pdev->dev, size, buf->direct.buf, buf->direct.map); else { -#ifdef __linux__ if (BITS_PER_LONG == 64 && buf->direct.buf) vunmap(buf->direct.buf); -#endif for (i = 0; i < buf->nbufs; ++i) if (buf->page_list[i].buf) Modified: projects/ofed/head/sys/ofed/drivers/net/mlx4/mr.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/net/mlx4/mr.c Tue Mar 8 22:01:47 2011 (r219416) +++ projects/ofed/head/sys/ofed/drivers/net/mlx4/mr.c Tue Mar 8 23:33:29 2011 (r219417) @@ -484,7 +484,7 @@ int mlx4_buf_write_mtt(struct mlx4_dev * return -ENOMEM; for (i = 0; i < buf->npages; ++i) - if (buf->direct.buf) + if (buf->direct.map) page_list[i] = buf->direct.map + (i << buf->page_shift); else page_list[i] = buf->page_list[i].map;