From owner-svn-src-head@freebsd.org  Thu Oct 29 04:16:29 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 C65CAA2099D;
 Thu, 29 Oct 2015 04:16:29 +0000 (UTC) (envelope-from cem@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 8E91A1E46;
 Thu, 29 Oct 2015 04:16:29 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9T4GSD5044280;
 Thu, 29 Oct 2015 04:16:28 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9T4GSG7044279;
 Thu, 29 Oct 2015 04:16:28 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201510290416.t9T4GSG7044279@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Thu, 29 Oct 2015 04:16:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290130 - head/sys/dev/ntb/ntb_hw
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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Oct 2015 04:16:29 -0000

Author: cem
Date: Thu Oct 29 04:16:28 2015
New Revision: 290130
URL: https://svnweb.freebsd.org/changeset/base/290130

Log:
  ntb: Do not attempt to set write-combining on MWs
  
  AMD64 pmap assumes ranges will be in the DMAP, which isn't necessarily
  true for NTB memory windows (especially 64-bit BARs).
  
  Suggested by:	pmap_change_attr_locked -> kassert_panic
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/dev/ntb/ntb_hw/ntb_hw.c

Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c
==============================================================================
--- head/sys/dev/ntb/ntb_hw/ntb_hw.c	Thu Oct 29 04:16:16 2015	(r290129)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw.c	Thu Oct 29 04:16:28 2015	(r290130)
@@ -755,9 +755,13 @@ map_memory_window_bar(struct ntb_softc *
 		save_bar_parameters(bar);
 	}
 
+#if 0	/* XXX: amd64 pmap_change_attr() assumes region lies in DMAP. */
 	/* Mark bar region as write combining to improve performance. */
 	rc = pmap_change_attr((vm_offset_t)bar->vbase, bar->size,
 	    VM_MEMATTR_WRITE_COMBINING);
+#else
+	rc = EINVAL;
+#endif
 	print_map_success(ntb, bar, "mw");
 	if (rc == 0)
 		device_printf(ntb->device,