From owner-svn-src-all@freebsd.org Thu Mar 23 06:42:28 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D532D196BC; Thu, 23 Mar 2017 06:42:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CB8CA95; Thu, 23 Mar 2017 06:42:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2N6gRvV056559; Thu, 23 Mar 2017 06:42:27 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2N6gR2Q056558; Thu, 23 Mar 2017 06:42:27 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703230642.v2N6gR2Q056558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 23 Mar 2017 06:42:27 +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: r315815 - stable/10/sys/dev/mpt 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.23 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: Thu, 23 Mar 2017 06:42:28 -0000 Author: mav Date: Thu Mar 23 06:42:27 2017 New Revision: 315815 URL: https://svnweb.freebsd.org/changeset/base/315815 Log: MFC r314966: Report FC link speed. Modified: stable/10/sys/dev/mpt/mpt_cam.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mpt/mpt_cam.c ============================================================================== --- stable/10/sys/dev/mpt/mpt_cam.c Thu Mar 23 06:41:58 2017 (r315814) +++ stable/10/sys/dev/mpt/mpt_cam.c Thu Mar 23 06:42:27 2017 (r315815) @@ -433,7 +433,23 @@ mpt_read_config_info_fc(struct mpt_softc } mpt2host_config_page_fc_port_0(&mpt->mpt_fcport_page0); - mpt->mpt_fcport_speed = mpt->mpt_fcport_page0.CurrentSpeed; + switch (mpt->mpt_fcport_page0.CurrentSpeed) { + case MPI_FCPORTPAGE0_CURRENT_SPEED_1GBIT: + mpt->mpt_fcport_speed = 1; + break; + case MPI_FCPORTPAGE0_CURRENT_SPEED_2GBIT: + mpt->mpt_fcport_speed = 2; + break; + case MPI_FCPORTPAGE0_CURRENT_SPEED_10GBIT: + mpt->mpt_fcport_speed = 10; + break; + case MPI_FCPORTPAGE0_CURRENT_SPEED_4GBIT: + mpt->mpt_fcport_speed = 4; + break; + default: + mpt->mpt_fcport_speed = 0; + break; + } switch (mpt->mpt_fcport_page0.Flags & MPI_FCPORTPAGE0_FLAGS_ATTACH_TYPE_MASK) { @@ -3465,8 +3481,10 @@ mpt_action(struct cam_sim *sim, union cc cts->protocol_version = SCSI_REV_SPC; cts->transport = XPORT_FC; cts->transport_version = 0; - fc->valid = CTS_FC_VALID_SPEED; - fc->bitrate = 100000; + if (mpt->mpt_fcport_speed != 0) { + fc->valid = CTS_FC_VALID_SPEED; + fc->bitrate = 100000 * mpt->mpt_fcport_speed; + } } else if (mpt->is_sas) { struct ccb_trans_settings_sas *sas = &cts->xport_specific.sas;