 @@ -1,14 +1,14 @@
-#	$NetBSD: files.powerpc,v 1.98 2021/03/05 06:06:34 rin Exp $
+#	$NetBSD: files.powerpc,v 1.99 2022/02/16 23:31:13 riastradh Exp $
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
 defflag	opt_openpic.h	OPENPIC_DISTRIBUTE
 defparam opt_ppcparam.h	L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE VERBOSE_INITPPC PPC_CPU_FREQ
 defflag	opt_ppcarch.h	PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_IBM440 PPC_BOOKE
 defflag opt_ppccache.h	CACHE_PROTO_MEI
 defflag opt_pmap.h	PMAPDEBUG PMAPCHECK PMAPCOUNTERS PMAP_MINIMALTLB PMAP_TLBDEBUG
 defparam opt_pmap.h	PTEGCOUNT PMAP_MEMLIMIT
 file	arch/powerpc/powerpc/core_machdep.c		coredump
 file	arch/powerpc/powerpc/fixup.c
 file	arch/powerpc/powerpc/kgdb_machdep.c		kgdb
 file	arch/powerpc/powerpc/kobj_machdep.c		modular
 @@ -41,26 +41,27 @@ file	arch/powerpc/ibm4xx/copyoutstr.c		p
 # MPC (Motorola PowerPC) 6xx Family files (60x,74x,75x,74xx), IBM 970 family (bridge mode??)
