From owner-svn-src-projects@FreeBSD.ORG Fri Dec 28 02:46:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id D0CA9740;
Fri, 28 Dec 2012 02:46:34 +0000 (UTC)
(envelope-from jeff@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 B55BD8FC08;
Fri, 28 Dec 2012 02:46:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBS2kY0j033516;
Fri, 28 Dec 2012 02:46:34 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBS2kYvR033515;
Fri, 28 Dec 2012 02:46:34 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201212280246.qBS2kYvR033515@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Fri, 28 Dec 2012 02:46:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244761 - projects/physbio/sys/dev/ahci
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2012 02:46:34 -0000
Author: jeff
Date: Fri Dec 28 02:46:34 2012
New Revision: 244761
URL: http://svnweb.freebsd.org/changeset/base/244761
Log:
- Restore the slot state.
Submitted by: jimharris@
Sponsored by: EMC / Isilon Storage Division
Modified:
projects/physbio/sys/dev/ahci/ahci.c
Modified: projects/physbio/sys/dev/ahci/ahci.c
==============================================================================
--- projects/physbio/sys/dev/ahci/ahci.c Fri Dec 28 02:43:33 2012 (r244760)
+++ projects/physbio/sys/dev/ahci/ahci.c Fri Dec 28 02:46:34 2012 (r244761)
@@ -1668,6 +1668,7 @@ ahci_begin_transaction(device_t dev, uni
ch->aslots |= (1 << slot->slot);
slot->dma.nsegs = 0;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
+ slot->state = AHCI_SLOT_LOADING;
bus_dmamap_load_ccb(ch->dma.data_tag, slot->dma.data_map, ccb,
ahci_dmasetprd, slot, 0);
} else