From owner-svn-src-head@freebsd.org  Wed Jan 31 06:42:01 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9EA5CEDE36C;
 Wed, 31 Jan 2018 06:42:01 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 51FD476013;
 Wed, 31 Jan 2018 06:42:01 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D0DD226A1;
 Wed, 31 Jan 2018 06:42:01 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0V6g1rp099108;
 Wed, 31 Jan 2018 06:42:01 GMT (envelope-from wma@FreeBSD.org)
Received: (from wma@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0V6g1Am099107;
 Wed, 31 Jan 2018 06:42:01 GMT (envelope-from wma@FreeBSD.org)
Message-Id: <201801310642.w0V6g1Am099107@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wma set sender to wma@FreeBSD.org
 using -f
From: Wojciech Macek <wma@FreeBSD.org>
Date: Wed, 31 Jan 2018 06:42:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r328616 - head/sys/powerpc/aim
X-SVN-Group: head
X-SVN-Commit-Author: wma
X-SVN-Commit-Paths: head/sys/powerpc/aim
X-SVN-Commit-Revision: 328616
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Jan 2018 06:42:01 -0000

Author: wma
Date: Wed Jan 31 06:42:01 2018
New Revision: 328616
URL: https://svnweb.freebsd.org/changeset/base/328616

Log:
  PowerNV: fix compilation on non-NV platforms
  
  Submitted by:          Wojciech Macek <wma@semihalf.com>
  Obtained from:         Semihalf
  Sponsored by:          IBM, QCM Technologies

Modified:
  head/sys/powerpc/aim/mp_cpudep.c

Modified: head/sys/powerpc/aim/mp_cpudep.c
==============================================================================
--- head/sys/powerpc/aim/mp_cpudep.c	Wed Jan 31 05:07:43 2018	(r328615)
+++ head/sys/powerpc/aim/mp_cpudep.c	Wed Jan 31 06:42:01 2018	(r328616)
@@ -85,13 +85,15 @@ cpudep_ap_early_bootstrap(void)
 		break;
 	case IBMPOWER8:
 	case IBMPOWER8E:
-		isync();
-		/* Direct interrupts to SRR instead of HSRR and reset LPCR otherwise */
-		mtspr(SPR_LPID, 0);
-		isync();
+		if (mfmsr() & PSL_HV) {
+			isync();
+			/* Direct interrupts to SRR instead of HSRR and reset LPCR otherwise */
+			mtspr(SPR_LPID, 0);
+			isync();
 
-		mtspr(SPR_LPCR, LPCR_LPES);
-		isync();
+			mtspr(SPR_LPCR, LPCR_LPES);
+			isync();
+		}
 		break;
 	}