Module Name: src
Committed By: rin
Date: Sun Jul 12 21:18:01 UTC 2020
Modified Files:
src/sys/arch/powerpc/powerpc: trap_subr.S
Log Message:
No need to work around for IBM405 Errata 77; ibm4xx does not use this file.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/powerpc/powerpc/trap_subr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/trap_subr.S
diff -u src/sys/arch/powerpc/powerpc/trap_subr.S:1.83 src/sys/arch/powerpc/powerpc/trap_subr.S:1.84
--- src/sys/arch/powerpc/powerpc/trap_subr.S:1.83 Mon Jul 6 11:09:15 2020
+++ src/sys/arch/powerpc/powerpc/trap_subr.S Sun Jul 12 21:18:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap_subr.S,v 1.83 2020/07/06 11:09:15 rin Exp $ */
+/* $NetBSD: trap_subr.S,v 1.84 2020/07/12 21:18:01 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -321,7 +321,6 @@ dsitrap_fix_dbat7:
ldreg %r30,(CI_DISISAVE+CPUSAVE_R30)(%r1) /* restore r30 */
ldreg %r31,(CI_DISISAVE+CPUSAVE_R31)(%r1) /* restore r31 */
mfsprg1 %r1
- IBM405_ERRATA77_SYNC
RFI /* return to trapped code */
1:
#endif /* !PPC_MPC8XX */
@@ -394,7 +393,6 @@ _C_LABEL(dsi601trap):
ldreg %r30,(CI_DISISAVE+CPUSAVE_R30)(%r1) /* restore r30 */
ldreg %r31,(CI_DISISAVE+CPUSAVE_R31)(%r1) /* restore r31 */
mfsprg1 %r1
- IBM405_ERRATA77_SYNC
RFI /* return to trapped code */
1:
mflr %r28 /* save LR */
@@ -511,7 +509,6 @@ _C_LABEL(tlbimiss):
srwi %r1,%r1,8 /* get byte 7 of pte */
tlbli %r0 /* load the itlb */
stb %r1,6(%r2) /* update page table */
- IBM405_ERRATA77_SYNC
RFI
3: /* not found in pteg */
@@ -571,7 +568,6 @@ _C_LABEL(tlbdlmiss):
srwi %r1,%r1,8 /* get byte 7 of pte */
tlbld %r0 /* load the dtlb */
stb %r1,6(%r2) /* update page table */
- IBM405_ERRATA77_SYNC
RFI
3: /* not found in pteg */
@@ -628,7 +624,6 @@ _C_LABEL(tlbdsmiss):
mtcrf 0x80,%r3 /* and restore */
mtspr SPR_RPA,%r1 /* set the pte */
tlbld %r0 /* load the dtlb */
- IBM405_ERRATA77_SYNC
RFI
3: /* not found in pteg */
@@ -1002,7 +997,6 @@ trapleave:
FRAME_RESTORE_CALLEE
intrleave:
FRAME_LEAVE(CI_TEMPSAVE)
- IBM405_ERRATA77_SYNC
RFI
/*
@@ -1226,7 +1220,6 @@ ddbtrap:
beq trapagain
FRAME_RESTORE_CALLEE
FRAME_LEAVE(CI_DDBSAVE)
- IBM405_ERRATA77_SYNC
RFI
#endif /* DDB || KGDB */
