 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.102 2010/02/10 00:39:30 jym Exp $	*/
+/*	$NetBSD: pmap.c,v 1.103 2010/02/12 01:55:45 jym Exp $	*/
 /*
  * Copyright (c) 2007 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -139,27 +139,27 @@
  *     Hibler/Jolitz pmap, as modified for FreeBSD by John S. Dyson
  *     and David Greenman.
+ *
  * [3] the Mach pmap.   this pmap, from CMU, seems to have migrated
  *     between several processors.   the VAX version was done by
  *     Avadis Tevanian, Jr., and Michael Wayne Young.    the i386
  *     version was done by Lance Berc, Mike Kupfer, Bob Baron,
  *     David Golub, and Richard Draves.    the alpha version was
  *     done by Alessandro Forin (CMU/Mach) and Chris Demetriou
  *     (NetBSD/alpha).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.102 2010/02/10 00:39:30 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.103 2010/02/12 01:55:45 jym Exp $");
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #if !defined(__x86_64__)
 #include "opt_kstack_dr0.h"
 #endif /* !defined(__x86_64__) */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 @@ -845,27 +845,26 @@ pmap_map_ptes(struct pmap *pmap, struct
 			xpq_queue_pte_update(
 			    xpmap_ptom(pmap_pdirpa(pmap, PDIR_SLOT_PTE + i)),
 			    npde);
 			xpq_queue_pte_update(xpmap_ptetomach(&APDP_PDE[i]),
 			    npde);
 #ifdef PAE
 			/* update shadow entry too */
 			xpq_queue_pte_update(
 			    xpmap_ptetomach(&APDP_PDE_SHADOW[i]), npde);
 #endif /* PAE */
 			xpq_queue_invlpg(
 			    (vaddr_t)&pmap->pm_pdir[PDIR_SLOT_PTE + i]);
+		}
 		xpq_flush_queue();
 		if (pmap_valid_entry(opde))
 			pmap_apte_flush(ourpmap);
 		splx(s);
+	}
 #else /* XEN */
 	npde = pmap_pa2pte(pmap_pdirpa(pmap, 0)) | PG_RW | PG_V;
 	if (!pmap_valid_entry(opde) ||
 	    pmap_pte2pa(opde) != pmap_pdirpa(pmap, 0)) {
 		pmap_pte_set(APDP_PDE, npde);
 		pmap_pte_flush();
 		if (pmap_valid_entry(opde))
 			pmap_apte_flush(ourpmap);
+	}
 @@ -2122,27 +2121,26 @@ pmap_pdp_ctor(void *arg, void *v, int fl
 		 * PDIR_SLOT_PTE entries last
 		 */
 #ifdef PAE
 		if (i == l2tol3(PDIR_SLOT_PTE))
 			continue;
 #endif
 		xpq_queue_pin_table(xpmap_ptom_masked(pdirpa));
+	}
 #ifdef PAE
 	object = ((vaddr_t)pdir) + PAGE_SIZE  * l2tol3(PDIR_SLOT_PTE);
 	(void)pmap_extract(pmap_kernel(), object, &pdirpa);
 	xpq_queue_pin_table(xpmap_ptom_masked(pdirpa));
 #endif
 	xpq_flush_queue();
 	splx(s);
 #endif /* XEN */
 	return (0);
+}
 /*
  * pmap_pdp_dtor: destructor for the PDP cache.
  */
 void
 pmap_pdp_dtor(void *arg, void *v)
+{
 @@ -2156,27 +2154,26 @@ pmap_pdp_dtor(void *arg, void *v)
 	for (i = 0; i < PDP_SIZE; i++, object += PAGE_SIZE) {
 		/* fetch the physical address of the page directory. */
 		(void) pmap_extract(pmap_kernel(), object, &pdirpa);
 		/* unpin page table */
 		xpq_queue_unpin_table(xpmap_ptom_masked(pdirpa));
+	}
 	object = (vaddr_t)v;
 	for (i = 0; i < PDP_SIZE; i++, object += PAGE_SIZE) {
 		/* Set page RW again */
 		pte = kvtopte(object);
 		xpq_queue_pte_update(xpmap_ptetomach(pte), *pte | PG_RW);
 		xpq_queue_invlpg((vaddr_t)object);
+	}
 	xpq_flush_queue();
 	splx(s);
 #endif  /* XEN */
+}
 #ifdef PAE
 /* pmap_pdp_alloc: Allocate a page for the pdp memory pool. */
 void *
 pmap_pdp_alloc(struct pool *pp, int flags)
