50c50
< __FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp.c 290784 2015-11-13 19:41:04Z mav $");
---
> __FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp.c 290785 2015-11-13 19:42:55Z mav $");
5040c5040
< isp_intr(ispsoftc_t *isp, uint32_t isr, uint16_t sema, uint16_t mbox)
---
> isp_intr(ispsoftc_t *isp, uint16_t isr, uint16_t sema, uint16_t info)
5054c5054
< if (mbox & MBOX_COMMAND_COMPLETE) {
---
> if (info & MBOX_COMMAND_COMPLETE) {
5058c5058
< isp->isp_mboxtmp[0] = mbox;
---
> isp->isp_mboxtmp[0] = info;
5072c5072
< isp_prt(isp, ISP_LOGWARN, "mailbox cmd (0x%x) with no waiters", mbox);
---
> isp_prt(isp, ISP_LOGWARN, "mailbox cmd (0x%x) with no waiters", info);
5075c5075
< i = IS_FC(isp)? isp_parse_async_fc(isp, mbox) : isp_parse_async(isp, mbox);
---
> i = IS_FC(isp)? isp_parse_async_fc(isp, info) : isp_parse_async(isp, info);
5080c5080
< if ((IS_FC(isp) && mbox != ASYNC_RIOZIO_STALL) || isp->isp_state != ISP_RUNSTATE) {
---
> if ((IS_FC(isp) && info != ASYNC_RIOZIO_STALL) || isp->isp_state != ISP_RUNSTATE) {
5095c5095,5096
< isp_prt(isp, ISP_LOGINFO, "interrupt (ISR=%x SEMA=%x) when not ready", isr, sema);
---
> isp_prt(isp, ISP_LOGINFO, "interrupt (ISR=%x SEMA=%x INFO=%x) "
> "when not ready", isr, sema, info);
5113,5114c5114,5115
< ((isr & BIU2400_R2HST_ISTAT_MASK) == ISP2400R2HST_ATIO_RSPQ_UPDATE ||
< (isr & BIU2400_R2HST_ISTAT_MASK) == ISP2400R2HST_ATIO_RQST_UPDATE)) {
---
> (isr == ISPR2HST_ATIO_UPDATE || isr == ISPR2HST_ATIO_RSPQ_UPDATE ||
> isr == ISPR2HST_ATIO_UPDATE2)) {
5148,5166d5148
< * Get the current Response Queue Out Pointer.
< *
< * If we're a 2300 or 2400, we can ask what hardware what it thinks.
< */
< #if 0
< if (IS_23XX(isp) || IS_24XX(isp)) {
< optr = ISP_READ(isp, isp->isp_respoutrp);
< /*
< * Debug: to be taken out eventually
< */
< if (isp->isp_resodx != optr) {
< isp_prt(isp, ISP_LOGINFO, "isp_intr: hard optr=%x, soft optr %x", optr, isp->isp_resodx);
< isp->isp_resodx = optr;
< }
< } else
< #endif
< optr = isp->isp_resodx;
<
< /*
5186a5169
> optr = isp->isp_resodx;
5210,5211c5193,5194
< mbox = ISP_READ(isp, OUTMAILBOX0);
< if ((sema & 0x3) && (mbox & 0x8000)) {
---
> info = ISP_READ(isp, OUTMAILBOX0);
> if ((sema & 0x3) && (info & 0x8000)) {