diff options
author | marius <marius@FreeBSD.org> | 2013-06-24 21:27:15 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2013-06-24 21:27:15 +0000 |
commit | ac847054f7eaa1e775d5102eace816afbbf9daae (patch) | |
tree | 1c0ed10daee3e92ef10dd8dfd90fae5a813a1ec3 /sys/dev/mpt | |
parent | f12dc86bf3a86e7268be5827d25218b15600066d (diff) | |
download | FreeBSD-src-ac847054f7eaa1e775d5102eace816afbbf9daae.zip FreeBSD-src-ac847054f7eaa1e775d5102eace816afbbf9daae.tar.gz |
Flag mpt(4) as supporting unmapped I/O; all necessary conversion actually
already has been done as part of r246713 except for a comment update.
MFC after: 3 days
Diffstat (limited to 'sys/dev/mpt')
-rw-r--r-- | sys/dev/mpt/mpt_cam.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c index a35aa6a..cb82957 100644 --- a/sys/dev/mpt/mpt_cam.c +++ b/sys/dev/mpt/mpt_cam.c @@ -1254,7 +1254,8 @@ mpt_timeout(void *arg) } /* - * Callback routine from "bus_dmamap_load" or, in simple cases, called directly. + * Callback routine from bus_dmamap_load_ccb(9) or, in simple cases, called + * directly. * * Takes a list of physical segments and builds the SGL for SCSI IO command * and forwards the commard to the IOC after one last check that CAM has not @@ -1688,7 +1689,6 @@ mpt_execute_req(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error) hdrp = req->req_vbuf; mpt_off = req->req_vbuf; - if (error == 0 && ((uint32_t)nseg) >= mpt->max_seg_cnt) { error = EFBIG; } @@ -3595,21 +3595,21 @@ mpt_action(struct cam_sim *sim, union ccb *ccb) #ifdef CAM_NEW_TRAN_CODE cpi->protocol = PROTO_SCSI; if (mpt->is_fc) { - cpi->hba_misc = PIM_NOBUSRESET; + cpi->hba_misc = PIM_NOBUSRESET | PIM_UNMAPPED; cpi->base_transfer_speed = 100000; cpi->hba_inquiry = PI_TAG_ABLE; cpi->transport = XPORT_FC; cpi->transport_version = 0; cpi->protocol_version = SCSI_REV_SPC; } else if (mpt->is_sas) { - cpi->hba_misc = PIM_NOBUSRESET; + cpi->hba_misc = PIM_NOBUSRESET | PIM_UNMAPPED; cpi->base_transfer_speed = 300000; cpi->hba_inquiry = PI_TAG_ABLE; cpi->transport = XPORT_SAS; cpi->transport_version = 0; cpi->protocol_version = SCSI_REV_SPC2; } else { - cpi->hba_misc = PIM_SEQSCAN; + cpi->hba_misc = PIM_SEQSCAN | PIM_UNMAPPED; cpi->base_transfer_speed = 3300; cpi->hba_inquiry = PI_SDTR_ABLE|PI_TAG_ABLE|PI_WIDE_16; cpi->transport = XPORT_SPI; |