d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to CAM or busdma have caused SIMs to be sent 0-length CCBs on

Browse Source 
occasion. This resulted in zero mapped segments, triggering an assert in
the PS3 CDROM driver. Allow no DMA for 0-length transfers.

Approved by:	re (glebius)
MFC after:	1 week
This commit is contained in:
Nathan Whitehorn 2013-09-29 20:10:22 +00:00
parent fe39412e99
commit 59b5b8941b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/powerpc/ps3/ps3cdrom.c
View File

@ -557,7 +557,9 @@ ps3cdrom_transfer(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
uint64_t start_sector, block_count;
int err;
KASSERT(nsegs == 1, ("invalid number of DMA segments"));
KASSERT(nsegs == 1 || nsegs == 0,
("ps3cdrom_transfer: invalid number of DMA segments %d", nsegs));
KASSERT(error == 0, ("ps3cdrom_transfer: DMA error %d", error));
PS3CDROM_ASSERT_LOCKED(sc);
@ -581,6 +583,7 @@ ps3cdrom_transfer(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
switch (cdb[0]) {
case READ_10:
KASSERT(nsegs == 1, ("ps3cdrom_transfer: no data to read"));
start_sector = (cdb[2] << 24) | (cdb[3] << 16) |
(cdb[4] << 8) | cdb[5];
block_count = (cdb[7] << 8) | cdb[8];
@ -592,6 +595,7 @@ ps3cdrom_transfer(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
BUS_DMASYNC_POSTREAD);
break;
case WRITE_10:
KASSERT(nsegs == 1, ("ps3cdrom_transfer: no data to write"));
start_sector = (cdb[2] << 24) | (cdb[3] << 16) |
(cdb[4] << 8) | cdb[5];
block_count = (cdb[7] << 8) | cdb[8];
@ -622,9 +626,10 @@ ps3cdrom_transfer(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
atapi_cmd.proto = NON_DATA_PROTO;
}
atapi_cmd.nblocks = atapi_cmd.arglen = segs[0].ds_len;
atapi_cmd.nblocks = atapi_cmd.arglen =
(nsegs == 0) ? 0 : segs[0].ds_len;
atapi_cmd.blksize = 1;
atapi_cmd.buf = segs[0].ds_addr;
atapi_cmd.buf = (nsegs == 0) ? 0 : segs[0].ds_addr;
if (ccb->ccb_h.flags & CAM_DIR_OUT)
bus_dmamap_sync(sc->sc_dmatag, xp->x_dmamap,