 @@ -1,14 +1,14 @@
-/* $NetBSD: locore.s,v 1.125 2020/06/30 16:20:00 maxv Exp $ */
+/* $NetBSD: locore.s,v 1.126 2020/09/03 02:09:09 thorpej Exp $ */
 /*-
  * Copyright (c) 1999, 2000, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * 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:
  * 1. Redistributions of source code must retain the above copyright
 @@ -57,27 +57,27 @@
  * rights to redistribute these changes.
  */
 .stabs	__FILE__,100,0,0,kernel_text
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #include "opt_compat_netbsd.h"
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.125 2020/06/30 16:20:00 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.126 2020/09/03 02:09:09 thorpej Exp $");
 #include "assym.h"
 .stabs	__FILE__,132,0,0,kernel_text
 /*
  * Perform actions necessary to switch to a new context.  The
  * hwpcb should be in a0.  Clobbers v0, t0, t8..t11, a0.
  */
 #define	SWITCH_CONTEXT							\
 	/* Make a note of the context we're running on. */		\
 	GET_CURPCB						;	\
 	stq	a0, 0(v0)					;	\
 @@ -116,26 +116,27 @@ bootstack:
 /*
  * locorestart: Kernel start. This is no longer the actual entry
  * point, although jumping to here (the first kernel address) will
  * in fact work just fine.
+ *
  * Arguments:
  *	a0 is the first free page frame number (PFN)
  *	a1 is the page table base register (PTBR)
  *	a2 is the bootinfo magic number
  *	a3 is the pointer to the bootinfo structure
+ *
  * All arguments are passed to alpha_init().
  */
 IMPORT(prom_mapped, 4)
 NESTED_NOPROFILE(locorestart,1,0,ra,0,0)
 	br	pv,1f
 :	LDGP(pv)
 	/* Switch to the boot stack. */
 	lda	sp,bootstack
 	/* Load KGP with current GP. */
 	mov	a0, s0			/* save pfn */
 	mov	gp, a0
 	call_pal PAL_OSF1_wrkgp		/* clobbers a0, t0, t8-t11 */
 	mov	s0, a0			/* restore pfn */
 @@ -147,26 +148,30 @@ NESTED_NOPROFILE(locorestart,1,0,ra,0,0)
 	CALL(alpha_init)
 	/* Set up the virtual page table pointer. */
 	ldiq	a0, VPTBASE
 	call_pal PAL_OSF1_wrvptptr	/* clobbers a0, t0, t8-t11 */
 	/*
 	 * Switch to lwp0's PCB.
 	 */
 	lda	a0, lwp0
 	ldq	a0, L_MD_PCBPADDR(a0)		/* phys addr of PCB */
 	SWITCH_CONTEXT
 	/* PROM is no longer mapped. */
 	lda	t0, prom_mapped
 	stl	zero, 0(t0)
 	/*
 	 * We've switched to a new page table base, so invalidate the TLB
 	 * and I-stream.  This happens automatically everywhere but here.
 	 */
 	ldiq	a0, -2				/* TBIA */
 	call_pal PAL_OSF1_tbi
 	call_pal PAL_imb
 	/*
 	 * All ready to go!  Call main()!
 	 */
 	CALL(main)

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.362 2020/09/02 17:40:23 riastradh Exp $ */
+/* $NetBSD: machdep.c,v 1.363 2020/09/03 02:09:09 thorpej Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * 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
 @@ -57,27 +57,27 @@
  * rights to redistribute these changes.
  */
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include "opt_dec_3000_300.h"
 #include "opt_dec_3000_500.h"
 #include "opt_execfmt.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.362 2020/09/02 17:40:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.363 2020/09/03 02:09:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 #include <sys/ras.h>
 #include <sys/sched.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 @@ -289,44 +289,44 @@ alpha_init(u_long xxx_pfn __unused, u_lo
 			} else {
 				bootinfo.hwrpb_phys =
 				    ((struct rpb *)HWRPB_ADDR)->rpb_phys;
 				bootinfo.hwrpb_size =
 				    ((struct rpb *)HWRPB_ADDR)->rpb_size;
+			}
 			memcpy(bootinfo.boot_flags, v1p->boot_flags,
 			    uimin(sizeof v1p->boot_flags,
 			      sizeof bootinfo.boot_flags));
 			memcpy(bootinfo.booted_kernel, v1p->booted_kernel,
 			    uimin(sizeof v1p->booted_kernel,
 			      sizeof bootinfo.booted_kernel));
 			/* booted dev not provided in bootinfo */
