From owner-svn-src-head@FreeBSD.ORG Fri May 23 14:08:21 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2732C81F; Fri, 23 May 2014 14:08:21 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 016F32051; Fri, 23 May 2014 14:08:21 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 037E9B946; Fri, 23 May 2014 10:08:19 -0400 (EDT) From: John Baldwin To: Ian Lepore Subject: Re: svn commit: r266565 - head/sys/arm/arm Date: Fri, 23 May 2014 09:12:46 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20140415; KDE/4.5.5; amd64; ; ) References: <201405222338.s4MNcHYA066694@svn.freebsd.org> In-Reply-To: <201405222338.s4MNcHYA066694@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201405230912.47217.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 23 May 2014 10:08:19 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 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: Fri, 23 May 2014 14:08:21 -0000 On Thursday, May 22, 2014 7:38:17 pm Ian Lepore wrote: > Author: ian > Date: Thu May 22 23:38:17 2014 > New Revision: 266565 > URL: http://svnweb.freebsd.org/changeset/base/266565 > > Log: > Map device memory using PTE_DEVICE attributes, and also ensure that the > shared flag is set on normal-memory mappings made via pmap_kenter() for SMP. > > The "shared flag" part of this change isn't obvious from the diff, here's > the deal... by using the array of preformatted page table entry templates > instead of constructing the PTE from scratch, we automatically get the > right attribute bits set for both caching and shared. > > MFC after: 1 week One tiny nit: > Modified: head/sys/arm/arm/pmap-v6.c > ============================================================================== > --- head/sys/arm/arm/pmap-v6.c Thu May 22 23:18:17 2014 (r266564) > +++ head/sys/arm/arm/pmap-v6.c Thu May 22 23:38:17 2014 (r266565) > @@ -2401,12 +2402,17 @@ pmap_kenter_internal(vm_offset_t va, vm_ > ptep = &l2b->l2b_kva[l2pte_index(va)]; > opte = *ptep; > > + if (flags & KENTER_CACHE) > + *ptep = L2_S_PROTO | l2s_mem_types[PTE_CACHE] | pa | L2_S_REF; > + else if (flags & KENTER_DEVICE) > + *ptep = L2_S_PROTO |l2s_mem_types[PTE_DEVICE] | pa | L2_S_REF; > + else > + *ptep =L2_S_PROTO | l2s_mem_types[PTE_NOCACHE] | pa | L2_S_REF; > + The whitespace around operators for the last two assignments is inconsistent. -- John Baldwin