From owner-svn-src-head@FreeBSD.ORG  Mon Mar 17 22:37:17 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C2166608;
 Mon, 17 Mar 2014 22:37:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AEFC426A;
 Mon, 17 Mar 2014 22:37:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2HMbHT9091505;
 Mon, 17 Mar 2014 22:37:17 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2HMbH6l091504;
 Mon, 17 Mar 2014 22:37:17 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201403172237.s2HMbH6l091504@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Mon, 17 Mar 2014 22:37:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263278 - head/sys/dev/nvme
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Mar 2014 22:37:17 -0000

Author: jimharris
Date: Mon Mar 17 22:37:17 2014
New Revision: 263278
URL: http://svnweb.freebsd.org/changeset/base/263278

Log:
  nvme:  NVMe specification dictates 4-byte alignment for PRPs (not 8).
  
  Sponsored by:	Intel
  MFC after:	3 days

Modified:
  head/sys/dev/nvme/nvme_qpair.c

Modified: head/sys/dev/nvme/nvme_qpair.c
==============================================================================
--- head/sys/dev/nvme/nvme_qpair.c	Mon Mar 17 22:36:04 2014	(r263277)
+++ head/sys/dev/nvme/nvme_qpair.c	Mon Mar 17 22:37:17 2014	(r263278)
@@ -498,8 +498,9 @@ nvme_qpair_construct(struct nvme_qpair *
 
 	mtx_init(&qpair->lock, "nvme qpair lock", NULL, MTX_DEF);
 
+	/* Note: NVMe PRP format is restricted to 4-byte alignment. */
 	bus_dma_tag_create(bus_get_dma_tag(ctrlr->dev),
-	    sizeof(uint64_t), PAGE_SIZE, BUS_SPACE_MAXADDR,
+	    4, PAGE_SIZE, BUS_SPACE_MAXADDR,
 	    BUS_SPACE_MAXADDR, NULL, NULL, NVME_MAX_XFER_SIZE,
 	    (NVME_MAX_XFER_SIZE/PAGE_SIZE)+1, PAGE_SIZE, 0,
 	    NULL, NULL, &qpair->dma_tag);