+{
 	return (void *)uvm_km_alloc(kernel_map,
 	    PAGE_SIZE * PDP_SIZE, PAGE_SIZE * PDP_SIZE,
 @@ -2733,27 +2730,26 @@ pmap_load(void)
 		 */
 		int i, s;
 		pd_entry_t *old_pgd, *new_pgd;
 		paddr_t addr;
 		s = splvm();
 		new_pgd  = pmap->pm_pdir;
 		old_pgd = pmap_kernel()->pm_pdir;
 		addr = xpmap_ptom(pmap_pdirpa(pmap_kernel(), 0));
 		for (i = 0; i < PDIR_SLOT_PTE;
 		    i++, addr += sizeof(pd_entry_t)) {
 			if ((new_pgd[i] & PG_V) || (old_pgd[i] & PG_V))
 				xpq_queue_pte_update(addr, new_pgd[i]);
+		}
 		xpq_flush_queue(); /* XXXtlb */
 		tlbflush();
 		xen_set_user_pgd(pmap_pdirpa(pmap, 0));
 		xen_current_user_pgd = pmap_pdirpa(pmap, 0);
 		splx(s);
+	}
 #else /* XEN && x86_64 */
 #if defined(XEN)
 	/*
 	 * clear APDP slot, in case it points to a page table that has
 	 * been freed
 	 */
 	if (*APDP_PDE) {
 		int i;
 @@ -2774,27 +2770,26 @@ pmap_load(void)
 #endif /* XEN */
 	lldt(pmap->pm_ldt_sel);
 #ifdef PAE
+	{
 	paddr_t l3_pd = xpmap_ptom_masked(pmap_l3paddr);
 	int i;
 	int s = splvm();
 	/* don't update the kernel L3 slot */
 	for (i = 0 ; i < PDP_SIZE - 1  ; i++, l3_pd += sizeof(pd_entry_t)) {
 		xpq_queue_pte_update(l3_pd,
 		    xpmap_ptom(pmap->pm_pdirpa[i]) | PG_V);
+	}
 	tlbflush();
 	xpq_flush_queue();
 	splx(s);
+	}
 #else /* PAE */
+	{
 	u_int gen = uvm_emap_gen_return();
 	lcr3(pcb->pcb_cr3);
 	uvm_emap_update(gen);
+	}
 #endif /* PAE */
 #endif /* XEN && x86_64 */
 	ci->ci_want_pmapload = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_xpmap.c,v 1.17 2009/10/23 02:32:34 snj Exp $	*/
+/*	$NetBSD: x86_xpmap.c,v 1.18 2010/02/12 01:55:45 jym Exp $	*/
 /*
  * Copyright (c) 2006 Mathieu Ropert <mro@adviseo.fr>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 @@ -59,27 +59,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.17 2009/10/23 02:32:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.18 2010/02/12 01:55:45 jym Exp $");
 #include "opt_xen.h"
 #include "opt_ddb.h"
 #include "ksyms.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm.h>
 #include <machine/pmap.h>
 #include <machine/gdt.h>
 #include <xen/xenfunc.h>
 @@ -143,27 +143,26 @@ xen_set_ldt(vaddr_t base, uint32_t entri
 #else
 	end = base + entries * sizeof(union descriptor);
 #endif
 	for (va = base; va < end; va += PAGE_SIZE) {
 		KASSERT(va >= VM_MIN_KERNEL_ADDRESS);
 		ptp = kvtopte(va);
 		XENPRINTF(("xen_set_ldt %p %d %p\n", (void *)base,
 			      entries, ptp));
 		pmap_pte_clearbits(ptp, PG_RW);
+	}
 	s = splvm();
 	xpq_queue_set_ldt(base, entries);
 	xpq_flush_queue();
 	splx(s);
+}
 #ifdef XENDEBUG
 void xpq_debug_dump(void);
 #endif
 #define XPQUEUE_SIZE 2048
 static mmu_update_t xpq_queue[XPQUEUE_SIZE];
 static int xpq_idx = 0;
 void
 xpq_flush_queue(void)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xen_bus_dma.c,v 1.16 2010/01/23 22:32:42 cegger Exp $	*/
+/*	$NetBSD: xen_bus_dma.c,v 1.17 2010/02/12 01:55:46 jym Exp $	*/
 /*	NetBSD bus_dma.c,v 1.21 2005/04/16 07:53:35 yamt Exp */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.16 2010/01/23 22:32:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.c,v 1.17 2010/02/12 01:55:46 jym Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <machine/bus.h>
 #include <machine/bus_private.h>
 #include <uvm/uvm_extern.h>
 extern paddr_t avail_end;
 @@ -132,27 +132,26 @@ _xen_alloc_contig(bus_size_t size, bus_s
 		pgnext = pg->pageq.queue.tqe_next;
 		pa = VM_PAGE_TO_PHYS(pg);
 		xpmap_phys_to_machine_mapping[
 		    (pa - XPMAP_OFFSET) >> PAGE_SHIFT] = mfn+i;
 		xpq_queue_machphys_update(((paddr_t)(mfn+i)) << PAGE_SHIFT, pa);
 		/* while here, give extra pages back to UVM */
 		if (i >= npagesreq) {
 			TAILQ_REMOVE(mlistp, pg, pageq.queue);
 			uvm_pagefree(pg);
+		}
+	}
 	/* Flush updates through and flush the TLB */
 	xpq_queue_tlb_flush();
 	xpq_flush_queue();
 	splx(s);
 	return 0;
 failed:
 	/*
 	 * Attempt to recover from a failed decrease or increase reservation:
 	 * if decrease_reservation failed, we don't have given all pages
 	 * back to Xen; give them back to UVM, and get the missing pages
 	 * from Xen.
 	 * if increase_reservation failed, we expect pg to be NULL and we just
 	 * get back the missing pages from Xen one by one.
 	 */
 	/* give back remaining pages to UVM */
 @@ -175,27 +174,26 @@ failed:
 			printf("xen_alloc_contig: recovery "
 			    "XENMEM_increase_reservation failed!\n");
 			break;
+		}
 		pa = VM_PAGE_TO_PHYS(pg);
 		xpmap_phys_to_machine_mapping[
 		    (pa - XPMAP_OFFSET) >> PAGE_SHIFT] = mfn;
 		xpq_queue_machphys_update(((paddr_t)mfn) << PAGE_SHIFT, pa);
 		TAILQ_REMOVE(mlistp, pg, pageq.queue);
 		uvm_pagefree(pg);
+	}
 	/* Flush updates through and flush the TLB */
 	xpq_queue_tlb_flush();
 	xpq_flush_queue();
 	splx(s);
 	return error;
