diff options
| author | yongari <yongari@FreeBSD.org> | 2010-10-20 00:19:25 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2010-10-20 00:19:25 +0000 |
| commit | 5c504190d03b82f0ff94fefd4fb37133c34d0f25 (patch) | |
| tree | 849d1dfc4ae5bac9646f9452257b28e5b72b5cdf | |
| parent | a8bf3f7ffc311fa9824224b40c4df2011514c7f0 (diff) | |
| download | FreeBSD-src-5c504190d03b82f0ff94fefd4fb37133c34d0f25.zip FreeBSD-src-5c504190d03b82f0ff94fefd4fb37133c34d0f25.tar.gz | |
Correct handling of shared interrupt in sis_intr(). r212116 incorrectly
released a drver lock for shared interrupt case such that it caused
panic. While I'm here check whether driver is still running before
serving TX/RX handler.
Reported by: Jerahmy Pocott < QUAKENET1 <> optusnet dot com dot au >
Tested by: Jerahmy Pocott < QUAKENET1 <> optusnet dot com dot au >
MFC after: 3 days
| -rw-r--r-- | sys/dev/sis/if_sis.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c index 93246d3..0957419 100644 --- a/sys/dev/sis/if_sis.c +++ b/sys/dev/sis/if_sis.c @@ -1795,12 +1795,15 @@ sis_intr(void *arg) if ((status & SIS_INTRS) == 0) { /* Not ours. */ SIS_UNLOCK(sc); + return; } /* Disable interrupts. */ CSR_WRITE_4(sc, SIS_IER, 0); for (;(status & SIS_INTRS) != 0;) { + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + break; if (status & (SIS_ISR_TX_DESC_OK | SIS_ISR_TX_ERR | SIS_ISR_TX_OK | SIS_ISR_TX_IDLE) ) @@ -1825,11 +1828,13 @@ sis_intr(void *arg) status = CSR_READ_4(sc, SIS_ISR); } - /* Re-enable interrupts. */ - CSR_WRITE_4(sc, SIS_IER, 1); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + /* Re-enable interrupts. */ + CSR_WRITE_4(sc, SIS_IER, 1); - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - sis_startl(ifp); + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + sis_startl(ifp); + } SIS_UNLOCK(sc); } |