+#
 defparam opt_oea.h EXTMAP_RANGES=20
 file	arch/powerpc/oea/altivec.c			(ppc_oea |ppc_oea64 | ppc_oea64_bridge) & altivec
 file	arch/powerpc/oea/cpu_subr.c			ppc_oea | ppc_oea64 | ppc_oea64_bridge | ppc_oea601
 file	arch/powerpc/oea/cpu_speedctl.c			ppc_oea64 | ppc_oea64_bridge
 file	arch/powerpc/oea/oea_machdep.c			ppc_oea | ppc_oea64 | ppc_oea64_bridge | ppc_oea601
 file	arch/powerpc/oea/pmap.c				ppc_oea | ppc_oea601
 file	arch/powerpc/oea/pmap64.c			ppc_oea64
 file	arch/powerpc/oea/pmap64_bridge.c		ppc_oea64_bridge
 file	arch/powerpc/oea/pmap_kernel.c			ppc_oea | ppc_oea64 | ppc_oea64_bridge | ppc_oea601
 file	arch/powerpc/powerpc/trap.c			ppc_oea | ppc_oea64 | ppc_oea64_bridge | ppc_oea601
 file	uvm/pmap/pmap_pvt.c				ppc_oea | ppc_oea601 | ppc_oea64
 # PPC BookE (MPC85xx) Family files
 file	arch/powerpc/booke/booke_machdep.c		ppc_booke
 file	arch/powerpc/booke/booke_cache.c		ppc_booke
 file	arch/powerpc/booke/booke_pmap.c			ppc_booke
 file	arch/powerpc/booke/booke_stubs.c		ppc_booke
 file	arch/powerpc/booke/copyin.c			ppc_booke
 file	arch/powerpc/booke/copyout.c			ppc_booke
 file	arch/powerpc/booke/kcopy.c			ppc_booke
 file	arch/powerpc/booke/spe.c			ppc_booke
 file	arch/powerpc/booke/trap.c			ppc_booke
 # MPC8xx (Power QUICC 1) Family files

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.h,v 1.35 2021/03/12 04:57:42 thorpej Exp $	*/
+/*	$NetBSD: pmap.h,v 1.36 2022/02/16 23:31:13 riastradh Exp $	*/
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * 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
 @@ -80,26 +80,27 @@ struct pmap_ops {
 	void (*pmapop_reference)(pmap_t);
 	void (*pmapop_destroy)(pmap_t);
 	void (*pmapop_copy)(pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t);
 	void (*pmapop_update)(pmap_t);
 	int (*pmapop_enter)(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int);
 	void (*pmapop_remove)(pmap_t, vaddr_t, vaddr_t);
 	void (*pmapop_kenter_pa)(vaddr_t, paddr_t, vm_prot_t, u_int);
 	void (*pmapop_kremove)(vaddr_t, vsize_t);
 	bool (*pmapop_extract)(pmap_t, vaddr_t, paddr_t *);
 	void (*pmapop_protect)(pmap_t, vaddr_t, vaddr_t, vm_prot_t);
 	void (*pmapop_unwire)(pmap_t, vaddr_t);
 	void (*pmapop_page_protect)(struct vm_page *, vm_prot_t);
 	void (*pmapop_pv_protect)(paddr_t, vm_prot_t);
 	bool (*pmapop_query_bit)(struct vm_page *, int);
 	bool (*pmapop_clear_bit)(struct vm_page *, int);
 	void (*pmapop_activate)(struct lwp *);
 	void (*pmapop_deactivate)(struct lwp *);
 	void (*pmapop_pinit)(pmap_t);
 	void (*pmapop_procwr)(struct proc *, vaddr_t, size_t);
 	void (*pmapop_pte_print)(volatile struct pte *);
 	void (*pmapop_pteg_check)(void);
 	void (*pmapop_print_mmuregs)(void);
 	void (*pmapop_print_pte)(pmap_t, vaddr_t);
 @@ -237,30 +238,39 @@ int pmap_setup_segment0_map(int use_larg
 #endif
 #define PMAP_MD_PREFETCHABLE		0x2000000
 #define PMAP_STEAL_MEMORY
 #define PMAP_NEED_PROCWR
 void pmap_zero_page(paddr_t);
 void pmap_copy_page(paddr_t, paddr_t);
 LIST_HEAD(pvo_head, pvo_entry);
 #define	__HAVE_VM_PAGE_MD
 struct pmap_page {
 	unsigned int pp_attrs;
 	struct pvo_head pp_pvoh;
 #ifdef MODULAR
 	uintptr_t pp_dummy[3];
 #endif
 };
 struct vm_page_md {
-	unsigned int mdpg_attrs;
+	struct pmap_page mdpg_pp;
-	struct pvo_head mdpg_pvoh;
+#define	mdpg_attrs	mdpg_pp.pp_attrs
 #define	mdpg_pvoh	mdpg_pp.pp_pvoh
 #ifdef MODULAR
-	uintptr_t mdpg_dummy[3];
+#define	mdpg_dummy	mdpg_pp.pp_dummy
 #endif
 };
 #define	VM_MDPAGE_INIT(pg) do {			\
 	(pg)->mdpage.mdpg_attrs = 0;		\
 	LIST_INIT(&(pg)->mdpage.mdpg_pvoh);	\
 } while (/*CONSTCOND*/0)
 __END_DECLS
 #endif	/* _KERNEL */
 #endif	/* _POWERPC_OEA_PMAP_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.107 2021/07/19 14:49:45 chs Exp $	*/
+/*	$NetBSD: pmap.c,v 1.108 2022/02/16 23:31:13 riastradh Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas <matt@3am-software.com> of Allegro Networks, Inc.
+ *
  * Support for PPC64 Bridge mode added by Sanjay Lal <sanjayl@kymasys.com>
  * of Kyma Systems LLC.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -53,27 +53,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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: pmap.c,v 1.107 2021/07/19 14:49:45 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.108 2022/02/16 23:31:13 riastradh Exp $");
 #define	PMAP_NOOPNAMES
 #ifdef _KERNEL_OPT
 #include "opt_altivec.h"
 #include "opt_multiprocessor.h"
 #include "opt_pmap.h"
 #include "opt_ppcarch.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 @@ -204,26 +204,27 @@ STATIC pmap_t pmap_create(void);
 STATIC void pmap_reference(pmap_t);
 STATIC void pmap_destroy(pmap_t);
 STATIC void pmap_copy(pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t);
 STATIC void pmap_update(pmap_t);
 STATIC int pmap_enter(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int);
 STATIC void pmap_remove(pmap_t, vaddr_t, vaddr_t);
 STATIC void pmap_kenter_pa(vaddr_t, paddr_t, vm_prot_t, u_int);
 STATIC void pmap_kremove(vaddr_t, vsize_t);
 STATIC bool pmap_extract(pmap_t, vaddr_t, paddr_t *);
 STATIC void pmap_protect(pmap_t, vaddr_t, vaddr_t, vm_prot_t);
 STATIC void pmap_unwire(pmap_t, vaddr_t);
 STATIC void pmap_page_protect(struct vm_page *, vm_prot_t);
 STATIC void pmap_pv_protect(paddr_t, vm_prot_t);
 STATIC bool pmap_query_bit(struct vm_page *, int);
 STATIC bool pmap_clear_bit(struct vm_page *, int);
 STATIC void pmap_activate(struct lwp *);
 STATIC void pmap_deactivate(struct lwp *);
 STATIC void pmap_pinit(pmap_t pm);
 STATIC void pmap_procwr(struct proc *, vaddr_t, size_t);
 #if defined(DEBUG) || defined(PMAPCHECK) || defined(DDB)
 STATIC void pmap_pte_print(volatile struct pte *);
 STATIC void pmap_pteg_check(void);
 STATIC void pmap_print_mmuregs(void);
 @@ -635,59 +636,76 @@ pmap_pte_to_va(volatile const struct pte
 	/* PPC Bits 0-3 */
 	va |= VSID_TO_SR(pt->pte_hi >> PTE_VSID_SHFT) << ADDR_SR_SHFT;
 #endif
 	return va;
+}
 #endif
 static inline struct pvo_head *
 pa_to_pvoh(paddr_t pa, struct vm_page **pg_p)
