From owner-svn-src-head@FreeBSD.ORG  Thu Feb 16 03:27:39 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A197A1065676;
	Thu, 16 Feb 2012 03:27:39 +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 759F88FC12;
	Thu, 16 Feb 2012 03:27:39 +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 q1G3RdJD096449;
	Thu, 16 Feb 2012 03:27:39 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1G3Rdgn096446;
	Thu, 16 Feb 2012 03:27:39 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201202160327.q1G3Rdgn096446@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 16 Feb 2012 03:27:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231810 - head/sys/boot/powerpc/boot1.chrp
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Feb 2012 03:27:39 -0000

Author: nwhitehorn
Date: Thu Feb 16 03:27:38 2012
New Revision: 231810
URL: http://svn.freebsd.org/changeset/base/231810

Log:
  Make sure to synchronize icache for the newly loaded loader. Not an issue
  on most systems, when the relevant icache lines are not full.
  
  MFC after:	2 weeks

Modified:
  head/sys/boot/powerpc/boot1.chrp/Makefile
  head/sys/boot/powerpc/boot1.chrp/boot1.c

Modified: head/sys/boot/powerpc/boot1.chrp/Makefile
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/Makefile	Thu Feb 16 03:18:28 2012	(r231809)
+++ head/sys/boot/powerpc/boot1.chrp/Makefile	Thu Feb 16 03:27:38 2012	(r231810)
@@ -8,16 +8,17 @@ BINDIR?=        /boot
 INSTALLFLAGS=   -b
 
 FILES=		boot1.hfs
-SRCS=		boot1.c ashldi3.c
+SRCS=		boot1.c ashldi3.c syncicache.c
 
 NO_MAN=
 
 CFLAGS= -ffreestanding -msoft-float -Os \
-	-I${.CURDIR}/../../common -I${.CURDIR}/../../../
+	-I${.CURDIR}/../../common -I${.CURDIR}/../../../ \
+	-D_STANDALONE
 LDFLAGS=-nostdlib -static -N
 
 .include "${.CURDIR}/../Makefile.inc"
-.PATH:  ${.CURDIR}/../../../libkern ${.CURDIR}
+.PATH:  ${.CURDIR}/../../../libkern ${.CURDIR}/../../../../lib/libc/powerpc/gen ${.CURDIR}
 
 # The following inserts out objects into a template HFS 
 # created by generate-hfs.sh

Modified: head/sys/boot/powerpc/boot1.chrp/boot1.c
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/boot1.c	Thu Feb 16 03:18:28 2012	(r231809)
+++ head/sys/boot/powerpc/boot1.chrp/boot1.c	Thu Feb 16 03:27:38 2012	(r231810)
@@ -77,6 +77,8 @@ static int __sputc(char c, void *arg);
 static char *__uitoa(char *buf, u_int val, int base);
 static char *__ultoa(char *buf, u_long val, int base);
 
+void __syncicache(void *, int);
+
 /*
  * Open Firmware interface functions
  */
@@ -523,6 +525,7 @@ load(const char *fname)
 		}
 		if (ph.p_filesz != ph.p_memsz)
 			bzero(p + ph.p_filesz, ph.p_memsz - ph.p_filesz);
+		__syncicache(p, ph.p_memsz);
 	}
 	ofw_close(bootdev);
 	(*(void (*)(void *, int, ofwfp_t, char *, int))eh.e_entry)(NULL, 0,