From owner-svn-src-all@freebsd.org  Sun Dec 31 05:38:20 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 86D8BEA2C9E;
 Sun, 31 Dec 2017 05:38:20 +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 514903E72;
 Sun, 31 Dec 2017 05:38:20 +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 vBV5cJ13050365;
 Sun, 31 Dec 2017 05:38:19 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBV5cJRr050364;
 Sun, 31 Dec 2017 05:38:19 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201712310538.vBV5cJRr050364@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: Sun, 31 Dec 2017 05:38:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327417 - head/sys/powerpc/aim
X-SVN-Group: head
X-SVN-Commit-Author: nwhitehorn
X-SVN-Commit-Paths: head/sys/powerpc/aim
X-SVN-Commit-Revision: 327417
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Dec 2017 05:38:20 -0000

Author: nwhitehorn
Date: Sun Dec 31 05:38:19 2017
New Revision: 327417
URL: https://svnweb.freebsd.org/changeset/base/327417

Log:
  Make sure the first instruction of the low-memory spinloop is in the
  cacheline being invalidated.
  
  MFC after:	1 month

Modified:
  head/sys/powerpc/aim/locore64.S

Modified: head/sys/powerpc/aim/locore64.S
==============================================================================
--- head/sys/powerpc/aim/locore64.S	Sun Dec 31 05:22:26 2017	(r327416)
+++ head/sys/powerpc/aim/locore64.S	Sun Dec 31 05:38:19 2017	(r327417)
@@ -85,8 +85,9 @@ ap_kexec_start:		/* At 0x60 past start, copied to 0x60
 	sync
 	icbi	0,%r0
 	isync
-	ba	0x78			/* Absolute branch to next inst */
+	ba	0x80			/* Absolute branch to next inst */
 
+. = kbootentry + 0x80			/* Aligned to cache line */
 1:	or	31,31,31		/* yield */
 	sync
 	lwz	%r1,0x40(0)		/* Spin on ap_kexec_spin_sem */