From owner-svn-src-stable-10@freebsd.org Thu Mar 23 06:45:58 2017 Return-Path: Delivered-To: svn-src-stable-10@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 DCBA7D1987A; Thu, 23 Mar 2017 06:45:58 +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 92319E3F; Thu, 23 Mar 2017 06:45:58 +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 v2N6jvfc056848; Thu, 23 Mar 2017 06:45:57 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2N6jv1Y056846; Thu, 23 Mar 2017 06:45:57 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703230645.v2N6jv1Y056846@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:45:57 +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: r315817 - 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-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2017 06:45:59 -0000 Author: mav Date: Thu Mar 23 06:45:57 2017 New Revision: 315817 URL: https://svnweb.freebsd.org/changeset/base/315817 Log: MFC r314968: Report some more data in XPT_PATH_INQ. I am not sure they are used anywhere, but why not. Modified: stable/10/sys/dev/mpt/mpt.h stable/10/sys/dev/mpt/mpt_cam.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mpt/mpt.h ============================================================================== --- stable/10/sys/dev/mpt/mpt.h Thu Mar 23 06:45:11 2017 (r315816) +++ stable/10/sys/dev/mpt/mpt.h Thu Mar 23 06:45:57 2017 (r315817) @@ -614,6 +614,7 @@ struct mpt_softc { struct { char wwnn[19]; char wwpn[19]; + uint32_t portid; } fc; } scinfo; Modified: stable/10/sys/dev/mpt/mpt_cam.c ============================================================================== --- stable/10/sys/dev/mpt/mpt_cam.c Thu Mar 23 06:45:11 2017 (r315816) +++ stable/10/sys/dev/mpt/mpt_cam.c Thu Mar 23 06:45:57 2017 (r315817) @@ -475,6 +475,12 @@ mpt_read_config_info_fc(struct mpt_softc break; } + mpt->scinfo.fc.wwnn = ((uint64_t)mpt->mpt_fcport_page0.WWNN.High << 32) + | mpt->mpt_fcport_page0.WWNN.Low; + mpt->scinfo.fc.wwpn = ((uint64_t)mpt->mpt_fcport_page0.WWPN.High << 32) + | mpt->mpt_fcport_page0.WWPN.Low; + mpt->scinfo.fc.portid = mpt->mpt_fcport_page0.PortIdentifier; + mpt_lprt(mpt, MPT_PRT_INFO, "FC Port Page 0: Topology <%s> WWNN 0x%08x%08x WWPN 0x%08x%08x " "Speed %u-Gbit\n", topology, @@ -3566,6 +3572,11 @@ mpt_action(struct cam_sim *sim, union cc cpi->transport = XPORT_FC; cpi->transport_version = 0; cpi->protocol_version = SCSI_REV_SPC; + cpi->xport_specific.fc.wwnn = mpt->scinfo.fc.wwnn; + cpi->xport_specific.fc.wwpn = mpt->scinfo.fc.wwpn; + cpi->xport_specific.fc.port = mpt->scinfo.fc.portid; + cpi->xport_specific.fc.bitrate = + 100000 * mpt->mpt_fcport_speed; } else if (mpt->is_sas) { cpi->hba_misc = PIM_NOBUSRESET | PIM_UNMAPPED; cpi->base_transfer_speed = 300000;