+{
 	struct vm_page *pg;
 	struct vm_page_md *md;
 	struct pmap_page *pp;
 	pg = PHYS_TO_VM_PAGE(pa);
 	if (pg_p != NULL)
 		*pg_p = pg;
-	if (pg == NULL)
+	if (pg == NULL) {
 		if ((pp = pmap_pv_tracked(pa)) != NULL)
 			return &pp->pp_pvoh;
 		return NULL;
+	}
 	md = VM_PAGE_TO_MD(pg);
 	return &md->mdpg_pvoh;
+}
 static inline struct pvo_head *
 vm_page_to_pvoh(struct vm_page *pg)
+{
 	struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
 	return &md->mdpg_pvoh;
+}
 static inline void
 pmap_pp_attr_clear(struct pmap_page *pp, int ptebit)
+{
 	pp->pp_attrs &= ptebit;
+}
 static inline void
 pmap_attr_clear(struct vm_page *pg, int ptebit)
+{
 	struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
-	md->mdpg_attrs &= ~ptebit;
+	pmap_pp_attr_clear(&md->mdpg_pp, ptebit);
+}
 static inline int
 pmap_pp_attr_fetch(struct pmap_page *pp)
+{
 	return pp->pp_attrs;
+}
 static inline int
 pmap_attr_fetch(struct vm_page *pg)
+{
 	struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
-	return md->mdpg_attrs;
+	return pmap_pp_attr_fetch(&md->mdpg_pp);
+}
 static inline void
 pmap_attr_save(struct vm_page *pg, int ptebit)
+{
 	struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
 	md->mdpg_attrs |= ptebit;
+}
 static inline int
 pmap_pte_compare(const volatile struct pte *pt, const struct pte *pvo_pt)
+{
 @@ -2264,58 +2282,55 @@ pmap_unwire(pmap_t pm, vaddr_t va)
 	msr = pmap_interrupts_off();
 	pvo = pmap_pvo_find_va(pm, va, NULL);
 	if (pvo != NULL) {
 		if (PVO_WIRED_P(pvo)) {
 			pvo->pvo_vaddr &= ~PVO_WIRED;
 			pm->pm_stats.wired_count--;
+		}
 		PMAP_PVO_CHECK(pvo);		/* sanity check */
+	}
 	pmap_interrupts_restore(msr);
 	PMAP_UNLOCK();
+}
-/*
+static void
- * Lower the protection on the specified physical page.
+pmap_pp_protect(struct pmap_page *pp, paddr_t pa, vm_prot_t prot)
  */
 void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
+{
 	struct pvo_head *pvo_head, pvol;
 	struct pvo_entry *pvo, *next_pvo;
 	volatile struct pte *pt;
 	register_t msr;
 	PMAP_LOCK();
 	KASSERT(prot != VM_PROT_ALL);
 	LIST_INIT(&pvol);
 	msr = pmap_interrupts_off();
 	/*
 	 * When UVM reuses a page, it does a pmap_page_protect with
 	 * VM_PROT_NONE.  At that point, we can clear the exec flag
 	 * since we know the page will have different contents.
 	 */
 	if ((prot & VM_PROT_READ) == 0) {
 		DPRINTFN(EXEC, "[pmap_page_protect: %#" _PRIxpa ": clear-exec]\n",
-		    VM_PAGE_TO_PHYS(pg));
+		    pa);
-		if (pmap_attr_fetch(pg) & PTE_EXEC) {
+		if (pmap_pp_attr_fetch(pp) & PTE_EXEC) {
 			PMAPCOUNT(exec_uncached_page_protect);
-			pmap_attr_clear(pg, PTE_EXEC);
+			pmap_pp_attr_clear(pp, PTE_EXEC);
+		}
+	}
-	pvo_head = vm_page_to_pvoh(pg);
+	pvo_head = &pp->pp_pvoh;
 	for (pvo = LIST_FIRST(pvo_head); pvo != NULL; pvo = next_pvo) {
 		next_pvo = LIST_NEXT(pvo, pvo_vlink);
 		PMAP_PVO_CHECK(pvo);		/* sanity check */
 		/*
 		 * Downgrading to no mapping at all, we just remove the entry.
 		 */
 		if ((prot & VM_PROT_READ) == 0) {
 			pmap_pvo_remove(pvo, -1, &pvol);
 			continue;
+		}
 		/*
 @@ -2346,26 +2361,52 @@ pmap_page_protect(struct vm_page *pg, vm
 			pmap_pte_change(pt, &pvo->pvo_pte, pvo->pvo_vaddr);
 			PVO_WHERE(pvo, PMAP_PAGE_PROTECT);
 			PMAPCOUNT(ptes_changed);
+		}
 		PMAP_PVO_CHECK(pvo);		/* sanity check */
+	}
 	pmap_interrupts_restore(msr);
 	pmap_pvo_free_list(&pvol);
 	PMAP_UNLOCK();
+}
 /*
  * Lower the protection on the specified physical page.
  */
 void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
