mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-24 11:29:10 +00:00
Code Issues Releases Activity

Don't call bus_dmamap_load in CAM_DIR_NONE case, since there is nothing

Browse Source 
to map, and technically this isn't allowed.

Functionally, it works OK (at least on x86) to call bus_dmamap_load with
a NULL data pointer and zero length, so this is primarily for correctness
and consistency with other drivers.

While here, remove check in isci_io_request_construct for nseg==0.
Previously, bus_dmamap_load would pass nseg==1, even for case where
buffer is NULL and length = 0, which allowed CAM_DIR_NONE CCBs
to get processed.  This check is not correct though, and needed to be
removed both for the changes elsewhere in this patch, as well as jeff's
preliminary bus_dmamap_load_ccb patch (which uncovered all of this in
the first place).

MFC after:	3 days
This commit is contained in:
Jim Harris 2012-12-05 20:21:33 +00:00
parent 0bebb5448b
commit dfbc6dc2fa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=243904
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/dev/isci/isci_io_request.c
View File

@ -670,8 +670,7 @@ isci_io_request_construct(void *arg, bus_dma_segment_t *seg, int nseg,
io_request->sge = seg;
ccb = io_request->ccb;
/* XXX More cleanup is needed here */
if ((nseg == 0) || (error != 0)) {
if (error != 0) {
ccb->ccb_h.status = CAM_REQ_INVALID;
xpt_done(ccb);
return;
@ -757,18 +756,21 @@ isci_io_request_execute_scsi_io(union ccb *ccb,
panic("Unexpected CAM_DATA_PHYS flag! flags = 0x%x\n",
ccb->ccb_h.flags);
error = bus_dmamap_load(io_request->parent.dma_tag,
io_request->parent.dma_map, csio->data_ptr, csio->dxfer_len,
isci_io_request_construct, io_request, 0x0);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
error = bus_dmamap_load(io_request->parent.dma_tag,
io_request->parent.dma_map, csio->data_ptr, csio->dxfer_len,
isci_io_request_construct, io_request, 0x0);
/* A resource shortage from BUSDMA will be automatically
* continued at a later point, pushing the CCB processing
* forward, which will in turn unfreeze the simq.
*/
if (error == EINPROGRESS) {
xpt_freeze_simq(controller->sim, 1);
ccb->ccb_h.flags |= CAM_RELEASE_SIMQ;
}
/* A resource shortage from BUSDMA will be automatically
* continued at a later point, pushing the CCB processing
* forward, which will in turn unfreeze the simq.
*/
if (error == EINPROGRESS) {
xpt_freeze_simq(controller->sim, 1);
ccb->ccb_h.flags |= CAM_RELEASE_SIMQ;
}
} else
isci_io_request_construct(io_request, NULL, 0, 0);
}
void