svn commit: r233547 - head/sys/ofed/include/linux
John Baldwin
jhb at freebsd.org
Tue Mar 27 14:35:00 UTC 2012
On Tuesday, March 27, 2012 10:24:30 am John Baldwin wrote:
> Author: jhb
> Date: Tue Mar 27 14:24:29 2012
> New Revision: 233547
> URL: http://svn.freebsd.org/changeset/base/233547
>
> Log:
> Use VM_MEMATTR_UNCACHEABLE instead of VM_MEMATTR_UNCACHED for UC mappings.
> VM_MEMATTR_UNCACHED is actually the x86-specific UC- mode (where a WC
> MTRR can override the PAT setting).
>
> Modified:
> head/sys/ofed/include/linux/io.h
> head/sys/ofed/include/linux/page.h
VM_MEMATTR_UNCACHED vs VM_MEMATTR_UNCACHEABLE is admittedly very ambiguous
(I used those names as that is how Intel labels the PAT modes in the
description of the PAT MSR). I would like to rename VM_MEMATTR_UNCACHED to
VM_MEMATTR_WEAK_UNCACHEABLE and to remove it from other architectures. In
the case of mips, this means renaming VM_MEMATTR_UNCACHED to
VM_MEMATTR_UNCACHEABLE.
Does this sound ok to other folks?
Index: amd64/include/vm.h
===================================================================
--- amd64/include/vm.h (revision 233508)
+++ amd64/include/vm.h (working copy)
@@ -38,7 +38,7 @@
#define VM_MEMATTR_WRITE_THROUGH ((vm_memattr_t)PAT_WRITE_THROUGH)
#define VM_MEMATTR_WRITE_PROTECTED ((vm_memattr_t)PAT_WRITE_PROTECTED)
#define VM_MEMATTR_WRITE_BACK ((vm_memattr_t)PAT_WRITE_BACK)
-#define VM_MEMATTR_UNCACHED ((vm_memattr_t)PAT_UNCACHED)
+#define VM_MEMATTR_WEAK_UNCACHEABLE ((vm_memattr_t)PAT_UNCACHED)
#define VM_MEMATTR_DEFAULT VM_MEMATTR_WRITE_BACK
Index: i386/include/vm.h
===================================================================
--- i386/include/vm.h (revision 233508)
+++ i386/include/vm.h (working copy)
@@ -38,7 +38,7 @@
#define VM_MEMATTR_WRITE_THROUGH ((vm_memattr_t)PAT_WRITE_THROUGH)
#define VM_MEMATTR_WRITE_PROTECTED ((vm_memattr_t)PAT_WRITE_PROTECTED)
#define VM_MEMATTR_WRITE_BACK ((vm_memattr_t)PAT_WRITE_BACK)
-#define VM_MEMATTR_UNCACHED ((vm_memattr_t)PAT_UNCACHED)
+#define VM_MEMATTR_WEAK_UNCACHEABLE ((vm_memattr_t)PAT_UNCACHED)
#define VM_MEMATTR_DEFAULT VM_MEMATTR_WRITE_BACK
Index: mips/include/vm.h
===================================================================
--- mips/include/vm.h (revision 233508)
+++ mips/include/vm.h (working copy)
@@ -32,7 +32,7 @@
#include <machine/pte.h>
/* Memory attributes. */
-#define VM_MEMATTR_UNCACHED ((vm_memattr_t)PTE_C_UNCACHED)
+#define VM_MEMATTR_UNCACHEABLE ((vm_memattr_t)PTE_C_UNCACHED)
#define VM_MEMATTR_DEFAULT ((vm_memattr_t)PTE_C_CACHE)
#endif /* !_MACHINE_VM_H_ */
Index: powerpc/include/vm.h
===================================================================
--- powerpc/include/vm.h (revision 233508)
+++ powerpc/include/vm.h (working copy)
@@ -34,7 +34,6 @@
/* Memory attributes. */
#define VM_MEMATTR_DEFAULT 0
#define VM_MEMATTR_UNCACHEABLE 0x01
-#define VM_MEMATTR_UNCACHED VM_MEMATTR_UNCACHEABLE
#define VM_MEMATTR_CACHEABLE 0x02
#define VM_MEMATTR_WRITE_COMBINING 0x04
#define VM_MEMATTR_WRITE_BACK 0x08
--
John Baldwin
More information about the svn-src-all
mailing list