From owner-svn-src-head@freebsd.org  Wed Jan 31 15:18:00 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 DA154ED0B5F;
 Wed, 31 Jan 2018 15:18:00 +0000 (UTC)
 (envelope-from nwhitehorn@freebsd.org)
Received: from d.mail.sonic.net (d.mail.sonic.net [64.142.111.50])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6B22A6820E;
 Wed, 31 Jan 2018 15:18:00 +0000 (UTC)
 (envelope-from nwhitehorn@freebsd.org)
Received: from comporellon.tachypleus.net (cpe-75-82-218-62.socal.res.rr.com
 [75.82.218.62]) (authenticated bits=0)
 by d.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id w0VFHuhZ002660
 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
 Wed, 31 Jan 2018 07:17:57 -0800
Subject: Re: svn commit: r328616 - head/sys/powerpc/aim
To: Wojciech Macek <wma@freebsd.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
References: <201801310642.w0V6g1Am099107@repo.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
Message-ID: <61ee6038-9a49-5e9d-f916-8c36d69976a3@freebsd.org>
Date: Wed, 31 Jan 2018 07:17:56 -0800
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101
 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <201801310642.w0V6g1Am099107@repo.freebsd.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
X-Sonic-CAuth: UmFuZG9tSVaZ6CX5PWRUSqJPQS/SplsGTeBBeDmo4y+UTNqUNQKpYgVe/atO+KTs7xwpl9I5Lw47S41reYVdT8z6bfZ5BWYZchqV84Rz+mM=
X-Sonic-ID: C;drZA6pkG6BG1tRtCsE207w== M;PmWc6pkG6BG1tRtCsE207w==
X-Spam-Flag: No
X-Sonic-Spam-Details: 0.0/5.0 by cerberusd
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 15:18:01 -0000

Thanks! Since PSL_HV is only defined on powerpc64, you also need some 
#ifdef here or the ppc32 kernel build will break. Also, the comment is 
longer than 80 characters.
-Nathan

On 01/30/18 22:42, Wojciech Macek wrote:
> 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;
>   	}
>   
>