summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjimharris <jimharris@FreeBSD.org>2013-03-26 23:04:06 +0000
committerjimharris <jimharris@FreeBSD.org>2013-03-26 23:04:06 +0000
commitea5eeccdf1b24a545056ba52b4dfb8cd84934211 (patch)
treefbea2b5d566dfb5bf710bab658b414278a002ae1
parente69d25bd006ff10869b332172e15896bad52845d (diff)
downloadFreeBSD-src-ea5eeccdf1b24a545056ba52b4dfb8cd84934211.zip
FreeBSD-src-ea5eeccdf1b24a545056ba52b4dfb8cd84934211.tar.gz
Report support for unmapped I/O by adding PIM_UNMAPPED flag.
Submitted by: jhb, scottl
-rw-r--r--sys/dev/isci/isci_controller.c3
-rw-r--r--sys/dev/isci/isci_io_request.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/isci/isci_controller.c b/sys/dev/isci/isci_controller.c
index 32a3394..c0a1758 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 9778ed0..9d2dd59 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);
OpenPOWER on IntegriCloud