From nobody Tue Jan 6 19:13:15 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 4dm1685dwwz6MYDG for ; Tue, 06 Jan 2026 19:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dm1634vpjz3Brb for ; Tue, 06 Jan 2026 19:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767726795; 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=uT/QBUg/v5R0KeY3edAnN+w5n3Y4RwtKU8p10YqPXxA=; b=dDHsvEnIw277s30a/f0gK2RkTSLI/fsUKZxtTsO3AAQDHBEJqY05EAVrsoyB6kG1qRxCDu gpG8quFbVorNfpMtMUqPUkHaAjeZggbTMTUq/HnKWZJQM0loAh7idpoZ0Z/lALwrwj2Jmu 3LZ+BPeHqSlF9+Xaa0bsiU3BAWPNvKXmkzXYAX/WDdDvSEiyC3f1Ldfo4gYPd16Fzbt4H4 xJNVMY6TWsKkzOmo0kwJCvRRfQOx+WOcUvgxcYHm55+73TKXtG5lzX28Mcxd+2vM+kKBw3 NUDXzwY4DNq8s3IVAkwCV1W3QW/CU1NhQVs9DGnjQ9uFceUaDChM055NfW3bXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767726795; 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=uT/QBUg/v5R0KeY3edAnN+w5n3Y4RwtKU8p10YqPXxA=; b=aMiQA1gUiN3pBvjmQc13UDJh9xxMscrDttP7jLE6FRaawIUbP/apfe2gHZjc0KTLZhPeTG EiO5lgNa4WrOl2skU2/vLfU276T97tB4kJfbwSg8fsLQvohYW7bdojextnebumGx+oIbWb r+JOfztAlHoBcv4Xt6kogwbFIYB/M29pJbzD6eG9cqMrG9rrVJ4zBGEi3gEeWOBsD+eTxp 0uUYmooS9oZZq70Qx1JU1nfAP0MXv4QVUJ2NBq7OCJU6OiAC67k/HzkQA1hWQflxmDfJtA w4cOGF7GMtm3jNuahfEP1QGJUTT+G44ncA7a/ZuBBqS+an9M7klWCLCGLAFPIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767726795; a=rsa-sha256; cv=none; b=gb4r3tcNhWYVx+Hf2yZUvXN2crjhw105ZOv4lK3BLfuQGwnF8af+cDAcDqhoha95AnkNNE Zj9V8zob/Bk+xw66F7F+OQA+bCRkDMOhCILhjRqQc9qC9VgDT5E1YCaBoaDP2Qq2t18TZC PDxYoDnT/X9iqa3lwrvIMtdQ66sJG6T0Vw8y9lDTSvNLfsDmZGTil3Ah5OxJvukzwiaAWt OwMYwzp7b2tZMt4a3cQEGHg36P59xCKqa8KIfkV15BOrH98JHqz+ANHTOTuOTnLtqghKk3 J7+Pz7Lkv8y/9zFDxqVsUm/BM8UXzl48VH4kRE7zkq1TZOUetx0wtmICO+L0NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dm1634JHRz4jH for ; Tue, 06 Jan 2026 19:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ff62 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Jan 2026 19:13:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 3690911c355a - stable/14 - mfi(4): Add subvendor and subdevice for Fujitsu RAID Controller SAS 6Gbit/s 1GB (D3116) 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 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/14 X-Git-Reftype: branch X-Git-Commit: 3690911c355a85177d534ae19c679d8e5d259f4f Auto-Submitted: auto-generated Date: Tue, 06 Jan 2026 19:13:15 +0000 Message-Id: <695d5ecb.3ff62.4368eecc@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=3690911c355a85177d534ae19c679d8e5d259f4f commit 3690911c355a85177d534ae19c679d8e5d259f4f Author: Michael Osipov AuthorDate: 2025-12-21 15:53:27 +0000 Commit: Michael Osipov CommitDate: 2026-01-06 19:12:55 +0000 mfi(4): Add subvendor and subdevice for Fujitsu RAID Controller SAS 6Gbit/s 1GB (D3116) This is an OEM card from Fujitsu using an LSI SAS2208 ROC controller shipped with many Fujitsu PRIMERGY servers like RX300 S7. This chip is also recognized by mrsas(4) under the generic name for the controller chip. Controller description: https://www.fujitsu.com/global/products/computing/servers/primergy/blades/connection/cb-pmod-110426.html Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54520 (cherry picked from commit 8b210276cde207ca3dc1f7f46d5a6d32e0a1c51d) --- share/man/man4/mfi.4 | 2 ++ sys/dev/mfi/mfi_pci.c | 1 + 2 files changed, 3 insertions(+) diff --git a/share/man/man4/mfi.4 b/share/man/man4/mfi.4 index 4a55467d81f2..6b660c4cd744 100644 --- a/share/man/man4/mfi.4 +++ b/share/man/man4/mfi.4 @@ -109,6 +109,8 @@ Dell PERC5 .It Dell PERC6 .It +Fujitsu RAID Controller SAS 6Gbit/s 1GB (D3116) +.It IBM ServeRAID M1015 SAS/SATA .It IBM ServeRAID M1115 SAS/SATA diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c index 82082e6b72cf..ad014774c38b 100644 --- a/sys/dev/mfi/mfi_pci.c +++ b/sys/dev/mfi/mfi_pci.c @@ -131,6 +131,7 @@ struct mfi_ident { {0x1000, 0x005b, 0x1028, 0x1f35, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Adapter"}, {0x1000, 0x005b, 0x1028, 0x1f37, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Mini (blades)"}, {0x1000, 0x005b, 0x1028, 0x1f38, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Dell PERC H710 Mini (monolithics)"}, + {0x1000, 0x005b, 0x1734, 0x11d3, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Fujitsu RAID Controller SAS 6Gbit/s 1GB (D3116)"}, {0x1000, 0x005b, 0x8086, 0x9265, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Intel (R) RAID Controller RS25DB080"}, {0x1000, 0x005b, 0x8086, 0x9285, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "Intel (R) RAID Controller RS25NB008"}, {0x1000, 0x005b, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT| MFI_FLAGS_MRSAS, "ThunderBolt"},