From owner-svn-src-all@FreeBSD.ORG Sun Sep 29 20:10:23 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 57D38C98; Sun, 29 Sep 2013 20:10:23 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2B38626C2; Sun, 29 Sep 2013 20:10:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8TKANgg023048; Sun, 29 Sep 2013 20:10:23 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8TKAN0j023046; Sun, 29 Sep 2013 20:10:23 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201309292010.r8TKAN0j023046@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 29 Sep 2013 20:10:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255943 - head/sys/powerpc/ps3 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Sep 2013 20:10:23 -0000 Author: nwhitehorn Date: Sun Sep 29 20:10:22 2013 New Revision: 255943 URL: http://svnweb.freebsd.org/changeset/base/255943 Log: Changes to CAM or busdma have caused SIMs to be sent 0-length CCBs on 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 Modified: head/sys/powerpc/ps3/ps3cdrom.c Modified: head/sys/powerpc/ps3/ps3cdrom.c ============================================================================== --- head/sys/powerpc/ps3/ps3cdrom.c Sun Sep 29 18:07:14 2013 (r255942) +++ head/sys/powerpc/ps3/ps3cdrom.c Sun Sep 29 20:10:22 2013 (r255943) @@ -557,7 +557,9 @@ ps3cdrom_transfer(void *arg, bus_dma_seg 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_seg 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_seg 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_seg 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,