From owner-p4-projects@FreeBSD.ORG  Thu Nov  2 23:07:50 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B31B116A416; Thu,  2 Nov 2006 23:07:50 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8E0C716A412
	for <perforce@freebsd.org>; Thu,  2 Nov 2006 23:07:50 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 43D8243D5D
	for <perforce@freebsd.org>; Thu,  2 Nov 2006 23:07:50 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA2N7oQB087928
	for <perforce@freebsd.org>; Thu, 2 Nov 2006 23:07:50 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA2N7oPe087925
	for perforce@freebsd.org; Thu, 2 Nov 2006 23:07:50 GMT
	(envelope-from mjacob@freebsd.org)
Date: Thu, 2 Nov 2006 23:07:50 GMT
Message-Id: <200611022307.kA2N7oPe087925@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109076 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Nov 2006 23:07:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=109076

Change 109076 by mjacob@newisp on 2006/11/02 23:07:36

	Fix some negotiation issues (like not being able to negotiate async)

Affected files ...

.. //depot/projects/newisp/dev/mpt/mpt_cam.c#8 edit

Differences ...

==== //depot/projects/newisp/dev/mpt/mpt_cam.c#8 (text+ko) ====

@@ -3021,12 +3021,25 @@
 			    DP_WIDE : DP_NARROW;
 		}
 
-		if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) &&
-		    (spi->valid & CTS_SPI_VALID_SYNC_RATE) &&
-		    (spi->sync_period && spi->sync_offset)) {
+		if (spi->valid & CTS_SPI_VALID_SYNC_OFFSET) {
+			dval |= DP_SYNC;
+			offset = spi->sync_offset;
+		} else {
+			PTR_CONFIG_PAGE_SCSI_DEVICE_1 ptr =
+			    &mpt->mpt_dev_page1[tgt];
+			offset = ptr->RequestedParameters;
+			offset &= MPI_SCSIDEVPAGE1_RP_MAX_SYNC_OFFSET_MASK;
+	    		offset >>= MPI_SCSIDEVPAGE1_RP_SHIFT_MAX_SYNC_OFFSET;
+		}
+		if (spi->valid & CTS_SPI_VALID_SYNC_RATE) {
 			dval |= DP_SYNC;
 			period = spi->sync_period;
-			offset = spi->sync_offset;
+		} else {
+			PTR_CONFIG_PAGE_SCSI_DEVICE_1 ptr =
+			    &mpt->mpt_dev_page1[tgt];
+			period = ptr->RequestedParameters;
+			period &= MPI_SCSIDEVPAGE1_RP_MIN_SYNC_PERIOD_MASK;
+	    		period >>= MPI_SCSIDEVPAGE1_RP_SHIFT_MIN_SYNC_PERIOD;
 		}
 		CAMLOCK_2_MPTLOCK(mpt);
 		if (dval & DP_DISC_ENABLE) {
@@ -3045,6 +3058,12 @@
 		if (dval & DP_SYNC) {
 			mpt_setsync(mpt, tgt, period, offset);
 		}
+		if (dval == 0) {
+			MPTLOCK_2_CAMLOCK(mpt);
+			mpt_set_ccb_status(ccb, CAM_REQ_CMP);
+			break;
+		}
+			
 		mpt_lprt(mpt, MPT_PRT_NEGOTIATION,
 		    "Set Settings[%d]: 0x%x period 0x%x offset %d\n", tgt,
 		    dval, period , offset);
@@ -3373,7 +3392,13 @@
 	ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_DT;
 	ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_QAS;
 	ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_IU;
-	ptr->RequestedParameters |= (period << 8) | (offset << 16);
+	if (period == 0) {
+		return;
+	}
+	ptr->RequestedParameters |=
+	    period << MPI_SCSIDEVPAGE1_RP_SHIFT_MIN_SYNC_PERIOD;
+	ptr->RequestedParameters |=
+	    offset << MPI_SCSIDEVPAGE1_RP_SHIFT_MAX_SYNC_OFFSET;
 	if (period < 0xa) {
 		ptr->RequestedParameters |= MPI_SCSIDEVPAGE1_RP_DT;
 	}