From owner-svn-src-projects@FreeBSD.ORG  Tue May 31 15:49:29 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40BE4106564A;
	Tue, 31 May 2011 15:49:29 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3161E8FC12;
	Tue, 31 May 2011 15:49:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4VFnTQX030089;
	Tue, 31 May 2011 15:49:29 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4VFnTcx030087;
	Tue, 31 May 2011 15:49:29 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201105311549.p4VFnTcx030087@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 31 May 2011 15:49:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222533 - projects/pseries/powerpc/aim
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 May 2011 15:49:29 -0000

Author: nwhitehorn
Date: Tue May 31 15:49:28 2011
New Revision: 222533
URL: http://svn.freebsd.org/changeset/base/222533

Log:
  Be less yell-y about new CPUs when running under a hypervisor. Hopefully
  the HV has set them up in a reasonable way, and the chance we can change
  any important settings is low anyway.

Modified:
  projects/pseries/powerpc/aim/mp_cpudep.c

Modified: projects/pseries/powerpc/aim/mp_cpudep.c
==============================================================================
--- projects/pseries/powerpc/aim/mp_cpudep.c	Tue May 31 15:41:10 2011	(r222532)
+++ projects/pseries/powerpc/aim/mp_cpudep.c	Tue May 31 15:49:28 2011	(r222533)
@@ -344,6 +344,10 @@ cpudep_ap_setup()
 
 		break;
 	default:
+#ifdef __powerpc64__
+		if (!(mfmsr() & PSL_HV)) /* Rely on HV to have set things up */
+			break;
+#endif
 		printf("WARNING: Unknown CPU type. Cache performace may be "
 		    "suboptimal.\n");
 		break;