From owner-svn-src-head@freebsd.org Thu Mar 9 17:53:39 2017 Return-Path: Delivered-To: svn-src-head@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 6EC7ED05510; Thu, 9 Mar 2017 17:53:39 +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 3BE301B44; Thu, 9 Mar 2017 17:53:39 +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 v29Hrc6l076050; Thu, 9 Mar 2017 17:53:38 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v29HrcqB076047; Thu, 9 Mar 2017 17:53:38 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703091753.v29HrcqB076047@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 9 Mar 2017 17:53:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314968 - head/sys/dev/mpt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2017 17:53:39 -0000 Author: mav Date: Thu Mar 9 17:53:37 2017 New Revision: 314968 URL: https://svnweb.freebsd.org/changeset/base/314968 Log: Report some more data in XPT_PATH_INQ. I am not sure they are used anywhere, but why not. MFC after: 2 weeks Modified: head/sys/dev/mpt/mpt.h head/sys/dev/mpt/mpt_cam.c Modified: head/sys/dev/mpt/mpt.h ============================================================================== --- head/sys/dev/mpt/mpt.h Thu Mar 9 17:35:35 2017 (r314967) +++ head/sys/dev/mpt/mpt.h Thu Mar 9 17:53:37 2017 (r314968) @@ -614,6 +614,7 @@ struct mpt_softc { struct { uint64_t wwnn; uint64_t wwpn; + uint32_t portid; } fc; } scinfo; Modified: head/sys/dev/mpt/mpt_cam.c ============================================================================== --- head/sys/dev/mpt/mpt_cam.c Thu Mar 9 17:35:35 2017 (r314967) +++ head/sys/dev/mpt/mpt_cam.c Thu Mar 9 17:53:37 2017 (r314968) @@ -479,6 +479,7 @@ mpt_read_config_info_fc(struct mpt_softc | 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%16jx WWPN 0x%16jx " @@ -3590,6 +3591,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;