From owner-svn-src-all@FreeBSD.ORG Fri Jan 24 00:41:03 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 80B2827C; Fri, 24 Jan 2014 00:41:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6C75C1F53; Fri, 24 Jan 2014 00:41:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0O0f3jV049059; Fri, 24 Jan 2014 00:41:03 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0O0f3o5049058; Fri, 24 Jan 2014 00:41:03 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401240041.s0O0f3o5049058@svn.freebsd.org> From: Alexander Motin Date: Fri, 24 Jan 2014 00:41:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r261093 - stable/10/sys/dev/mfi X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jan 2014 00:41:03 -0000 Author: mav Date: Fri Jan 24 00:41:02 2014 New Revision: 261093 URL: http://svnweb.freebsd.org/changeset/base/261093 Log: MFC r260521: Remove not applicable PI_SDTR_ABLE and PI_WIDE_16 hba_inquiry flags to make CAM to not try negotiate unsupported settings and suppress warnings. While there, enable command queuing on pass-through devices, announced in hba_inquiry, but disabled. Even though queue size is very small, It seems working well enough. Modified: stable/10/sys/dev/mfi/mfi_cam.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mfi/mfi_cam.c ============================================================================== --- stable/10/sys/dev/mfi/mfi_cam.c Fri Jan 24 00:14:14 2014 (r261092) +++ stable/10/sys/dev/mfi/mfi_cam.c Fri Jan 24 00:41:02 2014 (r261093) @@ -216,7 +216,7 @@ mfip_cam_action(struct cam_sim *sim, uni struct ccb_pathinq *cpi = &ccb->cpi; cpi->version_num = 1; - cpi->hba_inquiry = PI_SDTR_ABLE|PI_TAG_ABLE|PI_WIDE_16; + cpi->hba_inquiry = PI_TAG_ABLE; cpi->target_sprt = 0; cpi->hba_misc = PIM_NOBUSRESET|PIM_SEQSCAN; cpi->hba_eng_cnt = 0; @@ -244,6 +244,8 @@ mfip_cam_action(struct cam_sim *sim, uni break; case XPT_GET_TRAN_SETTINGS: { + struct ccb_trans_settings_scsi *scsi = + &ccb->cts.proto_specific.scsi; struct ccb_trans_settings_sas *sas = &ccb->cts.xport_specific.sas; @@ -252,6 +254,9 @@ mfip_cam_action(struct cam_sim *sim, uni ccb->cts.transport = XPORT_SAS; ccb->cts.transport_version = 0; + scsi->valid = CTS_SCSI_VALID_TQ; + scsi->flags = CTS_SCSI_FLAGS_TAG_ENB; + sas->valid &= ~CTS_SAS_VALID_SPEED; sas->bitrate = 150000;