From owner-svn-src-head@FreeBSD.ORG Tue Mar 27 14:35:00 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25A10106564A; Tue, 27 Mar 2012 14:35:00 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id EE7A48FC18; Tue, 27 Mar 2012 14:34:59 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 6F8F2B970; Tue, 27 Mar 2012 10:34:59 -0400 (EDT) From: John Baldwin To: src-committers@freebsd.org Date: Tue, 27 Mar 2012 10:34:58 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p10; KDE/4.5.5; amd64; ; ) References: <201203271424.q2REOUEY089545@svn.freebsd.org> In-Reply-To: <201203271424.q2REOUEY089545@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201203271034.58875.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 27 Mar 2012 10:34:59 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r233547 - head/sys/ofed/include/linux X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2012 14:35:00 -0000 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 /* 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