From owner-freebsd-current@FreeBSD.ORG Mon Feb 16 15:09:39 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48395106566C; Mon, 16 Feb 2009 15:09:39 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57]) by mx1.freebsd.org (Postfix) with ESMTP id D5C668FC08; Mon, 16 Feb 2009 15:09:38 +0000 (UTC) (envelope-from scottl@samsco.org) Received: from phobos.local ([192.168.254.200]) (authenticated bits=0) by pooker.samsco.org (8.14.2/8.14.2) with ESMTP id n1GF9ZPi090212; Mon, 16 Feb 2009 08:09:35 -0700 (MST) (envelope-from scottl@samsco.org) Message-ID: <499981AF.9030204@samsco.org> Date: Mon, 16 Feb 2009 08:09:35 -0700 From: Scott Long User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.13) Gecko/20080313 SeaMonkey/1.1.9 MIME-Version: 1.0 To: scsi@freebsd.org, FreeBSD Current , FreeBSD Stable X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-4.4 required=3.8 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.8 X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on pooker.samsco.org Cc: Subject: HEADS UP: More CAM fixes. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2009 15:09:40 -0000 FWI. I need lots of testing on this. Only real SCSI controllers, please, not RAID controllers (except for MPT-SCSI with integrated mirroring). So Adaptec, LSI, Symbios, Buslogic, Tekram, SME, etc, users, please try this and get back to me. The patch should apply to FreeBSD 7 as well. FreeBSD 6 is only affected by this problem when CAM_NEW_TRAN_CODE is enabled. Scott -------- Original Message -------- Subject: svn commit: r188671 - head/sys/cam Date: Mon, 16 Feb 2009 14:57:15 +0000 (UTC) From: Scott Long To: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Author: scottl Date: Mon Feb 16 14:57:15 2009 New Revision: 188671 URL: http://svn.freebsd.org/changeset/base/188671 Log: Fix parallel SCSI negotiation in the CAM_NEW_TRAN_CODE world order. Overzealous sanity checks were locking the sync_rate and offset values to zero, thanks to a twisty maze of recursive code. Modified: head/sys/cam/cam_xpt.c Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Mon Feb 16 14:38:52 2009 (r188670) +++ head/sys/cam/cam_xpt.c Mon Feb 16 14:57:15 2009 (r188671) @@ -6679,9 +6679,7 @@ xpt_set_transfer_settings(struct ccb_tra if (((device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0 && (inq_data->flags & SID_Sync) == 0 && cts->type == CTS_TYPE_CURRENT_SETTINGS) - || ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0) - || (spi->sync_offset == 0) - || (spi->sync_period == 0)) { + || ((cpi.hba_inquiry & PI_SDTR_ABLE) == 0)) { /* Force async */ spi->sync_period = 0; spi->sync_offset = 0; @@ -6729,7 +6727,8 @@ xpt_set_transfer_settings(struct ccb_tra if (spi->bus_width == 0) spi->ppr_options = 0; - if ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) == 0) { + if ((spi->valid & CTS_SPI_VALID_DISC) + && ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) == 0)) { /* * Can't tag queue without disconnection. */