Complete rework of the PowerPC pmap and a number of other bits in the early

boot sequence.

The new pmap.c is based on NetBSD's newer pmap.c (for the mpc6xx processors)
which is 70% faster than the older code that the original pmap.c was based
on.  It has also been based on the framework established by jake's initial
sparc64 pmap.c.

There is no change to how far the kernel gets (it makes it to the mountroot
prompt in psim) but the new pmap code is a lot cleaner.

Obtained from:	NetBSD (pmap code)

1 files changed, 69 insertions, 2 deletions

diff --git a/sys/powerpc/aim/ofw_machdep.c b/sys/powerpc/aim/ofw_machdep.c
index dcdc2dd..135917b 100644
--- a/sys/powerpc/aim/ofw_machdep.c
+++ b/sys/powerpc/aim/ofw_machdep.c
@@ -48,12 +48,18 @@ static const char rcsid[] =
 
 #include <dev/ofw/openfirm.h>
 
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_page.h>
+
 #include <machine/powerpc.h>
 
 #define	OFMEM_REGIONS	32
 static struct mem_region OFmem[OFMEM_REGIONS + 1], OFavail[OFMEM_REGIONS + 3];
 
 extern long	ofmsr;
+extern struct	pmap ofw_pmap;
+extern int	pmap_bootstrapped;
 static int	(*ofwcall)(void *);
 
 /*
@@ -95,8 +101,48 @@ openfirmware(void *args)
 {
 	long	oldmsr;
 	int	result;
-
-	__asm(	"\t"
+	u_int	srsave[16];
+
+	if (pmap_bootstrapped) {
+		__asm __volatile("mfsr %0,0" : "=r"(srsave[0]));
+		__asm __volatile("mfsr %0,1" : "=r"(srsave[1]));
+		__asm __volatile("mfsr %0,2" : "=r"(srsave[2]));
+		__asm __volatile("mfsr %0,3" : "=r"(srsave[3]));
+		__asm __volatile("mfsr %0,4" : "=r"(srsave[4]));
+		__asm __volatile("mfsr %0,5" : "=r"(srsave[5]));
+		__asm __volatile("mfsr %0,6" : "=r"(srsave[6]));
+		__asm __volatile("mfsr %0,7" : "=r"(srsave[7]));
+		__asm __volatile("mfsr %0,8" : "=r"(srsave[8]));
+		__asm __volatile("mfsr %0,9" : "=r"(srsave[9]));
+		__asm __volatile("mfsr %0,10" : "=r"(srsave[10]));
+		__asm __volatile("mfsr %0,11" : "=r"(srsave[11]));
+		__asm __volatile("mfsr %0,12" : "=r"(srsave[12]));
+		__asm __volatile("mfsr %0,13" : "=r"(srsave[13]));
+		__asm __volatile("mfsr %0,14" : "=r"(srsave[14]));
+		__asm __volatile("mfsr %0,15" : "=r"(srsave[15]));
+
+		__asm __volatile("mtsr 0,%0" :: "r"(ofw_pmap.pm_sr[0]));
+		__asm __volatile("mtsr 1,%0" :: "r"(ofw_pmap.pm_sr[1]));
+		__asm __volatile("mtsr 2,%0" :: "r"(ofw_pmap.pm_sr[2]));
+		__asm __volatile("mtsr 3,%0" :: "r"(ofw_pmap.pm_sr[3]));
+		__asm __volatile("mtsr 4,%0" :: "r"(ofw_pmap.pm_sr[4]));
+		__asm __volatile("mtsr 5,%0" :: "r"(ofw_pmap.pm_sr[5]));
+		__asm __volatile("mtsr 6,%0" :: "r"(ofw_pmap.pm_sr[6]));
+		__asm __volatile("mtsr 7,%0" :: "r"(ofw_pmap.pm_sr[7]));
+		__asm __volatile("mtsr 8,%0" :: "r"(ofw_pmap.pm_sr[8]));
+		__asm __volatile("mtsr 9,%0" :: "r"(ofw_pmap.pm_sr[9]));
+		__asm __volatile("mtsr 10,%0" :: "r"(ofw_pmap.pm_sr[10]));
+		__asm __volatile("mtsr 11,%0" :: "r"(ofw_pmap.pm_sr[11]));
+		__asm __volatile("mtsr 12,%0" :: "r"(ofw_pmap.pm_sr[12]));
+		__asm __volatile("mtsr 13,%0" :: "r"(ofw_pmap.pm_sr[13]));
+		__asm __volatile("mtsr 14,%0" :: "r"(ofw_pmap.pm_sr[14]));
+		__asm __volatile("mtsr 15,%0" :: "r"(ofw_pmap.pm_sr[15]));
+	}
+
+	ofmsr |= PSL_RI|PSL_EE;
+
+	__asm __volatile(	"\t"
+		"sync\n\t"
 		"mfmsr  %0\n\t"
 		"mtmsr  %1\n\t"
 		"isync\n"
@@ -112,6 +158,27 @@ openfirmware(void *args)
 		: : "r" (oldmsr)
 	);
 
+	if (pmap_bootstrapped) {
+		__asm __volatile("mtsr 0,%0" :: "r"(srsave[0]));
+		__asm __volatile("mtsr 1,%0" :: "r"(srsave[1]));
+		__asm __volatile("mtsr 2,%0" :: "r"(srsave[2]));
+		__asm __volatile("mtsr 3,%0" :: "r"(srsave[3]));
+		__asm __volatile("mtsr 4,%0" :: "r"(srsave[4]));
+		__asm __volatile("mtsr 5,%0" :: "r"(srsave[5]));
+		__asm __volatile("mtsr 6,%0" :: "r"(srsave[6]));
+		__asm __volatile("mtsr 7,%0" :: "r"(srsave[7]));
+		__asm __volatile("mtsr 8,%0" :: "r"(srsave[8]));
+		__asm __volatile("mtsr 9,%0" :: "r"(srsave[9]));
+		__asm __volatile("mtsr 10,%0" :: "r"(srsave[10]));
+		__asm __volatile("mtsr 11,%0" :: "r"(srsave[11]));
+		__asm __volatile("mtsr 12,%0" :: "r"(srsave[12]));
+		__asm __volatile("mtsr 13,%0" :: "r"(srsave[13]));
+		__asm __volatile("mtsr 14,%0" :: "r"(srsave[14]));
+		__asm __volatile("mtsr 15,%0" :: "r"(srsave[15]));
+		__asm __volatile("sync");
+	}
+
+
 	return (result);
 }