diff options
| author | Jim Harris <jimharris@FreeBSD.org> | 2013-03-26 23:04:06 +0000 |
|---|---|---|
| committer | Jim Harris <jimharris@FreeBSD.org> | 2013-03-26 23:04:06 +0000 |
| commit | 1da66a277601837e939e0553ad3fb95e0b4529e8 (patch) | |
| tree | fbea2b5d566dfb5bf710bab658b414278a002ae1 | |
| parent | de9dcfba063ba8dde86ba61a7ea6ab3d5a6bb2d5 (diff) | |
Notes
| -rw-r--r-- | sys/dev/isci/isci_controller.c | 3 | ||||
| -rw-r--r-- | sys/dev/isci/isci_io_request.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/isci/isci_controller.c b/sys/dev/isci/isci_controller.c index 32a339401a0f..c0a1758efa30 100644 --- a/sys/dev/isci/isci_controller.c +++ b/sys/dev/isci/isci_controller.c @@ -673,7 +673,8 @@ void isci_action(struct cam_sim *sim, union ccb *ccb) cpi->version_num = 1; cpi->hba_inquiry = PI_TAG_ABLE; cpi->target_sprt = 0; - cpi->hba_misc = PIM_NOBUSRESET | PIM_SEQSCAN; + cpi->hba_misc = PIM_NOBUSRESET | PIM_SEQSCAN | + PIM_UNMAPPED; cpi->hba_eng_cnt = 0; cpi->max_target = SCI_MAX_REMOTE_DEVICES - 1; cpi->max_lun = ISCI_MAX_LUN; diff --git a/sys/dev/isci/isci_io_request.c b/sys/dev/isci/isci_io_request.c index 9778ed08df70..9d2dd595daab 100644 --- a/sys/dev/isci/isci_io_request.c +++ b/sys/dev/isci/isci_io_request.c @@ -747,10 +747,6 @@ isci_io_request_execute_scsi_io(union ccb *ccb, io_request->current_sge_index = 0; io_request->parent.remote_device_handle = device->sci_object; - if ((ccb->ccb_h.flags & CAM_DATA_MASK) != CAM_DATA_VADDR) - panic("Unexpected cam data format! flags = 0x%x\n", - ccb->ccb_h.flags); - error = bus_dmamap_load_ccb(io_request->parent.dma_tag, io_request->parent.dma_map, ccb, isci_io_request_construct, io_request, 0x0); |