View | Details | Raw Unified | Return to bug 238662
Collapse All | Expand All

(-)b/sys/dev/mpt/mpt_cam.c (-6 / +10 lines)
Lines 1249-1255 mpt_timeout(void *arg) Link Here
1249
1249
1250
	MPT_LOCK_ASSERT(mpt);
1250
	MPT_LOCK_ASSERT(mpt);
1251
	req = ccb->ccb_h.ccb_req_ptr;
1251
	req = ccb->ccb_h.ccb_req_ptr;
1252
	mpt_prt(mpt, "request %p:%u timed out for ccb %p (req->ccb %p)\n", req,
1252
	mpt_lprt(mpt, MPT_PRT_DEBUG,
1253
	"request %p:%u timed out for ccb %p (req->ccb %p)\n", req,
1253
	    req->serno, ccb, req->ccb);
1254
	    req->serno, ccb, req->ccb);
1254
/* XXX: WHAT ARE WE TRYING TO DO HERE? */
1255
/* XXX: WHAT ARE WE TRYING TO DO HERE? */
1255
	if ((req->state & REQ_STATE_QUEUED) == REQ_STATE_QUEUED) {
1256
	if ((req->state & REQ_STATE_QUEUED) == REQ_STATE_QUEUED) {
Lines 2598-2604 mpt_scsi_reply_handler(struct mpt_softc *mpt, request_t *req, Link Here
2598
	scsi_req = (MSG_SCSI_IO_REQUEST *)req->req_vbuf;
2599
	scsi_req = (MSG_SCSI_IO_REQUEST *)req->req_vbuf;
2599
	ccb = req->ccb;
2600
	ccb = req->ccb;
2600
	if (ccb == NULL) {
2601
	if (ccb == NULL) {
2601
		mpt_prt(mpt, "mpt_scsi_reply_handler: req %p:%u with no ccb\n",
2602
		mpt_lprt(mpt, MPT_PRT_DEBUG,
2603
		"mpt_scsi_reply_handler: req %p:%u with no ccb\n",
2602
		    req, req->serno);
2604
		    req, req->serno);
2603
		return (TRUE);
2605
		return (TRUE);
2604
	}
2606
	}
Lines 2655-2661 mpt_scsi_reply_handler(struct mpt_softc *mpt, request_t *req, Link Here
2655
	if ((req->state & REQ_STATE_TIMEDOUT) == 0) {
2657
	if ((req->state & REQ_STATE_TIMEDOUT) == 0) {
2656
		TAILQ_REMOVE(&mpt->request_pending_list, req, links);
2658
		TAILQ_REMOVE(&mpt->request_pending_list, req, links);
2657
	} else {
2659
	} else {
2658
		mpt_prt(mpt, "completing timedout/aborted req %p:%u\n",
2660
		mpt_lprt(mpt, MPT_PRT_DEBUG,
2661
		"completing timedout/aborted req %p:%u\n",
2659
		    req, req->serno);
2662
		    req, req->serno);
2660
		TAILQ_REMOVE(&mpt->request_timeout_list, req, links);
2663
		TAILQ_REMOVE(&mpt->request_timeout_list, req, links);
2661
	}
2664
	}
Lines 4017-4023 mpt_recover_commands(struct mpt_softc *mpt) Link Here
4017
		uint8_t response;
4020
		uint8_t response;
4018
		MSG_REQUEST_HEADER *hdrp = req->req_vbuf;
4021
		MSG_REQUEST_HEADER *hdrp = req->req_vbuf;
4019
4022
4020
		mpt_prt(mpt, "attempting to abort req %p:%u function %x\n",
4023
		mpt_lprt(mpt, MPT_PRT_DEBUG,
4024
		"attempting to abort req %p:%u function %x\n",
4021
		    req, req->serno, hdrp->Function);
4025
		    req, req->serno, hdrp->Function);
4022
		ccb = req->ccb;
4026
		ccb = req->ccb;
4023
		if (ccb == NULL) {
4027
		if (ccb == NULL) {
Lines 4092-4098 mpt_recover_commands(struct mpt_softc *mpt) Link Here
4092
			mpt_reset(mpt, TRUE);
4096
			mpt_reset(mpt, TRUE);
4093
			continue;
4097
			continue;
4094
		}
4098
		}
4095
		mpt_prt(mpt, "abort of req %p:%u completed\n", req, req->serno);
4099
		mpt_lprt(mpt, MPT_PRT_DEBUG,
4100
		"abort of req %p:%u completed\n", req, req->serno);
4096
	}
4101
	}
4097
}
4102
}
4098
4103
4099
- 

Return to bug 238662