From owner-svn-src-all@freebsd.org  Mon Jul  3 02:01:17 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 69DCE9DB4BF;
 Mon,  3 Jul 2017 02:01:17 +0000 (UTC)
 (envelope-from markj@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 38E357D39E;
 Mon,  3 Jul 2017 02:01:17 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6321G5B026300;
 Mon, 3 Jul 2017 02:01:16 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6321G4l026299;
 Mon, 3 Jul 2017 02:01:16 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201707030201.v6321G4l026299@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 3 Jul 2017 02:01:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320580 - head/sys/compat/linuxkpi/common/include/linux
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/compat/linuxkpi/common/include/linux
X-SVN-Commit-Revision: 320580
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jul 2017 02:01:17 -0000

Author: markj
Date: Mon Jul  3 02:01:16 2017
New Revision: 320580
URL: https://svnweb.freebsd.org/changeset/base/320580

Log:
  Let io_mapping_init_wc() fall back to an uncacheable mapping.
  
  This allows usage of the function on architectures that don't support
  write-combining.
  
  Reported by:	bz, emaste
  X-MFC With:	r320196

Modified:
  head/sys/compat/linuxkpi/common/include/linux/io-mapping.h

Modified: head/sys/compat/linuxkpi/common/include/linux/io-mapping.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/io-mapping.h	Sun Jul  2 21:00:30 2017	(r320579)
+++ head/sys/compat/linuxkpi/common/include/linux/io-mapping.h	Mon Jul  3 02:01:16 2017	(r320580)
@@ -53,8 +53,13 @@ io_mapping_init_wc(struct io_mapping *mapping, resourc
 
 	mapping->base = base;
 	mapping->size = size;
+#ifdef VM_MEMATTR_WRITE_COMBINING
 	mapping->mem = ioremap_wc(base, size);
 	mapping->attr = VM_MEMATTR_WRITE_COMBINING;
+#else
+	mapping->mem = ioremap_nocache(base, size);
+	mapping->attr = VM_MEMATTR_UNCACHEABLE;
+#endif
 	return (mapping);
 }