[src/trunk]: src/sys/arch/powerpc/oea don't enable NAP mode on 7450 CPUs - my...

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

details:   https://anonhg.NetBSD.org/src/rev/dd99568c9b1b
branches:  trunk
changeset: 459672:dd99568c9b1b
user:      macallan <macallan%NetBSD.org@localhost>
date:      Fri Sep 20 21:27:29 2019 +0000

description:
don't enable NAP mode on 7450 CPUs - my Quicksilver has two of those and we
hang hard shortly after boot with NAP enabled, even on UP kernels

diffstat:

 sys/arch/powerpc/oea/cpu_subr.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 111ed7b50b2e -r dd99568c9b1b sys/arch/powerpc/oea/cpu_subr.c
--- a/sys/arch/powerpc/oea/cpu_subr.c   Fri Sep 20 21:24:34 2019 +0000
+++ b/sys/arch/powerpc/oea/cpu_subr.c   Fri Sep 20 21:27:29 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.100 2019/08/02 05:08:07 macallan Exp $  */
+/*     $NetBSD: cpu_subr.c,v 1.101 2019/09/20 21:27:29 macallan Exp $  */
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.100 2019/08/02 05:08:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.101 2019/09/20 21:27:29 macallan Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_ppccache.h"
@@ -584,8 +584,11 @@
                        hid0 &= ~HID0_BTIC;
                /* Select NAP mode. */
                hid0 &= ~HID0_SLEEP;
-               hid0 |= HID0_NAP | HID0_DPM;
-               powersave = 1;
+               /* XXX my quicksilver hangs if nap is enabled */
+               if (vers != MPC7450) {
+                       hid0 |= HID0_NAP | HID0_DPM;
+                       powersave = 1;
+               }
                break;
 #endif