[src/netbsd-1-6]: src/sys/arch/powerpc/mpc6xx Pull up revision 1.21 (requeste...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b9df884a1504
branches:  netbsd-1-6
changeset: 528033:b9df884a1504
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 21 05:33:01 2002 +0000

description:
Pull up revision 1.21 (requested by matt in ticket #333):
Add support for IBM750FX (used in latest iBooks).

diffstat:

 sys/arch/powerpc/mpc6xx/cpu_subr.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r b9fc1348cbe8 -r b9df884a1504 sys/arch/powerpc/mpc6xx/cpu_subr.c
--- a/sys/arch/powerpc/mpc6xx/cpu_subr.c        Fri Jun 21 05:31:58 2002 +0000
+++ b/sys/arch/powerpc/mpc6xx/cpu_subr.c        Fri Jun 21 05:33:01 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.14.4.2 2002/06/20 02:53:03 lukem Exp $  */
+/*     $NetBSD: cpu_subr.c,v 1.14.4.3 2002/06/21 05:33:01 lukem Exp $  */
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -79,6 +79,7 @@
 
        switch (vers) {
 #define        K       *1024
+       case IBM750FX:
        case MPC601:
        case MPC750:
        case MPC7450:
@@ -195,6 +196,7 @@
        case MPC603ev:
        case MPC604ev:
        case MPC750:
+       case IBM750FX:
        case MPC7400:
        case MPC7410:
        case MPC8240:
@@ -340,6 +342,7 @@
        { MPC604,     "604" },
        { MPC604ev,   "604ev" },
        { MPC620,     "620" },
+       { IBM750FX,   "750FX" },
        { MPC750,     "750" },
        { MPC7400,   "7400" },
        { MPC7410,   "7410" },
@@ -364,8 +367,8 @@
                maj = min <= 4 ? 1 : 2;
                break;
        default:
-               maj = (pvr >>  8) & 0xff;
-               min = (pvr >>  0) & 0xff;
+               maj = (pvr >>  8) & 0xf;
+               min = (pvr >>  0) & 0xf;
        }
 
        for (cp = models; cp->name != NULL; cp++) {
@@ -436,6 +439,10 @@
                        printf("\n");
                        return;
                }
+               if (vers == IBM750FX) {
+                       printf(": 512KB L2 cache\n");
+                       return;
+               }
                switch (l2cr & L2CR_L2SIZ) {
                case L2SIZ_256K:
                        printf(": 256KB");