Sat Aug 31 15:01:08 2013 UTC ()

convert rfid to rfi in exception handlers.


(matt)

diff -r1.66 -r1.67 src/sys/arch/powerpc/oea/oea_machdep.c

--- src/sys/arch/powerpc/oea/oea_machdep.c 2013/08/31 07:33:15	1.66
+++ src/sys/arch/powerpc/oea/oea_machdep.c 2013/08/31 15:01:08	1.67

 @@ -1,14 +1,14 @@
-/*	$NetBSD: oea_machdep.c,v 1.66 2013/08/31 07:33:15 matt Exp $	*/
+/*	$NetBSD: oea_machdep.c,v 1.67 2013/08/31 15:01:08 matt Exp $	*/
 /*
  * Copyright (C) 2002 Matt Thomas
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -23,27 +23,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.66 2013/08/31 07:33:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.67 2013/08/31 15:01:08 matt Exp $");
 #include "opt_ppcarch.h"
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_ipkdb.h"
 #include "opt_multiprocessor.h"
 #include "opt_altivec.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/boot_flag.h>
 #include <sys/exec.h>
 @@ -376,26 +376,28 @@ oea_init(void (*handler)(void))
+	}
 #ifdef PPC_OEA64_BRIDGE
 	if ((oeacpufeat & OEACPU_64_BRIDGE) == 0) {
 		for (int *ip = (int *)exc_base;
 		     (uintptr_t)ip <= exc_base + EXC_LAST;
 		     ip++) {
 			if ((ip[0] & MFMSR_MASK) == MFMSR
 			    && (ip[1] & RLDICL_MASK) == RLDICL
 			    && (ip[2] & MTMSRD_MASK) == MTMSRD) {
 				*ip++ = NOP;
 				*ip++ = NOP;
 				ip[0] = NOP;
 			} else if (*ip == RFID) {
 				*ip = RFI;
+			}
+		}
 		/*
 		 * Now replace each rfid instruction with a rfi instruction.
 		 */
 		for (int *ip = trapstart; ip < trapend; ip++) {
 			if ((ip[0] & MFMSR_MASK) == MFMSR
 			    && (ip[1] & RLDICL_MASK) == RLDICL
 			    && (ip[2] & MTMSRD_MASK) == MTMSRD) {
 				*ip++ = NOP;
 				*ip++ = NOP;
 				ip[0] = NOP;
 @@ -895,26 +897,28 @@ oea_install_extint(void (*handler)(void)
 	__syncicache((void *)extint_call, sizeof extint_call[0]);
 	memcpy((void *)exc_exi_base, extint, (size_t)extsize);
 #ifdef PPC_OEA64_BRIDGE
 	if ((oeacpufeat & OEACPU_64_BRIDGE) == 0) {
 		for (int *ip = (int *)exc_exi_base;
 		     (uintptr_t)ip <= exc_exi_base + (size_t)extsize;
 		     ip++) {
 			if ((ip[0] & MFMSR_MASK) == MFMSR
 			    && (ip[1] & RLDICL_MASK) == RLDICL
 			    && (ip[2] & MTMSRD_MASK) == MTMSRD) {
 				*ip++ = NOP;
 				*ip++ = NOP;
 				ip[0] = NOP;
 			} else if (*ip == RFID) {
 				*ip = RFI;
+			}
+		}
+	}
 #endif
 	__syncicache((void *)exc_exi_base, (int)extsize);
 	__asm volatile ("mtmsr %0" :: "r"(omsr));
+}
 /*
  * Machine dependent startup code.
  */
 void