From nobody Mon May 16 14:25:32 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D69AD1AD58BD; Mon, 16 May 2022 14:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L21kP14hpz3Mt0; Mon, 16 May 2022 14:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652711133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFq/Yyol+L92AvBVUD3IFjzCaCc3BR5p8X7V30IYQw4=; b=kOE/nqH3dgNPwLmUqeE79j9rc9bm5jEmSfVbaSBIYi9nwnhkef+SOPwjKVSxlxZT1vAowt /v7E4/5T1vnY3PRv2Qf4p2hJoVKaDxmH5XC2+TxgZ1Fyu3+YVBUoAimxJUJhnt+Yc35ppm SYefFtpTpuys9DwFLtbyrec95qi7DkSjmvprAoexQ1vX0v5rYwczTr+Uhs+4dRzVH88ERn H5qWLvkxAerwQkiZ4jCYWHmjmJLGvztIW1D+QLdB/wotfXLYAlGwk2mLJFz56PjVS9TrlY bpHac/SPq+4ZkVneEHMtQbRbinmkjlmU9Nti9OQwPUuLDvuiGidhR1vjH2n0rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B756921D1B; Mon, 16 May 2022 14:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24GEPWsI025671; Mon, 16 May 2022 14:25:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GEPWoU025670; Mon, 16 May 2022 14:25:32 GMT (envelope-from git) Date: Mon, 16 May 2022 14:25:32 GMT Message-Id: <202205161425.24GEPWoU025670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 718cb64a1f7b - stable/13 - mpsutil: Fix device speed reporting. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 718cb64a1f7bd375831aa9add80c378ddac63d14 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652711133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFq/Yyol+L92AvBVUD3IFjzCaCc3BR5p8X7V30IYQw4=; b=b6riuILQQAp+OdKC1LYFJaH9bbO7Bx7uQiafDHUmebzpjN7U7k0nJva6KRFos9SiHQDFYN ekisdOUBFLKqQl8kEpdtwPJK1WkgQC9TGtSE4T/OhDiRiJKnYmJ71NUPXXZ3VDFFNYiwS0 fzr0VcYF28xeALhPFTVV2TOf8z4uOputVU9g8xxVa/5mnDGOuGMLMaQrpHMmEmBhhxI86u qR8cM+aVfN+KHlryEqTqoiBzOqrHN39oplD2g9vdMh2sLhWawvW5Z5ge63SFZKZxOCd3BM Tkebswjet2ko3W/3PKcCFfhZAXivUuhowu/5mp9YPuKi1QCLPn5A8WTrTA/qIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652711133; a=rsa-sha256; cv=none; b=uv0ZXCYYn3yy9y+iSaNzkvLVxlvwBzy1T4ymIwQN+pBG1O23rZT/2YcD01eGluvrNyt/DB KOA4P70/5rhbIPc+pRWFwIHTU9o4r7B42RBdMR+Z89R2t3il2ti/8VVkUCJO0h/MZrZDCx IBAgDFMX6fP5pA39tUdeqnuzOX2129/+eTp6TEGbctfLRCQD9M3u3DI70vyJo63vLa6XkJ WwUhgE5odDv6mZK+dLU19gfbte40/edfAoAnompzTvOdYeRpL9W/8wO3FocFUO+bmsQKy6 vysBqBZUeu8ANkPKPT7mfVQX5tnc37ruJD6YzmO/d/MgeSK5RWhbqyZ2wSmy7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=718cb64a1f7bd375831aa9add80c378ddac63d14 commit 718cb64a1f7bd375831aa9add80c378ddac63d14 Author: Alexander Motin AuthorDate: 2022-05-09 21:57:29 +0000 Commit: Alexander Motin CommitDate: 2022-05-16 13:53:02 +0000 mpsutil: Fix device speed reporting. Report controller SAS phy speed only for directly attached devices. For others try to read and report parent expander phy speed. MFC after: 1 week (cherry picked from commit bce02a0ea43a0cd4ee9aa23c815189d2ccb83745) --- usr.sbin/mpsutil/mps_show.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index d293003fc67f..ef20cd942d86 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -577,9 +577,12 @@ show_devices(int ac, char **av) type = get_device_type(le32toh(device->DeviceInfo)); - if (device->PhyNum < nphys) { - phydata = &sas0->PhyData[device->PhyNum]; - speed = get_device_speed(phydata->NegotiatedLinkRate); + if (device->DeviceInfo & 0x800) { /* Direct Attached */ + if (device->PhyNum < nphys) { + phydata = &sas0->PhyData[device->PhyNum]; + speed = get_device_speed(phydata->NegotiatedLinkRate); + } else + speed = ""; } else if (device->ParentDevHandle > 0) { exp1 = mps_read_extended_config_page(fd, MPI2_CONFIG_EXTPAGETYPE_SAS_EXPANDER, @@ -597,13 +600,13 @@ show_devices(int ac, char **av) free(device); return (error); } - speed = " "; + speed = ""; } else { speed = get_device_speed(exp1->NegotiatedLinkRate); free(exp1); } } else - speed = " "; + speed = ""; if (device->EnclosureHandle != 0) { snprintf(enchandle, sizeof(enchandle), "%04x", le16toh(device->EnclosureHandle));