From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 22:32:50 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 338AEEAA; Mon, 11 Feb 2013 22:32:50 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 27297255; Mon, 11 Feb 2013 22:32:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BMWoEb072787; Mon, 11 Feb 2013 22:32:50 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BMWowE072786; Mon, 11 Feb 2013 22:32:50 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201302112232.r1BMWowE072786@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 11 Feb 2013 22:32:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246690 - projects/physbio/sys/dev/siis X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2013 22:32:50 -0000 Author: kib Date: Mon Feb 11 22:32:49 2013 New Revision: 246690 URL: http://svnweb.freebsd.org/changeset/base/246690 Log: The siis dma load callback siis_dmasetprd() does not handle the case nsegs == 0. Restore the direct call to siis_execute_transaction() for the ccbs which do not specify I/O. Discussed with: jeff Modified: projects/physbio/sys/dev/siis/siis.c Modified: projects/physbio/sys/dev/siis/siis.c ============================================================================== --- projects/physbio/sys/dev/siis/siis.c Mon Feb 11 21:50:00 2013 (r246689) +++ projects/physbio/sys/dev/siis/siis.c Mon Feb 11 22:32:49 2013 (r246690) @@ -994,9 +994,13 @@ siis_begin_transaction(device_t dev, uni (ccb->ataio.cmd.flags & (CAM_ATAIO_CONTROL | CAM_ATAIO_NEEDRESULT))) ch->aslots |= (1 << slot->slot); slot->dma.nsegs = 0; - slot->state = SIIS_SLOT_LOADING; - bus_dmamap_load_ccb(ch->dma.data_tag, slot->dma.data_map, - ccb, siis_dmasetprd, slot, 0); + /* If request moves data, setup and load SG list */ + if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { + slot->state = SIIS_SLOT_LOADING; + bus_dmamap_load_ccb(ch->dma.data_tag, slot->dma.data_map, + ccb, siis_dmasetprd, slot, 0); + } else + siis_execute_transaction(slot); } /* Locked by busdma engine. */