From nobody Sun May 3 19:31:12 2026 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 4g7vym4Y6Lz6bx92 for ; Sun, 03 May 2026 19:31:12 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g7vym1rs1z3sn4 for ; Sun, 03 May 2026 19:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777836672; 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=GRRRn+QwrXwg3Q/SUAeN7J1Fg5OiiFVIZnlAOppRRUg=; b=V0zzySydOAl5uIRU7nvLzwbBKZZh3LJQ35aJngPeg0XcxKosD7F2Xp977FHW3swEgJ46mt eWoOm76c4iFzSltBBSTLMacApVQZOtBXATfAuO8OMR5HqS7JSGOhIObE4CoX3EqaEFp397 F5AxBSW4FMbpXLSlubYVhQp6ONisWjRVM19Ac2VHQ/usx9xF/e0nuV/gULjIovlTW8OBZu ay+JiTLTm6sKoadTHgk8GP7w8dYfsLY3qT2FzzHw/kYwAqVrSNf7ieZoGSjapnpTfSDc4X QHQ1lDputeTX2kivVx7NcY9OyapwNxJjNH68t7AmNxsMy8GaSZx1AEGwFS3uvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777836672; a=rsa-sha256; cv=none; b=Azs66FTrBvm35HGI9iOYxVOWP+finwleznUqVuKZnuvDhdyfvX6OznfOx9LJP4bQepaX9a COYVdKZkVDqHon4yxQMBoVEj7QeryMs/vWZWOd8xZwUemLV2Mrtkbh7vjnbvKnfbyGwsGc bx9judMgPIPBT9yw5wWluRMQcYK6i/hUr/1H4D/LpyvepABrf3mRqqyDSQxLCzD22MnTpR C/SUl2obznHhHowCd/w43TgUBVy0mQMGEsCOa7t2noaBK9Zj16W7oLm+ggUwe5aYLgYMVT qy23MhYeVu7uCMzsY6VD9e1jMoOtQo740UZajFw6XPJzSq2szfpY8KIn3bLW8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777836672; 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=GRRRn+QwrXwg3Q/SUAeN7J1Fg5OiiFVIZnlAOppRRUg=; b=ygKnLamqE9iD57zZh4FPgMza4ul5wMx7DvMZFCvMA6Yfy8yDUmhq8nku/SbM5ZeOSb9MDq XNEMNBT6bS+2SV5c/4kGZEOuPYnJuocLU8D598Ag/aauTQk9gqs4yyE/39/CJXMwRnHgez tm8zoRn4nkMjsd21ALMdZ+IMl40XqbFyR3XBHARX+MyVq0pyjFqW3KqWMlToX8DBmktWaF VnDFm72gb1yM6athfcpCaHuf3I1JPR985m6/du83cReyeMCP2kEoByesy0sR+g55rt/ZBi bm0pKTUpBd4tJNtavDK6KEMD3k6vkUFZLF2g0qoFmZ0uU2AYxURWxeaI5X6ytQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7vym1S6Zzn2R for ; Sun, 03 May 2026 19:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3edb1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 19:31:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 152106e641e5 - stable/15 - mfi(4)/mrsas(4): Set sysctl name for driver versions consistently 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 152106e641e504c911358577e7e24462501b8c3e Auto-Submitted: auto-generated Date: Sun, 03 May 2026 19:31:12 +0000 Message-Id: <69f7a280.3edb1.88415f0@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=152106e641e504c911358577e7e24462501b8c3e commit 152106e641e504c911358577e7e24462501b8c3e Author: Michael Osipov AuthorDate: 2026-02-25 19:48:34 +0000 Commit: Michael Osipov CommitDate: 2026-05-03 19:27:51 +0000 mfi(4)/mrsas(4): Set sysctl name for driver versions consistently Instead of printing the driver version over and over again if multiple controllers are used, set a sysctl name for the used driver version. Approved by: imp, ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56110 (cherry picked from commit ea1764e5fcf0fc11680dc104e663ae3d1d0fd7be) --- sys/dev/mfi/mfi.c | 7 ++++--- sys/dev/mrsas/mrsas.c | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 6f94e4203f1a..767d5ba0902c 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -371,9 +371,6 @@ mfi_attach(struct mfi_softc *sc) if (sc == NULL) return EINVAL; - device_printf(sc->mfi_dev, "LSI MegaRAID SAS driver version: %s\n", - MEGASAS_VERSION); - mtx_init(&sc->mfi_io_lock, "MFI I/O lock", NULL, MTX_DEF); sx_init(&sc->mfi_config_lock, "MFI config"); TAILQ_INIT(&sc->mfi_ld_tqh); @@ -764,6 +761,10 @@ mfi_attach(struct mfi_softc *sc) sc->mfi_cdev, "%s", "megaraid_sas_ioctl_node"); if (sc->mfi_cdev != NULL) sc->mfi_cdev->si_drv1 = sc; + SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->mfi_dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->mfi_dev)), + OID_AUTO, "driver_version", CTLFLAG_RD, MEGASAS_VERSION, + strlen(MEGASAS_VERSION), "driver version"); SYSCTL_ADD_INT(device_get_sysctl_ctx(sc->mfi_dev), SYSCTL_CHILDREN(device_get_sysctl_tree(sc->mfi_dev)), OID_AUTO, "delete_busy_volumes", CTLFLAG_RW, diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c index 379fcbcb19ca..e8f43ad52ed8 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -824,9 +824,6 @@ mrsas_attach(device_t dev) struct mrsas_softc *sc = device_get_softc(dev); uint32_t cmd, error; - device_printf(dev, "AVAGO MegaRAID SAS driver version: %s\n", - MRSAS_VERSION); - memset(sc, 0, sizeof(struct mrsas_softc)); /* Look up our softc and initialize its fields. */