diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-06-28 18:22:36 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-06-28 18:22:36 +0200 |
| commit | 00328b5759f66400aed0e71ccc687250113e61ee (patch) | |
| tree | 7875e90cc7b31858d98f4dc267a43a531397c23c | |
| parent | 9b0efa4176aa9437160c7970f3637e33f8196fce (diff) | |
| download | plan9front-00328b5759f66400aed0e71ccc687250113e61ee.tar.xz | |
pc, pc64: toggle bit 2 in port 0x61 to reset and enable PCI SERR# nmi's, print nmi status
| -rw-r--r-- | sys/src/9/pc/trap.c | 5 | ||||
| -rw-r--r-- | sys/src/9/pc64/trap.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/src/9/pc/trap.c b/sys/src/9/pc/trap.c index 9bf7550f9..071278d03 100644 --- a/sys/src/9/pc/trap.c +++ b/sys/src/9/pc/trap.c @@ -175,7 +175,7 @@ nmienable(void) outb(0x70, 0); x = inb(0x61) & 0x07; /* Enable NMI */ - outb(0x61, 0x08|x); + outb(0x61, 0x0C|x); outb(0x61, x); } @@ -422,7 +422,8 @@ trap(Ureg* ureg) * Don't re-enable, it confuses the crash dumps. nmienable(); */ - iprint("cpu%d: PC %#8.8lux\n", m->machno, ureg->pc); + iprint("cpu%d: nmi PC %#8.8lux, status %ux\n", + m->machno, ureg->pc, inb(0x61)); while(m->machno != 0) ; } diff --git a/sys/src/9/pc64/trap.c b/sys/src/9/pc64/trap.c index c26f9ebf3..6dae1b283 100644 --- a/sys/src/9/pc64/trap.c +++ b/sys/src/9/pc64/trap.c @@ -175,7 +175,7 @@ nmienable(void) outb(0x70, 0); x = inb(0x61) & 0x07; /* Enable NMI */ - outb(0x61, 0x08|x); + outb(0x61, 0x0C|x); outb(0x61, x); } @@ -416,7 +416,8 @@ trap(Ureg *ureg) * Don't re-enable, it confuses the crash dumps. nmienable(); */ - iprint("cpu%d: PC %#p\n", m->machno, ureg->pc); + iprint("cpu%d: nmi PC %#p, status %ux\n", + m->machno, ureg->pc, inb(0x61)); while(m->machno != 0) ; } |