From owner-svn-src-projects@freebsd.org  Sat Jul  9 03:07:25 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E08A6B85CF0
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat,  9 Jul 2016 03:07:25 +0000 (UTC)
 (envelope-from nwhitehorn@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 mx1.freebsd.org (Postfix) with ESMTPS id AFA3D1771;
 Sat,  9 Jul 2016 03:07:25 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6937OHT001328;
 Sat, 9 Jul 2016 03:07:24 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6937ORr001327;
 Sat, 9 Jul 2016 03:07:24 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201607090307.u6937ORr001327@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
 nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 9 Jul 2016 03:07:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r302477 - projects/powernv/powerpc/powernv
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jul 2016 03:07:26 -0000

Author: nwhitehorn
Date: Sat Jul  9 03:07:24 2016
New Revision: 302477
URL: https://svnweb.freebsd.org/changeset/base/302477

Log:
  Make PIR-based determination of BSP ID more robust.

Modified:
  projects/powernv/powerpc/powernv/platform_powernv.c

Modified: projects/powernv/powerpc/powernv/platform_powernv.c
==============================================================================
--- projects/powernv/powerpc/powernv/platform_powernv.c	Sat Jul  9 02:33:45 2016	(r302476)
+++ projects/powernv/powerpc/powernv/platform_powernv.c	Sat Jul  9 03:07:24 2016	(r302477)
@@ -102,6 +102,8 @@ static platform_def_t powernv_platform =
 
 PLATFORM_DEF(powernv_platform);
 
+static int powernv_boot_pir;
+
 static int
 powernv_probe(platform_t plat)
 {
@@ -125,8 +127,9 @@ powernv_attach(platform_t plat)
 	opal_check();
 
 	cpu_idle_hook = powernv_cpu_idle;
+	powernv_boot_pir = mfspr(SPR_PIR);
 
-	/* Direct interrupts to SRR instead of HSRR */
+	/* Direct interrupts to SRR instead of HSRR and reset LPCR otherwise */
 	mtspr(SPR_LPCR, LPCR_LPES);
 
 	/* Set SLB count from device tree */
@@ -337,9 +340,9 @@ powernv_smp_get_bsp(platform_t plat, str
 	if (res < 0)
 		return (ENOENT);
 
-	/* XXX: FDT from kexec lies sometimes. PIR seems not to */
+	/* XXX: FDT from kexec lies sometimes. PIR seems not to. */
 	if (cpuid == 0)
-		cpuid = mfspr(SPR_PIR);
+		cpuid = powernv_boot_pir;
 
 	cpuref->cr_cpuid = cpuid;