-			init_prom_interface((struct rpb *)
+			init_prom_interface(ptb, (struct rpb *)
 			    ALPHA_PHYS_TO_K0SEG(bootinfo.hwrpb_phys));
 	        	prom_getenv(PROM_E_BOOTED_DEV, bootinfo.booted_dev,
 			    sizeof bootinfo.booted_dev);
 			break;
+		}
 		default:
 			bootinfo_msg = "unknown bootinfo version";
 			goto nobootinfo;
+		}
 	} else {
 		bootinfo_msg = "boot program did not pass bootinfo";
 nobootinfo:
 		bootinfo.ssym = (u_long)_end;
 		bootinfo.esym = (u_long)_end;
 		bootinfo.hwrpb_phys = ((struct rpb *)HWRPB_ADDR)->rpb_phys;
 		bootinfo.hwrpb_size = ((struct rpb *)HWRPB_ADDR)->rpb_size;
-		init_prom_interface((struct rpb *)HWRPB_ADDR);
+		init_prom_interface(ptb, (struct rpb *)HWRPB_ADDR);
 		prom_getenv(PROM_E_BOOTED_OSFLAGS, bootinfo.boot_flags,
 		    sizeof bootinfo.boot_flags);
 		prom_getenv(PROM_E_BOOTED_FILE, bootinfo.booted_kernel,
 		    sizeof bootinfo.booted_kernel);
 		prom_getenv(PROM_E_BOOTED_DEV, bootinfo.booted_dev,
 		    sizeof bootinfo.booted_dev);
+	}
 	/*
 	 * Initialize the kernel's mapping of the RPB.  It's needed for
 	 * lots of things.
 	 */
 	hwrpb = (struct rpb *)ALPHA_PHYS_TO_K0SEG(bootinfo.hwrpb_phys);
 @@ -365,37 +365,30 @@ nobootinfo:
 	trap_init();
 	/*
 	 * Find out this system's page size, and initialize
 	 * PAGE_SIZE-dependent variables.
 	 */
 	if (hwrpb->rpb_page_size != ALPHA_PGBYTES)
 		panic("page size %lu != %d?!", hwrpb->rpb_page_size,
 		    ALPHA_PGBYTES);
 	uvmexp.pagesize = hwrpb->rpb_page_size;
 	uvm_md_init();
 	/*
-	 * Find out what hardware we're on, and do basic initialization.
+	 * cputype has been initialized in init_prom_interface().
 	 * Perform basic platform initialization using this info.
 	 */
