From nobody Sun May 3 19:46:20 2026 X-Original-To: dev-commits-src-branches@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 4g7wJD2bhhz6bygb for ; Sun, 03 May 2026 19:46:20 +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 4g7wJD23nDz40rN for ; Sun, 03 May 2026 19:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777837580; 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=4N/3JHofa35ktRqbP9i84WTAVvqHSaMA86t5ZlH4iO4=; b=eEUl0ZMfEZTjfzMLcybwqDEH5fEHGtP4Gu74RgUtaV78OLJ+iRdTu5pCzFAE19/2BUBgwp fCExJj9kmIJZvH95YJP5UZunIZrM+nURcwIG0a9Xu4gbbHnPVYDy/1oFddmc0DtCWiyC4+ wX2WkVpRSM+vVgHbiVDjFx0nff2EDvKot/hXOmgFlCDPMioYAE8w423tX6pjO1xAGVJK7C FPmWfeOSHpl5auHPYKzWpuDBm9GpYiMaAbdDveh39P9tCbwbbQPfyb92ThGkr/0i3QAKY6 cJdF8vaLncT/AszOmyr6r7BiKs/+TDgf7cllTBO2FbTB9Xnihv58M+D2bsEM9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777837580; a=rsa-sha256; cv=none; b=NrvOhfQuA8gwfYzBoZaGzBfUuEDRt2KQfiXn/oKdLrlp0C5u7cDpVwmjYp9FsvcF3Z40ec Wa+J+Ld1pKaH2oyYL5IJ1Gys6NEtCnkmYD1Kb9iocSQCeCMiLA4U40lSZVmu9oq97mQ/fo QWIdBDYFQ0yNUkd5UHtPZORHIA0NjvZWu8RCBmalH5QDzrKsxVygVOieqyRZAw8y7GAJxT HL7rEEx3sfhDFW++YofRnqIDt/rOHNiRegeqpfRptfTFI/xbJGW1C8XDC/VWc5s876EFjU 3O/8XRTGlZgk7gb8IEeOozd6/PwkEILsdJF+qBqz9z0sQYjjZNQlBFYAbtk5Hw== 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=1777837580; 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=4N/3JHofa35ktRqbP9i84WTAVvqHSaMA86t5ZlH4iO4=; b=VZdkDIm5bQCyWjodXWrn/KtG3Eayww97adCUd/nbqniNxC/VPdZsQMN3Kp4xuHRrS570WT caDRHTXtb3MoHPUf1u/tFyVkB7Nf9qFJrwdNv71NsozqIoCT2i2ne2VgdsbXsJi4lzXapL nxR7mvtAqQBDw4CtiogDLylac3C8nkOug3Jq17xsAznUgVJk1HBBW/HgXqQ9fhmWhfQInz fVKMdDVRC5m7IgaOtB8EvLeUt0lNrMw4PfsC35Y9+3kuH9iVDRHl5uAs9gKmAyP3mcbO4U Fd6D6ZsiD2GQsDiOeNzGXCEMKs+Hhdxia8WpjashT8H/XGaawcN/kWdWX5RTpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7wJD1Y7vznGQ for ; Sun, 03 May 2026 19:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f985 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 19:46:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: f59c6677ee34 - stable/13 - mfi(4)/mrsas(4): Set sysctl name for driver versions consistently List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: f59c6677ee347e79c93e4423bd5323d84216925b Auto-Submitted: auto-generated Date: Sun, 03 May 2026 19:46:20 +0000 Message-Id: <69f7a60c.3f985.631449da@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=f59c6677ee347e79c93e4423bd5323d84216925b commit f59c6677ee347e79c93e4423bd5323d84216925b Author: Michael Osipov AuthorDate: 2026-02-25 19:48:34 +0000 Commit: Michael Osipov CommitDate: 2026-05-03 19:45:15 +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 a41d1f589835..658d47cb1777 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -372,9 +372,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); @@ -765,6 +762,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 dc13a24864c6..46d9e32ae6e9 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -856,9 +856,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. */