svn commit: r190946 - head/sys/powerpc/aim
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Sat Apr 11 20:43:42 UTC 2009
Author: nwhitehorn
Date: Sat Apr 11 20:43:41 2009
New Revision: 190946
URL: http://svn.freebsd.org/changeset/base/190946
Log:
Fix recognition of kernel-mode traps that pass through the KDB trap handler
but do not actually invoke KDB. This includes recoverable machine checks
encountered in kernel mode.
This patch causes machines with Grackle host-PCI bridges to be able to
correctly enumerate them again.
MFC after: 3 days
Modified:
head/sys/powerpc/aim/trap_subr.S
Modified: head/sys/powerpc/aim/trap_subr.S
==============================================================================
--- head/sys/powerpc/aim/trap_subr.S Sat Apr 11 20:23:08 2009 (r190945)
+++ head/sys/powerpc/aim/trap_subr.S Sat Apr 11 20:43:41 2009 (r190946)
@@ -460,9 +460,7 @@ disitrap:
stw %r30,(PC_DBSAVE +CPUSAVE_R30)(%r1) /* save r30 */
lwz %r31,(PC_DISISAVE+CPUSAVE_R31)(%r1) /* get r31 */
stw %r31,(PC_DBSAVE +CPUSAVE_R31)(%r1) /* save r31 */
- lis %r1,(tmpstk+TMPSTKSZ-16)@ha /* get new SP */
- addi %r1,%r1,(tmpstk+TMPSTKSZ-16)@l
- b dbtrap
+ bla dbtrap
#endif
/* XXX need stack probe here */
@@ -631,7 +629,7 @@ dbtrap:
mflr %r28
mfcr %r29
lwz %r31,(PC_DBSAVE+CPUSAVE_R31)(%r1)
- mtlr %r31
+ mtsprg3 %r31 /* SPRG3 was clobbered by FRAME_LEAVE */
mfsprg1 %r1
b realtrap
dbleave:
More information about the svn-src-head
mailing list