-	cputype = hwrpb->rpb_type;
+	KASSERT(prom_interface_initialized);
 	if (cputype < 0) {
 		/*
 		 * At least some white-box systems have SRM which
 		 * reports a systype that's the negative of their
 		 * blue-box counterpart.
 		 */
 		cputype = -cputype;
 	c = platform_lookup(cputype);
 	if (c == NULL) {
 		platform_not_supported();
 		/* NOTREACHED */
+	}
 	(*c->init)();
 	cpu_setmodel("%s", platform.model);
 	/*
 	 * Initialize the real console, so that the bootstrap console is
 	 * no longer necessary.
 	 */
 	(*platform.cons_init)();
 @@ -406,32 +399,27 @@ nobootinfo:
 	/* We should always be running on the primary. */
 	assert(hwrpb->rpb_primary_cpu_id == cpu_id);
 	/*
 	 * On single-CPU systypes, the primary should always be CPU 0,
 	 * except on Alpha 8200 systems where the CPU id is related
 	 * to the VID, which is related to the Turbo Laser node id.
 	 */
 	if (cputype != ST_DEC_21000)
 		assert(hwrpb->rpb_primary_cpu_id == 0);
 #endif
 	/* NO MORE FIRMWARE ACCESS ALLOWED */
-#ifdef _PMAP_MAY_USE_PROM_CONSOLE
+	/* XXX Unless prom_uses_prom_console() evaluates to non-zero.) */
 	/*
 	 * XXX (unless _PMAP_MAY_USE_PROM_CONSOLE is defined and
 	 * XXX pmap_uses_prom_console() evaluates to non-zero.)
 	 */
 #endif
 	/*
 	 * Find the beginning and end of the kernel (and leave a
 	 * bit of space before the beginning for the bootstrap
 	 * stack).
 	 */
 	kernstart = trunc_page((vaddr_t)kernel_text) - 2 * PAGE_SIZE;
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksym_start = (void *)bootinfo.ssym;
 	ksym_end   = (void *)bootinfo.esym;
 	kernend = (vaddr_t)round_page((vaddr_t)ksym_end);
 #else
 	kernend = (vaddr_t)round_page((vaddr_t)_end);
 @@ -497,87 +485,76 @@ nobootinfo:
 			unusedmem += memc->mddt_pg_cnt;
 			continue;
+		}
 		if (memc->mddt_usage & MDDT_PALCODE) {
 			resvmem += memc->mddt_pg_cnt;
 			continue;
+		}
 		/*
 		 * We have a memory cluster available for system
 		 * software use.  We must determine if this cluster
 		 * holds the kernel.
 		 */
 #ifdef _PMAP_MAY_USE_PROM_CONSOLE
 		/*
 		 * XXX If the kernel uses the PROM console, we only use the
 		 * XXX memory after the kernel in the first system segment,
 		 * XXX to avoid clobbering prom mapping, data, etc.
 		 */
 	    if (!pmap_uses_prom_console() || physmem == 0) {
 #endif /* _PMAP_MAY_USE_PROM_CONSOLE */
 		physmem += memc->mddt_pg_cnt;
 		pfn0 = memc->mddt_pfn;
 		pfn1 = memc->mddt_pfn + memc->mddt_pg_cnt;
 		if (pfn0 <= kernstartpfn && kernendpfn <= pfn1) {
 			/*
 			 * Must compute the location of the kernel
 			 * within the segment.
 			 */
 #if 0
 			printf("Cluster %d contains kernel\n", i);
 #endif
-#ifdef _PMAP_MAY_USE_PROM_CONSOLE
+			if (pfn0 < kernstartpfn && !prom_uses_prom_console()) {
 		    if (!pmap_uses_prom_console()) {
 #endif /* _PMAP_MAY_USE_PROM_CONSOLE */
 			if (pfn0 < kernstartpfn) {
 				/*
 				 * There is a chunk before the kernel.
 				 */
 #if 0
 				printf("Loading chunk before kernel: "
 				    "0x%lx / 0x%lx\n", pfn0, kernstartpfn);
 #endif
 				uvm_page_physload(pfn0, kernstartpfn,
 				    pfn0, kernstartpfn, VM_FREELIST_DEFAULT);
+			}
 #ifdef _PMAP_MAY_USE_PROM_CONSOLE
 #endif /* _PMAP_MAY_USE_PROM_CONSOLE */
 			if (kernendpfn < pfn1) {
 				/*
 				 * There is a chunk after the kernel.
 				 */
 #if 0
 				printf("Loading chunk after kernel: "
 				    "0x%lx / 0x%lx\n", kernendpfn, pfn1);
 #endif
 				uvm_page_physload(kernendpfn, pfn1,
 				    kernendpfn, pfn1, VM_FREELIST_DEFAULT);
+			}
 		} else {
 			/*
 			 * Just load this cluster as one chunk.
 			 */
 #if 0
 			printf("Loading cluster %d: 0x%lx / 0x%lx\n", i,
 			    pfn0, pfn1);
 #endif
 			uvm_page_physload(pfn0, pfn1, pfn0, pfn1,
 			    VM_FREELIST_DEFAULT);
+		}
 #ifdef _PMAP_MAY_USE_PROM_CONSOLE
 #endif /* _PMAP_MAY_USE_PROM_CONSOLE */
+	}
 	/*
 	 * Dump out the MDDT if it looks odd...
 	 */
 	if (mddtweird) {
 		printf("\n");
 		printf("complete memory cluster information:\n");
 		for (i = 0; i < mddtp->mddt_cluster_cnt; i++) {
 			printf("mddt %d:\n", i);
 			printf("\tpfn %lx\n",
 			    mddtp->mddt_clusters[i].mddt_pfn);
 			printf("\tcnt %lx\n",
 @@ -803,29 +780,29 @@ module_init_md(void)
+{
 	/* nada. */
+}
 #endif /* MODULAR */
 void
 consinit(void)
+{
 	/*
 	 * Everything related to console initialization is done
 	 * in alpha_init().
 	 */
-#if defined(DIAGNOSTIC) && defined(_PMAP_MAY_USE_PROM_CONSOLE)
+#if defined(DIAGNOSTIC) && defined(_PROM_MAY_USE_PROM_CONSOLE)
 	printf("consinit: %susing prom console\n",
-	    pmap_uses_prom_console() ? "" : "not ");
+	    prom_uses_prom_console() ? "" : "not ");
 #endif
+}
 void
 cpu_startup(void)
+{
 	extern struct evcnt fpevent_use, fpevent_reuse;
 	vaddr_t minaddr, maxaddr;
 	char pbuf[9];
 #if defined(DEBUG)
 	extern int pmapdebug;
 	int opmapdebug = pmapdebug;
 @@ -955,35 +932,26 @@ identifycpu(void)
 	 */
 	printf("%s", cpu_getmodel());
 	for(s = cpu_getmodel(); *s; ++s)
 		if(strncasecmp(s, "MHz", 3) == 0)
 			goto skipMHz;
 	printf(", %ldMHz", hwrpb->rpb_cc_freq / 1000000);
 skipMHz:
 	printf(", s/n ");
 	for (i = 0; i < 10; i++)
 		printf("%c", hwrpb->rpb_ssn[i]);
 	printf("\n");
 	printf("%ld byte page size, %d processor%s.\n",
 	    hwrpb->rpb_page_size, ncpus, ncpus == 1 ? "" : "s");
 #if 0
 	/* this isn't defined for any systems that we run on? */
 	printf("serial number 0x%lx 0x%lx\n",
 	    ((long *)hwrpb->rpb_ssn)[0], ((long *)hwrpb->rpb_ssn)[1]);
 	/* and these aren't particularly useful! */
 	printf("variation: 0x%lx, revision 0x%lx\n",
 	    hwrpb->rpb_variation, *(long *)hwrpb->rpb_revision);
 #endif
+}
 int	waittime = -1;
 struct pcb dumppcb;
 void
 cpu_reboot(int howto, char *bootstr)
+{
 #if defined(MULTIPROCESSOR)
 	u_long cpu_id = cpu_number();
 	u_long wait_mask;
 	int i;
 #endif

 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.c,v 1.270 2020/09/03 02:05:03 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.271 2020/09/03 02:09:09 thorpej Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008, 2020
  * 	The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Andrew Doran and Mindaugas Rasiukevicius,
  * and by Chris G. Demetriou.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -125,42 +125,42 @@
  *	this module may delay invalidate or reduced protection
  *	operations until such time as they are actually
  *	necessary.  This module is given full information as
  *	to which processors are currently using which maps,
  *	and to when physical maps must be made correct.
  */
 #include "opt_lockdebug.h"
 #include "opt_sysv.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.270 2020/09/03 02:05:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.271 2020/09/03 02:09:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/buf.h>
 #include <sys/evcnt.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <uvm/uvm.h>
-#if defined(_PMAP_MAY_USE_PROM_CONSOLE) || defined(MULTIPROCESSOR)
+#if defined(MULTIPROCESSOR)
 #include <machine/rpb.h>
 #endif
 #ifdef DEBUG
 #define	PDB_FOLLOW	0x0001
 #define	PDB_INIT	0x0002
 #define	PDB_ENTER	0x0004
 #define	PDB_REMOVE	0x0008
 #define	PDB_CREATE	0x0010
 #define	PDB_PTPAGE	0x0020
 #define	PDB_ASN		0x0040
 #define	PDB_BITS	0x0080
 #define	PDB_COLLECT	0x0100
 @@ -1277,47 +1277,26 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
 		    (i*PAGE_SIZE)) >> PGSHIFT) << PG_SHIFT;
 		pte |= PG_V | PG_ASM | PG_KRE | PG_KWE | PG_WIRED;
 		kernel_lev1map[l1pte_index(VM_MIN_KERNEL_ADDRESS +
 		    (i*PAGE_SIZE*NPTEPG*NPTEPG))] = pte;
+	}
 	/* Map the virtual page table */
 	pte = (ALPHA_K0SEG_TO_PHYS((vaddr_t)kernel_lev1map) >> PGSHIFT)
 	    << PG_SHIFT;
 	pte |= PG_V | PG_KRE | PG_KWE; /* NOTE NO ASM */
 	kernel_lev1map[l1pte_index(VPTBASE)] = pte;
 	VPT = (pt_entry_t *)VPTBASE;
 #ifdef _PMAP_MAY_USE_PROM_CONSOLE
 	extern pt_entry_t prom_pte;			/* XXX */
 	extern int prom_mapped;				/* XXX */
 	if (pmap_uses_prom_console()) {
 		/*
 		 * XXX Save old PTE so we can remap the PROM, if
 		 * XXX necessary.
 		 */
 		prom_pte = *(pt_entry_t *)ptaddr & ~PG_ASM;
 	prom_mapped = 0;
 	/*
 	 * Actually, this code lies.  The prom is still mapped, and will
 	 * remain so until the context switch after alpha_init() returns.
 	 */
 #endif
 	/*
 	 * Set up level 2 page table.
 	 */
 	/* Map all of the level 3 pte pages */
 	for (i = 0; i < howmany(lev3mapsize, NPTEPG); i++) {
 		pte = (ALPHA_K0SEG_TO_PHYS(((vaddr_t)lev3map) +
 		    (i*PAGE_SIZE)) >> PGSHIFT) << PG_SHIFT;
 		pte |= PG_V | PG_ASM | PG_KRE | PG_KWE | PG_WIRED;
 		lev2map[l2pte_index(VM_MIN_KERNEL_ADDRESS+
 		    (i*PAGE_SIZE*NPTEPG))] = pte;
+	}
 	/* Initialize the pmap_growkernel_lock. */
 @@ -1382,35 +1361,26 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
 	/*
 	 * Set up lwp0's PCB such that the ptbr points to the right place
 	 * and has the kernel pmap's (really unused) ASN.
 	 */
 	pcb = lwp_getpcb(&lwp0);
 	pcb->pcb_hw.apcb_ptbr =
 	    ALPHA_K0SEG_TO_PHYS((vaddr_t)kernel_lev1map) >> PGSHIFT;
 	pcb->pcb_hw.apcb_asn = PMAP_ASN_KERNEL;
 	struct cpu_info * const ci = curcpu();
 	pmap_init_cpu(ci);
+}
 #ifdef _PMAP_MAY_USE_PROM_CONSOLE
 int
 pmap_uses_prom_console(void)
 	return (cputype == ST_DEC_21000);
 #endif /* _PMAP_MAY_USE_PROM_CONSOLE */
 /*
  * pmap_virtual_space:		[ INTERFACE ]
+ *
  *	Define the initial bounds of the kernel virtual address space.
  */
 void
 pmap_virtual_space(vaddr_t *vstartp, vaddr_t *vendp)
+{
 	*vstartp = VM_MIN_KERNEL_ADDRESS;	/* kernel is in K0SEG */
 	*vendp = VM_MAX_KERNEL_ADDRESS;		/* we use pmap_growkernel */
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: prom.c,v 1.53 2020/08/30 16:26:56 thorpej Exp $ */
+/* $NetBSD: prom.c,v 1.54 2020/09/03 02:09:09 thorpej Exp $ */
 /*
  * Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 @@ -17,184 +17,224 @@
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.53 2020/08/30 16:26:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.54 2020/09/03 02:09:09 thorpej Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <machine/rpb.h>
 #include <machine/alpha.h>
 #define	ENABLEPROM
 #include <machine/prom.h>
 #include <dev/cons.h>
 /* XXX this is to fake out the console routines, while booting. */
 struct consdev promcons = {
 	.cn_getc = promcngetc,
 	.cn_putc = promcnputc,
 	.cn_pollc = nullcnpollc,
 	.cn_dev = makedev(23,0),
 	.cn_pri = 1
 };
-struct rpb	*hwrpb;
+struct rpb	*hwrpb __read_mostly;
 int		alpha_console;
 extern struct prom_vec prom_dispatch_v;
-static int	prom_is_qemu;		/* XXX */
+bool		prom_interface_initialized;
 int		prom_mapped = 1;	/* Is PROM still mapped? */
 static bool	prom_is_qemu;		/* XXX */
 static kmutex_t	prom_lock;
-#ifdef _PMAP_MAY_USE_PROM_CONSOLE
+#ifdef _PROM_MAY_USE_PROM_CONSOLE
 int		prom_mapped = 1;	/* Is PROM still mapped? */
 pt_entry_t	prom_pte, saved_pte[1];	/* XXX */
 static pt_entry_t *
 prom_lev1map(void)
+{
 	struct alpha_pcb *apcb;
 	/*
 	 * Find the level 1 map that we're currently running on.
 	 */
 	apcb = (struct alpha_pcb *)ALPHA_PHYS_TO_K0SEG(curpcb);
 	return ((pt_entry_t *)ALPHA_PHYS_TO_K0SEG(apcb->apcb_ptbr << PGSHIFT));
+}
-#endif /* _PMAP_MAY_USE_PROM_CONSOLE */
+#endif /* _PROM_MAY_USE_PROM_CONSOLE */
 bool
 prom_uses_prom_console(void)
+{
 #ifdef _PROM_MAY_USE_PROM_CONSOLE
 	return (cputype == ST_DEC_21000);
 #else
 	return false;
 #endif
+}
 static void
 prom_init_cputype(const struct rpb * const rpb)
+{
 	cputype = rpb->rpb_type;
 	if (cputype < 0) {
 		/*
 		 * At least some white-box systems have SRM which
 		 * reports a systype that's the negative of their
 		 * blue-box counterpart.
 		 */
 		cputype = -cputype;
+	}
+}
 static void
 prom_check_qemu(const struct rpb * const rpb)
+{
 	if (!prom_is_qemu) {
 		if (rpb->rpb_ssn[0] == 'Q' &&
 		    rpb->rpb_ssn[1] == 'E' &&
 		    rpb->rpb_ssn[2] == 'M' &&
 		    rpb->rpb_ssn[3] == 'U') {
-			prom_is_qemu = 1;
+			prom_is_qemu = true;
+		}
+	}
+}
 void
-init_prom_interface(struct rpb *rpb)
+init_prom_interface(u_long ptb_pfn, struct rpb *rpb)
+{
 	static bool prom_interface_initialized;
 	if (prom_interface_initialized)
 		return;
 	struct crb *c;
 	prom_init_cputype(rpb);
 	prom_check_qemu(rpb);
 	c = (struct crb *)((char *)rpb + rpb->rpb_crb_off);
 	prom_dispatch_v.routine_arg = c->crb_v_dispatch;
 	prom_dispatch_v.routine = c->crb_v_dispatch->entry_va;
 #ifdef _PROM_MAY_USE_PROM_CONSOLE
 	if (prom_uses_prom_console()) {
 		/*
 		 * XXX Save old PTE so we can remap the PROM, if
 		 * XXX necessary.
 		 */
 		pt_entry_t * const l1pt =
 		    (pt_entry_t *)ALPHA_PHYS_TO_K0SEG(ptb_pfn << PGSHIFT);
 		prom_pte = l1pt[0] & ~PG_ASM;
+	}
 #endif /* _PROM_MAY_USE_PROM_CONSOLE */
 	mutex_init(&prom_lock, MUTEX_DEFAULT, IPL_HIGH);
 	prom_interface_initialized = true;
+}
 void
 init_bootstrap_console(void)
+{
 	char buf[4];
-	init_prom_interface(hwrpb);
+	/* init_prom_interface() has already been called. */
 	if (! prom_interface_initialized) {
 		prom_halt(1);
+	}
 	prom_getenv(PROM_E_TTY_DEV, buf, sizeof(buf));
 	alpha_console = buf[0] - '0';
 	/* XXX fake out the console routines, for now */
 	cn_tab = &promcons;
+}
-#ifdef _PMAP_MAY_USE_PROM_CONSOLE
+#ifdef _PROM_MAY_USE_PROM_CONSOLE
 static void prom_cache_sync(void);
 #endif
 void
 prom_enter(void)
+{
 	mutex_enter(&prom_lock);
-#ifdef _PMAP_MAY_USE_PROM_CONSOLE
+#ifdef _PROM_MAY_USE_PROM_CONSOLE
 	/*
 	 * If we have not yet switched out of the PROM's context
 	 * (i.e. the first one after alpha_init()), then the PROM
 	 * is still mapped, regardless of the `prom_mapped' setting.
 	 */
 	if (prom_mapped == 0 && curpcb != 0) {
-		if (!pmap_uses_prom_console())
+		if (!prom_uses_prom_console())
 			panic("prom_enter");
+		{
 			pt_entry_t *lev1map;
 			lev1map = prom_lev1map();	/* XXX */
 			saved_pte[0] = lev1map[0];	/* XXX */
 			lev1map[0] = prom_pte;		/* XXX */
+		}
 		prom_cache_sync();			/* XXX */
+	}
 #endif
+}
 void
 prom_leave(void)
+{
-#ifdef _PMAP_MAY_USE_PROM_CONSOLE
+#ifdef _PROM_MAY_USE_PROM_CONSOLE
 	/*
 	 * See comment above.
 	 */
 	if (prom_mapped == 0 && curpcb != 0) {
-		if (!pmap_uses_prom_console())
+		if (!prom_uses_prom_console())
 			panic("prom_leave");
+		{
 			pt_entry_t *lev1map;
 			lev1map = prom_lev1map();	/* XXX */
 			lev1map[0] = saved_pte[0];	/* XXX */
+		}
 		prom_cache_sync();			/* XXX */
+	}
 #endif
 	mutex_exit(&prom_lock);
+}
-#ifdef _PMAP_MAY_USE_PROM_CONSOLE
+#ifdef _PROM_MAY_USE_PROM_CONSOLE
 static void
 prom_cache_sync(void)
+{
 	ALPHA_TBIA();
 	alpha_pal_imb();
+}
 #endif
 /*
  * promcnputc:
+ *
  * Remap char before passing off to prom.
+ *

 @@ -1,14 +1,14 @@
-/* $NetBSD: promcons.c,v 1.40 2019/08/09 08:05:57 rin Exp $ */
+/* $NetBSD: promcons.c,v 1.41 2020/09/03 02:09:09 thorpej Exp $ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -19,53 +19,53 @@
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: promcons.c,v 1.40 2019/08/09 08:05:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: promcons.c,v 1.41 2020/09/03 02:09:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpuconf.h>
 #include <machine/prom.h>
 #ifndef CONSPEED
 #define	CONSPEED 9600
 #endif
-#ifdef _PMAP_MAY_USE_PROM_CONSOLE
+#ifdef _PROM_MAY_USE_PROM_CONSOLE
 dev_type_open(promopen);
 dev_type_close(promclose);
 dev_type_read(promread);
 dev_type_write(promwrite);
 dev_type_ioctl(promioctl);
 dev_type_stop(promstop);
 dev_type_tty(promtty);
 dev_type_poll(prompoll);
 const struct cdevsw prom_cdevsw = {
 	.d_open = promopen,
 	.d_close = promclose,
 @@ -96,27 +96,27 @@ int
 promopen(dev_t dev, int flag, int mode, struct lwp *l)
+{
 	int unit = minor(dev);
 	struct tty *tp;
 	int s;
 	int error = 0, setuptimeout = 0;
 	static bool callo;
 	if (!callo) {
 		callout_init(&prom_ch, 0);
 		callo = true;
+	}
-	if (!pmap_uses_prom_console() || unit >= 1)
+	if (!prom_uses_prom_console() || unit >= 1)
 		return ENXIO;
 	s = spltty();
 	if (!prom_tty[unit]) {
 		tp = prom_tty[unit] = tty_alloc();
 		tty_attach(tp);
 	} else
 		tp = prom_tty[unit];
 	tp->t_oproc = promstart;
 	tp->t_param = promparam;
 	tp->t_dev = dev;
 @@ -252,36 +252,36 @@ promtimeout(void *v)
 	callout_reset(&prom_ch, polltime, promtimeout, tp);
+}
 struct tty *
 promtty(dev_t dev)
+{
 	if (minor(dev) != 0)
 		panic("promtty: bogus");
 	return prom_tty[0];
+}
-#else /* _PMAP_MAY_USE_PROM_CONSOLE */
+#else /* _PROM_MAY_USE_PROM_CONSOLE */
 /*
- * If not defined _PMAP_MAY_USE_PROM_CONSOLE,
+ * If not defined _PROM_MAY_USE_PROM_CONSOLE,
  * this fake prom_cdevsw is attached to the kernel.
  * NEVER REMOVE!
  */
 const struct cdevsw prom_cdevsw = {
 	.d_open = noopen,
 	.d_close = noclose,
 	.d_read = noread,
 	.d_write = nowrite,
 	.d_ioctl = noioctl,
 	.d_stop = nostop,
 	.d_tty = notty,
 	.d_poll = nopoll,
 	.d_mmap = nommap,
 	.d_kqfilter = nokqfilter,
 	.d_discard = nodiscard,
 	.d_flag = 0
 };
-#endif /* _PMAP_MAY_USE_PROM_CONSOLE */
+#endif /* _PROM_MAY_USE_PROM_CONSOLE */

 @@ -1,14 +1,14 @@
-/* $NetBSD: alpha.h,v 1.38 2019/04/06 03:06:24 thorpej Exp $ */
+/* $NetBSD: alpha.h,v 1.39 2020/09/03 02:09:09 thorpej Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -79,27 +79,27 @@ void	XentInt(uint64_t, uint64_t, uint64_
 void	XentMM(uint64_t, uint64_t, uint64_t);		/* MAGIC */
 void	XentRestart(void);					/* MAGIC */
 void	XentSys(uint64_t, uint64_t, uint64_t);		/* MAGIC */
 void	XentUna(uint64_t, uint64_t, uint64_t);		/* MAGIC */
 void	alpha_init(u_long, u_long, u_long, u_long, u_long);
 void	ast(struct trapframe *);
 int	badaddr(void *, size_t);
 int	badaddr_read(void *, size_t, void *);
 uint64_t console_restart(struct trapframe *);
 void	do_sir(void);
 void	exception_return(void);					/* MAGIC */
 void	frametoreg(const struct trapframe *, struct reg *);
 void	init_bootstrap_console(void);
-void	init_prom_interface(struct rpb *);
+void	init_prom_interface(unsigned long, struct rpb *);
 void	interrupt(unsigned long, unsigned long, unsigned long,
 	    struct trapframe *);
 void	machine_check(unsigned long, struct trapframe *, unsigned long,
 	    unsigned long);
 uint64_t hwrpb_checksum(void);
 void	hwrpb_restart_setup(void);
 void	regdump(struct trapframe *);
 void	regtoframe(const struct reg *, struct trapframe *);
 void	savectx(struct pcb *);
 void	trap(unsigned long, unsigned long, unsigned long, unsigned long,
 	    struct trapframe *);
 void	trap_init(void);
 void	enable_nsio_ide(bus_space_tag_t);

 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.h,v 1.83 2020/08/29 20:07:00 thorpej Exp $ */
+/* $NetBSD: pmap.h,v 1.84 2020/09/03 02:09:09 thorpej Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * 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
 @@ -175,35 +175,26 @@ typedef struct pv_entry {
 #define	PGA_REFERENCED		0x02		/* referenced */
 /* pvh_usage */
 #define	PGU_NORMAL		0		/* free or normal use */
 #define	PGU_PVENT		1		/* PV entries */
 #define	PGU_L1PT		2		/* level 1 page table */
 #define	PGU_L2PT		3		/* level 2 page table */
 #define	PGU_L3PT		4		/* level 3 page table */
 #ifdef _KERNEL
 #include <sys/atomic.h>
 #ifdef _KERNEL_OPT
 #include "opt_dec_kn8ae.h"			/* XXX */
 #if defined(DEC_KN8AE)
 #define	_PMAP_MAY_USE_PROM_CONSOLE
 #endif
 #else
 #define	_PMAP_MAY_USE_PROM_CONSOLE
 #endif
 struct cpu_info;
 struct trapframe;
 void	pmap_init_cpu(struct cpu_info *);
 #if defined(MULTIPROCESSOR)
 void	pmap_tlb_shootdown_ipi(struct cpu_info *, struct trapframe *);
 #endif /* MULTIPROCESSOR */
 #define	pmap_resident_count(pmap)	((pmap)->pm_stats.resident_count)
 #define	pmap_wired_count(pmap)		((pmap)->pm_stats.wired_count)
 #define	pmap_copy(dp, sp, da, l, sa)	/* nothing */
 #define	pmap_update(pmap)		/* nothing (yet) */
 @@ -245,29 +236,26 @@ pmap_direct_process(paddr_t pa, voff_t p
 /*
  * Other hooks for the pool allocator.
  */
 #define	POOL_VTOPHYS(va)		ALPHA_K0SEG_TO_PHYS((vaddr_t) (va))
 bool	pmap_pageidlezero(paddr_t);
 #define	PMAP_PAGEIDLEZERO(pa)	pmap_pageidlezero((pa))
 paddr_t vtophys(vaddr_t);
 /* Machine-specific functions. */
 void	pmap_bootstrap(paddr_t, u_int, u_long);
 int	pmap_emulate_reference(struct lwp *, vaddr_t, int, int);
 #ifdef _PMAP_MAY_USE_PROM_CONSOLE
 int	pmap_uses_prom_console(void);
 #endif
 #define	pmap_pte_pa(pte)	(PG_PFNUM(*(pte)) << PGSHIFT)
 #define	pmap_pte_prot(pte)	(*(pte) & PG_PROT)
 #define	pmap_pte_w(pte)		(*(pte) & PG_WIRED)
 #define	pmap_pte_v(pte)		(*(pte) & PG_V)
 #define	pmap_pte_pv(pte)	(*(pte) & PG_PVLIST)
 #define	pmap_pte_asm(pte)	(*(pte) & PG_ASM)
 #define	pmap_pte_exec(pte)	(*(pte) & PG_EXEC)
 #define	pmap_pte_set_w(pte, v)						\
 do {									\
 	if (v)								\
 		*(pte) |= PG_WIRED;					\

 @@ -1,14 +1,14 @@
-/* $NetBSD: prom.h,v 1.14 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: prom.h,v 1.15 2020/09/03 02:09:09 thorpej Exp $ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Keith Bostic, Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -101,24 +101,37 @@ void	hwrpb_restart_setup(void);
 	prom_dispatch(PROM_R_WRITE, chan, len, (uint64_t)buf, blkno)
 #define	prom_ioctl(chan, op, count)					\
 	prom_dispatch(PROM_R_IOCTL, chan, op, (int64_t)count, 0, 0)
 #define	prom_putstr(chan, str, len)					\
 	prom_dispatch(PROM_R_PUTS, chan, (uint64_t)str, len, 0)
 #define	prom_getc(chan)							\
 	prom_dispatch(PROM_R_GETC, chan, 0, 0, 0)
 #define prom_getenv_disp(id, buf, len)					\
 	prom_dispatch(PROM_R_GETENV, id, (uint64_t)buf, len, 0)
 #endif
 #ifndef ASSEMBLER
 #ifdef _KERNEL
 #ifdef _KERNEL_OPT
 #include "opt_dec_kn8ae.h"
 #if defined(DEC_KN8AE)
 #define _PROM_MAY_USE_PROM_CONSOLE
 #endif /* DEC_KN8AE */
 #endif /* _KERNEL_OPT */
 extern bool prom_interface_initialized;
 bool	prom_uses_prom_console(void);
 void	prom_enter(void);
 void	prom_leave(void);
 void	promcnputc(dev_t, int);
 int	promcngetc(dev_t);
 int	promcnlookc(dev_t, char *);
 uint64_t	prom_dispatch(uint64_t, uint64_t, uint64_t, uint64_t,
 		    uint64_t);
 #endif /* _KERNEL */
 #endif /* ASSEMBLER */