From owner-svn-src-user@FreeBSD.ORG  Mon Jan 30 23:37:17 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3DE71065674;
	Mon, 30 Jan 2012 23:37:17 +0000 (UTC)
	(envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF1268FC15;
	Mon, 30 Jan 2012 23:37:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0UNbHEd007721;
	Mon, 30 Jan 2012 23:37:17 GMT
	(envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0UNbHll007718;
	Mon, 30 Jan 2012 23:37:17 GMT
	(envelope-from jimharris@svn.freebsd.org)
Message-Id: <201201302337.q0UNbHll007718@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Mon, 30 Jan 2012 23:37:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230792 - user/jimharris/isci/sys/dev/isci/scil
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jan 2012 23:37:17 -0000

Author: jimharris
Date: Mon Jan 30 23:37:17 2012
New Revision: 230792
URL: http://svn.freebsd.org/changeset/base/230792

Log:
  Fix ATAPI code path to ensure bus_dma_segment structures are only used
  within bus_dmamap_load context.
  
  Sponsored by: Intel
  Reported by: Sohaib Ahsan <sohaib dot ahsan intel com>

Modified:
  user/jimharris/isci/sys/dev/isci/scil/scic_sds_stp_packet_request.c
  user/jimharris/isci/sys/dev/isci/scil/scic_sds_stp_request.c

Modified: user/jimharris/isci/sys/dev/isci/scil/scic_sds_stp_packet_request.c
==============================================================================
--- user/jimharris/isci/sys/dev/isci/scil/scic_sds_stp_packet_request.c	Mon Jan 30 23:07:27 2012	(r230791)
+++ user/jimharris/isci/sys/dev/isci/scil/scic_sds_stp_packet_request.c	Mon Jan 30 23:37:17 2012	(r230792)
@@ -192,8 +192,8 @@ void scu_stp_packet_request_command_phas
       task_context->transfer_length_bytes =
          scic_cb_io_request_get_transfer_length(this_request->user_request);
 
-      // setup sgl
-      scic_sds_request_build_sgl(this_request);
+      // sgls were already built when request was constructed, so don't need to
+      //  to do it here
    }
    else
    {

Modified: user/jimharris/isci/sys/dev/isci/scil/scic_sds_stp_request.c
==============================================================================
--- user/jimharris/isci/sys/dev/isci/scil/scic_sds_stp_request.c	Mon Jan 30 23:07:27 2012	(r230791)
+++ user/jimharris/isci/sys/dev/isci/scil/scic_sds_stp_request.c	Mon Jan 30 23:37:17 2012	(r230792)
@@ -585,6 +585,8 @@ SCI_STATUS scic_sds_io_request_construct
    case SAT_PROTOCOL_PACKET_PIO_DATA_IN:
    case SAT_PROTOCOL_PACKET_PIO_DATA_OUT:
       status = scic_sds_stp_packet_request_construct(this_request);
+      if (do_translate_sgl == TRUE)
+         scic_sds_request_build_sgl(this_request);
    break;
 #endif