+}
 /*
  * Allocate physical memory from the given physical address range.
  * Called by DMA-safe memory allocation methods.
  * We need our own version to deal with physical vs machine addresses.
  */
 int
 _xen_bus_dmamem_alloc_range(bus_dma_tag_t t, bus_size_t size,
     bus_size_t alignment, bus_size_t boundary, bus_dma_segment_t *segs,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xenfunc.c,v 1.9 2009/10/23 02:32:34 snj Exp $	*/
+/*	$NetBSD: xenfunc.c,v 1.10 2010/02/12 01:55:46 jym Exp $	*/
 /*
+ *
  * Copyright (c) 2004 Christian Limpach.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.9 2009/10/23 02:32:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.10 2010/02/12 01:55:46 jym Exp $");
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
 #include <machine/intr.h>
 #include <machine/vmparam.h>
 #include <machine/pmap.h>
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 //#include <xen/evtchn.h>
 #include <xen/xenpmap.h>
 #include <machine/pte.h>
 @@ -45,27 +45,26 @@ __KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v
 #ifdef XENDEBUG_LOW
 #define	__PRINTK(x) printk x
 #else
 #define	__PRINTK(x)
 #endif
 void xen_set_ldt(vaddr_t, uint32_t);
 void
 invlpg(vaddr_t addr)
+{
 	int s = splvm();
 	xpq_queue_invlpg(addr);
 	xpq_flush_queue();
 	splx(s);
+}
 #ifndef __x86_64__
 void
 lldt(u_short sel)
+{
 	struct cpu_info *ci;
 	ci = curcpu();
 	if (ci->ci_curldt == sel)
 		return;
 @@ -94,37 +93,35 @@ lcr0(u_long val)
 u_long
 rcr0(void)
+{
 	__PRINTK(("XXX rcr0 not supported\n"));
 	return 0;
+}
 #ifndef __x86_64__
 void
 lcr3(vaddr_t val)
+{
 	int s = splvm();
 	xpq_queue_pt_switch(xpmap_ptom_masked(val));
 	xpq_flush_queue();
 	splx(s);
+}
 #endif
 void
 tlbflush(void)
+{
 	int s = splvm();
 	xpq_queue_tlb_flush();
 	xpq_flush_queue();
 	splx(s);
+}
 void
 tlbflushg(void)
+{
 	tlbflush();
+}
 vaddr_t
 rdr6(void)
+{
 	u_int val;