+{
 	struct vm_page_md *md = VM_PAGE_TO_MD(pg);
 	pmap_pp_protect(&md->mdpg_pp, VM_PAGE_TO_PHYS(pg), prot);
+}
 /*
  * Lower the protection on the physical page at the specified physical
  * address, which may not be managed and so may not have a struct
  * vm_page.
  */
 void
 pmap_pv_protect(paddr_t pa, vm_prot_t prot)
+{
 	struct pmap_page *pp;
 	if ((pp = pmap_pv_tracked(pa)) == NULL)
 		return;
 	pmap_pp_protect(pp, pa, prot);
+}
 /*
  * Activate the address space for the specified process.  If the process
  * is the current process, load the new MMU context.
  */
 void
 pmap_activate(struct lwp *l)
+{
 	struct pcb *pcb = lwp_getpcb(l);
 	pmap_t pmap = l->l_proc->p_vmspace->vm_map.pmap;
 	DPRINTFN(ACTIVATE,
 	    "pmap_activate: lwp %p (curlwp %p)\n", l, curlwp);
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap_kernel.c,v 1.12 2021/03/02 01:47:44 thorpej Exp $	*/
+/*	$NetBSD: pmap_kernel.c,v 1.13 2022/02/16 23:31:13 riastradh Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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
 @@ -20,27 +20,27 @@
  * 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(1, "$NetBSD: pmap_kernel.c,v 1.12 2021/03/02 01:47:44 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.13 2022/02/16 23:31:13 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altivec.h"
 #include "opt_ddb.h"
 #include "opt_pmap.h"
 #endif
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
 #ifdef ALTIVEC
 int pmap_use_altivec;
 #endif
 @@ -205,26 +205,32 @@ pmap_protect(pmap_t pm, vaddr_t start, v
 void
 pmap_unwire(pmap_t pm, vaddr_t va)
+{
 	(*pmapops->pmapop_unwire)(pm, va);
+}
 void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
+{
 	(*pmapops->pmapop_page_protect)(pg, prot);
+}
 void
 pmap_pv_protect(paddr_t pa, vm_prot_t prot)
+{
 	(*pmapops->pmapop_pv_protect)(pa, prot);
+}
 bool
 pmap_query_bit(struct vm_page *pg, int ptebit)
+{
 	return (*pmapops->pmapop_query_bit)(pg, ptebit);
+}
 bool
 pmap_clear_bit(struct vm_page *pg, int ptebit)
+{
 	return (*pmapops->pmapop_clear_bit)(pg, ptebit);
+}
 void

 @@ -1,37 +1,39 @@
-/*	$NetBSD: pmap.h,v 1.40 2020/07/06 08:17:01 rin Exp $	*/
+/*	$NetBSD: pmap.h,v 1.41 2022/02/16 23:31:13 riastradh Exp $	*/
 #ifndef _POWERPC_PMAP_H_
 #define _POWERPC_PMAP_H_
 #ifdef _KERNEL_OPT
 #include "opt_ppcarch.h"
 #include "opt_modular.h"
 #endif
 #if !defined(_MODULE)
 #if defined(PPC_BOOKE)
 #include <powerpc/booke/pmap.h>
 #elif defined(PPC_IBM4XX)
 #include <powerpc/ibm4xx/pmap.h>
 #elif defined(PPC_OEA) || defined (PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
 #include <powerpc/oea/pmap.h>
 #elif defined(_KERNEL)
 #error unknown PPC variant
 #endif
 #endif /* !_MODULE */
 #include <uvm/pmap/pmap_pvt.h>
 #if !defined(_LOCORE) && (defined(MODULAR) || defined(_MODULE))
 /*
  * Both BOOKE and OEA use __HAVE_VM_PAGE_MD but IBM4XX doesn't so define
  * a compatible vm_page_md so that struct vm_page is the same size for all
  * PPC variants.
  */
 #ifndef __HAVE_VM_PAGE_MD
 #define __HAVE_VM_PAGE_MD
 #define VM_MDPAGE_INIT(pg) __nothing
 struct vm_page_md {
 	uintptr_t mdpg_dummy[5];
 };