From nobody Thu Apr 30 19:54:02 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 4g64cW0TDyz6c8Pr for ; Thu, 30 Apr 2026 19:54:03 +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 4g64cV6HQbz3HL0 for ; Thu, 30 Apr 2026 19:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777578842; 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=PhnI33zUTLotwRtwuqWQ778IqMURIqrRa99fDqNUbrg=; b=p2joDP8yHLcXfYf1mDnla4UdxsO4ezHkPiJ5AL2AV3Emc2wH/0oR2ovJux6o4fOKKQUlyg kQJqbcXNG5iUtj4o7Aekl7EwzeyuPR9NS9byZzqMCbTx/Jg3zNcTqBtc0l/5MbIwTK9Gee 2+cnAn4COKSSb9garWo/GNp+6ZW6/sYCN7WSs2JPHeOaZfBiMhRu81cKH0znQkEbCXM2Kp mDG9FshMQah3SXJqB//G8wrt1ILRqaee1zjWwd0H8EtbL5kO+ucuxPvBWKYNsmK4+vaORx /234vO04UTcVuSeZ92+lZZdbjH8rsaQFEqrDrP7n6PiLyH2V7/03esJD8QVtVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777578842; a=rsa-sha256; cv=none; b=ii2e+sCi0rWETywQl+sRCT5RMv0E0hCxznP2j6weesC2REqUcg+fsvHOAdXbB3LqdlusSz MO3HSerHoE0IkEJ2972hzuzyogLccORlH25Tgho5BZ6yD//sh+N1316Ew6Ios9oa+nD5gN Ltm5Kh1H1q0E1zt79sEGv6diD+mdi4nK9ijtbVw4RJfAtdgMh1fNbYFHzgpW1RJpmfOay+ Xlzsfze7eZen8I0rOfGl3cxTs833AARPNX14Hfi6b3nfOEIaxo3YdkUZRLKx2pwtDxoD0a 1ITqkgHM+Un7VHWbq7NtYiRkxUw5318CbhFLNDirq4X4RZ/+fdsSV+BrQwoyPw== 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=1777578842; 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=PhnI33zUTLotwRtwuqWQ778IqMURIqrRa99fDqNUbrg=; b=LY7MsmImnJKb5Vpsd8YiSzWEVdur22PAtq9iGX/PROLCmOetu3fWcnjdytFuBRk8OkfUPL 2uM0+GbRzFj/JwnrPApyj82nf8UrvzsQr1zOQe9PAFNwkB/d9zX3WIzYTk+/OvTDvP670r FTlxAxq4hB8WikTMOvj8edlQr/CGI9M7HrdvAQuFSYCRc6YB738BZE586aBvrEZ+Icx1P4 AyEX4svQHxcAipqPN7Yn0I5ID9IO/ihOtssdokV+wy52Q+eyzJRk2PNprFe45VG0rYD98p 2sjvhgVKbJyexBiS5b+yRRHRdL2SniWlJoT0J0phnvmnwMdSz3N1c8lCcsgilQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g64cV5lPMzBD7 for ; Thu, 30 Apr 2026 19:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e0c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 19:54:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: ea1764e5fcf0 - main - 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 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/main X-Git-Reftype: branch X-Git-Commit: ea1764e5fcf0fc11680dc104e663ae3d1d0fd7be Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 19:54:02 +0000 Message-Id: <69f3b35a.3e0c3.1696fe86@gitrepo.freebsd.org> The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=ea1764e5fcf0fc11680dc104e663ae3d1d0fd7be commit ea1764e5fcf0fc11680dc104e663ae3d1d0fd7be Author: Michael Osipov AuthorDate: 2026-02-25 19:48:34 +0000 Commit: Michael Osipov CommitDate: 2026-04-30 19:53:47 +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 --- 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. */