From nobody Mon Jul 6 01:43:03 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 4gtnDl4nF9z6kBKZ for ; Mon, 06 Jul 2026 01:43: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gtnDl31HHz3XlK for ; Mon, 06 Jul 2026 01:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783302183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3CTxHGY7Di9Jg3qXwwJ0vnMPFRRTx55W0l5RO+2RiQ=; b=Je0RfzxGvCw3EBurSS1CBscE5K1cTHsMLl/uakR54KJUVCsv4pGBW46ZEMkxtEqQlcVuVY jYinCRQQYTekFNMamgMVNoDRDpPsqiYYv6n4pvqFFN7tBNwFrsN45O0KDoqilgJW5rNC6z QAeBjJreBazkaTnTwc1nfotX8pIG4xehjdIjNCWj+TNR9vQJHVawQraHbvT0kAKV50A/sz Waq0LevRLMDf4OImGs7uGjadmZmW+FLUG0iH2BT5EnYR9x7hH9UGCIhSYg7a9DSG5Y19J0 zndJ/2+Qp7jC+LstzeSAeHRkkF3iW2n9PfBQQmsDLpdm2xvrBnKHllGHZNgNzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783302183; a=rsa-sha256; cv=none; b=c3q1G0d08JUNO0zvwoBX77PmY5Bx9hagDpSjhlOuyuQHdFlhsBT1f9nHfJAZyh2u9dEDgz I5O7mUYR5v6AWEcsin8bl5W+IPhTji16y9E4++QNWHOv0E3DMxCUtLYC7X4/0jBIqR9bAs rzCPf9fiztOxTJNeNADdz+y51D04UyfPUw9Wf7c/+FY7mVCqNogVZm8yzMHMh9tKcr71ax sa2EkJ4bzFhKtKo2S5Elf+wh2Xan5EKYKP21DbPtSu0nGK43SOtGwew/auYIQZzBUxISU3 LydDMR4iQiAqjVSWqSL61VNh2jUmNIwaEbvUyOEQ7p6PeNhdFskb0223KTAYlA== 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=1783302183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3CTxHGY7Di9Jg3qXwwJ0vnMPFRRTx55W0l5RO+2RiQ=; b=pxHxY2P0ZRjSDtfLCKfDwsqqYJZreHGAo7G1ktQkMW00zZqG2P/6wZyxWAHSHWx88MhQlV zjaZD0dfLB/yMIurKHZpiKFPE5t6AQdDk+zE1eN907VgKY/fxfpmACTZVIRaM0nNY/bSiR MnH3eTNufFlPb3+PGlR2LxG4LORmtNyttsZa7s7svbWTn6hLYLF69eXbv8Sa7cV9kkiH+Z MYUuXqZGIM/ghAcPMvoCVyjU0txowXIlLV67C6/A3pOGtEQrn+alOKP6mquUoD86l/jo2M czFTbeVp+2B3z5fkOBKt4si1WWQsk0EFChVM9qa6Y+u0RdcxB4fnb8jcMoUtGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gtnDl1BV2zkmZ for ; Mon, 06 Jul 2026 01:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d7be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 01:43:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Slava Shwartsman From: Konstantin Belousov Subject: git: 2bdcf05c89dd - stable/15 - libmlx5: sync PCI device allowlist with mlx5_core_pci_table 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2bdcf05c89dd12a80fe4d2fcb0875993c71d3729 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 01:43:03 +0000 Message-Id: <6a4b0827.3d7be.2d9e69b1@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2bdcf05c89dd12a80fe4d2fcb0875993c71d3729 commit 2bdcf05c89dd12a80fe4d2fcb0875993c71d3729 Author: Slava Shwartsman AuthorDate: 2026-05-04 11:19:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-06 01:35:51 +0000 libmlx5: sync PCI device allowlist with mlx5_core_pci_table (cherry picked from commit 0e2175cef5027728c0ca1ff98366cf6ecfbe2db3) --- contrib/ofed/libmlx5/mlx5.c | 19 +++++++++++++++++++ sys/dev/mlx5/mlx5_core/mlx5_main.c | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/contrib/ofed/libmlx5/mlx5.c b/contrib/ofed/libmlx5/mlx5.c index 6b1cb770ddd8..6fe6cf594c3b 100644 --- a/contrib/ofed/libmlx5/mlx5.c +++ b/contrib/ofed/libmlx5/mlx5.c @@ -67,6 +67,11 @@ static struct { unsigned vendor; unsigned device; } hca_table[] = { + /* + * PCI IDs must match mlx5_core_pci_table in + * sys/dev/mlx5/mlx5_core/mlx5_main.c so userspace loads for every + * mlx5 device the kernel probes. + */ HCA(MELLANOX, 4113), /* MT4113 Connect-IB */ HCA(MELLANOX, 4114), /* Connect-IB Virtual Function */ HCA(MELLANOX, 4115), /* ConnectX-4 */ @@ -82,9 +87,23 @@ static struct { HCA(MELLANOX, 4125), /* ConnectX-6 DX */ HCA(MELLANOX, 4126), /* ConnectX family mlx5Gen Virtual Function */ HCA(MELLANOX, 4127), /* ConnectX-6 LX */ + HCA(MELLANOX, 4128), HCA(MELLANOX, 4129), /* ConnectX-7 */ + HCA(MELLANOX, 4130), HCA(MELLANOX, 4131), /* ConnectX-8 */ + HCA(MELLANOX, 4132), HCA(MELLANOX, 4133), /* ConnectX-9 */ + HCA(MELLANOX, 4134), + HCA(MELLANOX, 4135), + HCA(MELLANOX, 4136), + HCA(MELLANOX, 4137), + HCA(MELLANOX, 4138), + HCA(MELLANOX, 4139), + HCA(MELLANOX, 4140), + HCA(MELLANOX, 4141), + HCA(MELLANOX, 4142), + HCA(MELLANOX, 4143), + HCA(MELLANOX, 4144), HCA(MELLANOX, 41682), /* BlueField integrated ConnectX-5 network controller */ HCA(MELLANOX, 41683), /* BlueField integrated ConnectX-5 network controller VF */ HCA(MELLANOX, 41686), /* BlueField-2 integrated ConnectX-6 Dx network controller */ diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index 058085348a3f..184457b7d0b5 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -2105,6 +2105,10 @@ static void shutdown_one(struct pci_dev *pdev) mlx5_pci_disable_device(dev); } +/* + * When adding device IDs, also update hca_table in + * contrib/ofed/libmlx5/mlx5.c or libibverbs will reject the device. + */ static const struct pci_device_id mlx5_core_pci_table[] = { { PCI_VDEVICE(MELLANOX, 4113) }, /* Connect-IB */ { PCI_VDEVICE(MELLANOX, 4114) }, /* Connect-IB VF */