svn commit: r320580 - head/sys/compat/linuxkpi/common/include/linux

Mark Johnston markj at FreeBSD.org
Mon Jul 3 02:01:17 UTC 2017


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);
 }
 


More information about the svn-src-all mailing list