From nobody Sun May 3 19:46:19 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 4g7wJC3p1Jz6byvZ for ; Sun, 03 May 2026 19:46:19 +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 4g7wJC1tCZz40Zv for ; Sun, 03 May 2026 19:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777837579; 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=wywFXK8meeEJPZImlz5WVp+HobTGZuTvPyeZk6nLKCo=; b=rskondqjr/uI02QDeF9S9qsdq/Klu4qBOWUaqUDVFw9yj6vwyHHsf3P8RaM25cp1EkwOgS 29P4OgVVzd26EvKNP+jm0Qwyfv3omSG3mA29eXGQVZBG/mPkDTERxGewIewyL89Mm1U3YE f8h6o8hm3jlEHIJEbYBqp/Pj086idR11K8DdjKiPQe8RxMMCRB3Bcoo/xn4o0nHaY3eA56 LPYnbwjWPx6GP1sT+mZDJbRRDB4uUJwm6dWe0paWHs7lZxDR85HdgEJXDaRcmTGKz4Fuy6 3j8rx1I1SX2m+nSH+Kqhgi8jsqqnipvW1eX8C+lnLycjYIGY9bg4djYMENUwRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777837579; a=rsa-sha256; cv=none; b=whtWEfyf0Pq1A4rQ79ntjiT55ReGh2aXXTbZLl8cauSpVpxrQoUH3dsMafLrqCvxH2lQk7 LGahbR/C67hsKNE07E6NqUhQvE8ZUJ9vB3xf5EJpYMOQGit/nY1veIEJnrUVeA3ezrS0qq ZiXVd6s/0rOgdSg/VAJ/V9hR3NaRkVdF2Q7KERlYwGBXh9cA0K2ZQWHk/Sc4SbBFCgmShq myyQNj2E3fn2NkT2WSQkIDJGNMmw47zw9wX4EaDG7O0fR9qn87QeVfZ9QioWp03UTqRRMt YKIMp58VKPxlLGXhWACJPyZLyOzfRMaRmcb18VYpJgjaTRsDY32eils8h3QjDQ== 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=1777837579; 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=wywFXK8meeEJPZImlz5WVp+HobTGZuTvPyeZk6nLKCo=; b=VZ8TiqM0TERg0JZ/xAPXd5gnct/TRKQk6KrxgQ4ZblE8jn5dNZZU+dhLwLZ8B6jltpShf+ In8b2Q9Big0x6PpiQeXu22lG1wSPg6YLwCmHrR4JjGiM7BlqC0IjAh5lJhYHaWC5R/yWeL 1pwGKQIXZ6ZDo7er8AdJCKaXxYQs7LhPoRxw1coNAAWq5AXhBaIZhxd7elLfC9otupzTiv mHKFuOK8pQcmr88WnvWReHwrbpEZmhsyOkNnvIUaKMlzF/bAkCxWKBHi+fFAQl4kCyMek1 8pu2iR9SFNb63FzJjJHXHsUqLQtMsTh5CJkAqkXrRiceHfQovB6UfDeWbYzUcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7wJC0gw7znGP for ; Sun, 03 May 2026 19:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f811 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 03 May 2026 19:46:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 70e0a1cbdce2 - stable/13 - mfi(4)/mrsas(4): Print 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: 70e0a1cbdce27bd8a6e8c5c3da40080f3f98a0f4 Auto-Submitted: auto-generated Date: Sun, 03 May 2026 19:46:19 +0000 Message-Id: <69f7a60b.3f811.38691c3c@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=70e0a1cbdce27bd8a6e8c5c3da40080f3f98a0f4 commit 70e0a1cbdce27bd8a6e8c5c3da40080f3f98a0f4 Author: Michael Osipov AuthorDate: 2025-12-21 17:13:21 +0000 Commit: Michael Osipov CommitDate: 2026-05-03 19:45:14 +0000 mfi(4)/mrsas(4): Print driver versions consistently Reviewed by: ziaee, des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54519 (cherry picked from commit 93122ead724b3ba0ccdaedadcd371ec53f9a9844) --- sys/dev/mfi/mfi.c | 2 +- sys/dev/mrsas/mrsas.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 4a7bee6e1bbc..a41d1f589835 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -372,7 +372,7 @@ mfi_attach(struct mfi_softc *sc) if (sc == NULL) return EINVAL; - device_printf(sc->mfi_dev, "Megaraid SAS driver Ver %s \n", + 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); diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c index 9689dbec4417..dc13a24864c6 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -381,15 +381,9 @@ mrsas_find_ident(device_t dev) static int mrsas_probe(device_t dev) { - static u_int8_t first_ctrl = 1; struct mrsas_ident *id; if ((id = mrsas_find_ident(dev)) != NULL) { - if (first_ctrl) { - printf("AVAGO MegaRAID SAS FreeBSD mrsas driver version: %s\n", - MRSAS_VERSION); - first_ctrl = 0; - } device_set_desc(dev, id->desc); /* between BUS_PROBE_DEFAULT and BUS_PROBE_LOW_PRIORITY */ return (-30); @@ -862,6 +856,9 @@ 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. */