 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.102 2021/03/10 18:29:07 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.103 2021/03/11 04:43:47 thorpej 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.102 2021/03/10 18:29:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.103 2021/03/11 04:43:47 thorpej 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>
 @@ -3368,53 +3368,49 @@ pmap_bootstrap1(paddr_t kernelstart, pad
+		}
+	}
 	/*
 	 * Make sure kernel vsid is allocated as well as VSID 0.
 	 */
 	pmap_vsid_bitmap[(KERNEL_VSIDBITS & (NPMAPS-1)) / VSID_NBPW]
 		|= 1 << (KERNEL_VSIDBITS % VSID_NBPW);
 	pmap_vsid_bitmap[(PHYSMAP_VSIDBITS & (NPMAPS-1)) / VSID_NBPW]
 		|= 1 << (PHYSMAP_VSIDBITS % VSID_NBPW);
 	pmap_vsid_bitmap[0] |= 1;
 	/*
-	 * Initialize kernel pmap and hardware.
+	 * Initialize kernel pmap.
 	 */
 #if defined(PMAP_OEA) || defined(PMAP_OEA64_BRIDGE)
 /* PMAP_OEA64_BRIDGE does support these instructions */
 #if defined (PMAP_OEA) || defined (PMAP_OEA64_BRIDGE)
 	for (i = 0; i < 16; i++) {
 #if defined(PPC_OEA601)
 	    /* XXX wedges for segment register 0xf , so set later */
 	    if ((iosrtable[i] & SR601_T) && ((MFPVR() >> 16) == MPC601))
 		    continue;
 #endif
  		pmap_kernel()->pm_sr[i] = KERNELN_SEGMENT(i)|SR_PRKEY;
+	}
 	pmap_kernel()->pm_vsid = KERNEL_VSIDBITS;
 	pmap_kernel()->pm_sr[KERNEL_SR] = KERNEL_SEGMENT|SR_SUKEY|SR_PRKEY;
 #ifdef KERNEL2_SR
 	pmap_kernel()->pm_sr[KERNEL2_SR] = KERNEL2_SEGMENT|SR_SUKEY|SR_PRKEY;
 #endif
 #endif /* PMAP_OEA || PMAP_OEA64_BRIDGE */
 #if defined (PMAP_OEA)
-	for (i = 0; i < 16; i++) {
+#if defined(PMAP_OEA) && defined(PPC_OEA601)
-		if (iosrtable[i] & SR601_T) {
+	if ((MFPVR() >> 16) == MPC601)) {
-			pmap_kernel()->pm_sr[i] = iosrtable[i];
+		for (i = 0; i < 16; i++) {
 			if (iosrtable[i] & SR601_T) {
 				pmap_kernel()->pm_sr[i] = iosrtable[i];
+			}
+		}
+	}
-#endif
+#endif /* PMAP_OEA && PPC_OEA601 */
 #ifdef ALTIVEC
 	pmap_use_altivec = cpu_altivec;
 #endif
 #ifdef DEBUG
 	if (pmapdebug & PMAPDEBUG_BOOT) {
 		u_int cnt;
 		uvm_physseg_t bank;
 		char pbuf[9];
 		for (cnt = 0, bank = uvm_physseg_get_first();
 		     uvm_physseg_valid_p(bank);
 		     bank = uvm_physseg_get_next(bank)) {
 @@ -3490,63 +3486,58 @@ pmap_bootstrap1(paddr_t kernelstart, pad
 			ptegidx = va_to_pteg(pm, va);
 			if (va < 0x3000)
 				pmap_pte_create(&pt, pm, va, pa | PTE_M|PTE_BR);
 			else
 				pmap_pte_create(&pt, pm, va, pa | PTE_M|PTE_BW);
 			pmap_pte_insert(ptegidx, &pt);
+		}
 		for (va = kernelend, pa = kernelend; va < SEGMENT_LENGTH;
 		    pa += PAGE_SIZE, va += PAGE_SIZE) {
 			ptegidx = va_to_pteg(pm, va);
 			pmap_pte_create(&pt, pm, va, pa | PTE_M|PTE_BW);
 			pmap_pte_insert(ptegidx, &pt);
+		}
-#endif
+#endif /* PMAP_NEED_FULL_MAPKERNEL */
+	}
-#endif
+#endif /* PMAP_NEED_MAPKERNEL */
+}
 /*
  * Using the data structures prepared in pmap_bootstrap1(), program
  * the MMU hardware.
  */
 void
 pmap_bootstrap2(void)
+{
-/* PMAP_OEA64_BRIDGE does support these instructions */
+#if defined(PMAP_OEA) || defined(PMAP_OEA64_BRIDGE)
 #if defined (PMAP_OEA) || defined (PMAP_OEA64_BRIDGE)
 	for (int i = 0; i < 16; i++) {
 #if defined(PPC_OEA601)
 		/* XXX wedges for segment register 0xf , so set later */
 		if ((iosrtable[i] & SR601_T) && ((MFPVR() >> 16) == MPC601))
 			continue;
 #endif /* PPC_OEA601 */
 		__asm volatile("mtsrin %0,%1"
 			:: "r"(pmap_kernel()->pm_sr[i]),
 			   "r"(i << ADDR_SR_SHFT));
+	}
 #endif /* PMAP_OEA || PMAP_OEA64_BRIDGE */
 #if defined (PMAP_OEA)
 #if defined(PMAP_OEA)
 	 __asm volatile("sync; mtsdr1 %0; isync"
 		:: "r"((uintptr_t)pmap_pteg_table | (pmap_pteg_mask >> 10)));
-#elif defined (PMAP_OEA64) || defined (PMAP_OEA64_BRIDGE)
+#elif defined(PMAP_OEA64) || defined(PMAP_OEA64_BRIDGE)
 	__asm __volatile("sync; mtsdr1 %0; isync"
 		:: "r"((uintptr_t)pmap_pteg_table |
 		       (32 - __builtin_clz(pmap_pteg_mask >> 11))));
 #endif
 	tlbia();
 #if defined(PMAPDEBUG)
-	if ( pmapdebug )
+	if (pmapdebug)
 	    pmap_print_mmuregs();
 #endif
+}
 /*
  * This is not part of the defined PMAP interface and is specific to the
  * PowerPC architecture.  This is called during initppc, before the system
  * is really initialized.
  */
 void
 pmap_bootstrap(paddr_t kernelstart, paddr_t kernelend)
+{
 	pmap_bootstrap1(kernelstart, kernelend);