svn commit: r215691 - stable/8/sys/powerpc/powerpc

[Nathan Whitehorn]

Author: nwhitehorn
Date: Mon Nov 22 17:06:24 2010
New Revision: 215691
URL: http://svn.freebsd.org/changeset/base/215691

Log:
  MFC r204127,215101:
  Provide support for the DEEPNAP power-saving mode found on the 970MP.

Modified:
  stable/8/sys/powerpc/powerpc/cpu.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/powerpc/powerpc/cpu.c
==============================================================================
--- stable/8/sys/powerpc/powerpc/cpu.c	Mon Nov 22 17:03:09 2010	(r215690)
+++ stable/8/sys/powerpc/powerpc/cpu.c	Mon Nov 22 17:06:24 2010	(r215691)
@@ -453,8 +453,16 @@ cpu_970_setup(int cpuid, uint16_t vers)
 	    : "=r" (hid0_hi), "=r" (hid0_lo) : "K" (SPR_HID0));
 
 	/* Configure power-saving mode */
-	hid0_hi |= (HID0_NAP | HID0_DPM);
-	hid0_hi &= ~(HID0_DOZE | HID0_DEEPNAP);
+	switch (vers) {
+	case IBM970MP:
+		hid0_hi |= (HID0_DEEPNAP | HID0_NAP | HID0_DPM);
+		hid0_hi &= ~HID0_DOZE;
+		break;
+	default:
+		hid0_hi |= (HID0_NAP | HID0_DPM);
+		hid0_hi &= ~(HID0_DOZE | HID0_DEEPNAP);
+		break;
+	}
 	powerpc_pow_enabled = 1;
 
 	__asm __volatile (" \