From nobody Wed Feb 05 05:28:13 2025 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 4Ynpfk1gHpz5n8FB; Wed, 05 Feb 2025 05:28:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ynpfk1BjCz3rwX; Wed, 05 Feb 2025 05:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738733294; 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=iUeKJsTO7sLsF60AkMALGBPCEs/qQK6NFABGHwdXJAk=; b=a5mR2FHZhpBhuAUhOmZ5sXPR5L4aiTNJYgEuI4xqgc6cqnAQeR//z6rty/LiDaShk7Dt1c 7bF8KPbBD9PYctrv+FpSHQ+qR2bOhcIYlDEmqMFCyHRo3Ri9Qjyz+5u5mKHbcJIuf3wzbZ uVfXhCTyFEyTQMFNwl7IZOIk0ttxQz8/6NWKCIgh1BkxAIaZHxJmaJFsIrl54fXf+IT2wz aVDhdt72/LPeDRX6d2jZzf2SwNTscV7c8kJoOwkgF4zq5Z/Qm0vGrkRrF+ctQ4tLx26HaU BiZEowOMxxqN0cV+f2mPNx6Htq+67zpYijF3o/Y6oOz2uDlx6SFUl/9n9qYGhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738733294; 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=iUeKJsTO7sLsF60AkMALGBPCEs/qQK6NFABGHwdXJAk=; b=xeDU4H3zbEf8I2iJrnLDAKqyFlzFWowO699C1bqlQQYbgq0TSTXVzwot3y1AvlbRU29uKS BXoADOGIKv8U9IWYqI8ff+H38EZLYXUiVgR6KUEd6/k1kr2QBTK4Sxgyao06ln71Xq30HD 4fw5F2QFYWXvi15PC+4/u8/nR6aThLsFO5OThQU0i+Qq3lupjqXh+I7suxUrEd916mIywV gvkNxZQKFuTWbNJEA4FZbUNU9R3ISFLTml8g5ySMZqaLuJ+G2DD/rU9lUVkilw1IiBKAmd S4nNFWHZga2RCQB8Qv1yY2E9scKFBcXWuec4F7t/+rlIXUpbdtSTi+u4xumccg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738733294; a=rsa-sha256; cv=none; b=FjV5qj1KJZJgoZ+S8KOYwmBx3rYZK7lD9/waT6CbulXFRr9GEh/c21nxrF/QeA3wsXhgXv fggnRmaO5MueiLAuvEmwDt8BbcTRB8RibDkXE10MGvJ6nE7XPmqNlznmpxpxPZIiLb8VbC 3RypJW2dvyISr/G2JdhLfb4SLPiU4pOLvlEl+Ca/wlPKmkDs5Ejo5VQMod1CqtfRO2IVzN /T4PU5w/2lOvNXEQnx9ZijQAHKCU+ksgG5/ZSQhB998T5mVsFImIIiUE2wCZjo3fUfcNmb 6m0ciOukXQLbJuE5z952xRnM0Sw/9GiJA13Qa0SgxCrcqltmafieGtD7ZPcaGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ynpfk0d9HzfJM; Wed, 05 Feb 2025 05:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5155SD9F058473; Wed, 5 Feb 2025 05:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5155SDu2058470; Wed, 5 Feb 2025 05:28:13 GMT (envelope-from git) Date: Wed, 5 Feb 2025 05:28:13 GMT Message-Id: <202502050528.5155SDu2058470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d90e14fc18e8 - main - mptutil: Capture CAM errors from bus rescan 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d90e14fc18e8d276b9b4318b4ca0e16f015c2658 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d90e14fc18e8d276b9b4318b4ca0e16f015c2658 commit d90e14fc18e8d276b9b4318b4ca0e16f015c2658 Author: Enji Cooper AuthorDate: 2025-02-05 03:52:38 +0000 Commit: Warner Losh CommitDate: 2025-02-05 03:54:26 +0000 mptutil: Capture CAM errors from bus rescan This will force reporting of CAM errors from rescanning the bus. PR: 174072 Reviewed by: imp --- usr.sbin/mptutil/mpt_config.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/usr.sbin/mptutil/mpt_config.c b/usr.sbin/mptutil/mpt_config.c index 88fb619c7eba..066f8df28268 100644 --- a/usr.sbin/mptutil/mpt_config.c +++ b/usr.sbin/mptutil/mpt_config.c @@ -313,10 +313,10 @@ clear_config(int ac, char **av) } printf("mpt%d: Configuration cleared\n", mpt_unit); - mpt_rescan_bus(-1, -1); + error = mpt_rescan_bus(-1, -1); close(fd); - return (0); + return (error); } MPT_COMMAND(top, clear, clear_config); @@ -771,7 +771,7 @@ create_volume(int ac, char **av) #ifdef DEBUG skip: #endif - mpt_rescan_bus(vol->VolumeBus, vol->VolumeID); + error = mpt_rescan_bus(vol->VolumeBus, vol->VolumeID); /* Clean up. */ free(vol); @@ -781,7 +781,7 @@ skip: free(state.ioc2); close(fd); - return (0); + return (error); } MPT_COMMAND(top, create, create_volume); @@ -825,10 +825,10 @@ delete_volume(int ac, char **av) return (error); } - mpt_rescan_bus(-1, -1); + error = mpt_rescan_bus(-1, -1); close(fd); - return (0); + return (error); } MPT_COMMAND(top, delete, delete_volume); @@ -1071,7 +1071,9 @@ remove_spare(int ac, char **av) return (error); } - mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID); + error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID); + if (error) + return (error); free(info); close(fd); @@ -1175,7 +1177,9 @@ pd_delete(int ac, char **av) return (error); } - mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID); + error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID); + if (error) + return (error); free(info); close(fd);