--XMCwj5IQnwKtuyBG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, Apr 23, 2004 at 12:19:59AM -0400, Allen Briggs wrote:
> Actually, after poking around a bit, I think the 604e is PVR 0x0009
> (which we currently list as the 604ev), and the 604ev is PVR 0x000a.
> Also, the 604x don't seem to support DOZE/NAP/SLEEP/DPM, so we should
> be leaving those bits alone for these CPUs in cpu_subr.c:cpu_setup().

Here's a diff with these assumptions.

-allen

-- 
 Allen Briggs                     briggs@wasabisystems.com
 Wasabi Systems, Inc.             http://www.wasabisystems.com/

--XMCwj5IQnwKtuyBG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=ppc604ev_diffs

Index: oea/cpu_subr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/oea/cpu_subr.c,v
retrieving revision 1.13
diff -u -r1.13 cpu_subr.c
--- oea/cpu_subr.c	11 Mar 2004 15:40:13 -0000	1.13
+++ oea/cpu_subr.c	23 Apr 2004 04:21:31 -0000
@@ -179,6 +179,7 @@
 	{ "603e",	MPC603e,	REVFMT_MAJMIN },
 	{ "603ev",	MPC603ev,	REVFMT_MAJMIN },
 	{ "604",	MPC604,		REVFMT_MAJMIN },
+	{ "604e",	MPC604e,	REVFMT_MAJMIN },
 	{ "604ev",	MPC604ev,	REVFMT_MAJMIN },
 	{ "620",	MPC620,  	REVFMT_HEX },
 	{ "750",	MPC750,		REVFMT_MAJMIN },
@@ -246,6 +247,7 @@
 		curcpu()->ci_ci.icache_size = 16 K;
 		assoc = 4;
 		break;
+	case MPC604e:
 	case MPC604ev:
 		curcpu()->ci_ci.dcache_size = 32 K;
 		curcpu()->ci_ci.icache_size = 32 K;
@@ -302,6 +304,7 @@
 		switch (vers) {
 		case MPC601:
 		case MPC604:
+		case MPC604e:
 		case MPC604ev:
 		case MPC7400:
 		case MPC7410:
@@ -351,7 +354,6 @@
 	case MPC603:
 	case MPC603e:
 	case MPC603ev:
-	case MPC604ev:
 	case MPC750:
 	case IBM750FX:
 	case MPC7400:
Index: include/spr.h
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/include/spr.h,v
retrieving revision 1.32
diff -u -r1.32 spr.h
--- include/spr.h	9 Oct 2003 20:49:06 -0000	1.32
+++ include/spr.h	23 Apr 2004 04:21:32 -0000
@@ -69,7 +69,8 @@
 #define	  MPC603e		  0x0006
 #define	  MPC603ev		  0x0007
 #define	  MPC750		  0x0008
-#define	  MPC604ev		  0x0009
+#define	  MPC604e		  0x0009
+#define	  MPC604ev		  0x000a
 #define	  MPC7400		  0x000c
 #define	  MPC620		  0x0014
 #define	  IBM403		  0x0020

--XMCwj5IQnwKtuyBG--