From nobody Wed Sep 16 14:12:53 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 4hlLSk3DKQz6rXB3 for ; Wed, 16 Sep 2026 14:12:54 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hlLSk0qxrz3M7J for ; Wed, 16 Sep 2026 14:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567974; 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=pN5YGO1QvalIQsFrNAA0q05ghEvwz6fHZRSo53WwgUk=; b=JbbqWC+FYeLFQAuQA2shvKfXvDvYDa1jUQSUSxZcew6/j0PZ9we8PXtXMKfEgYL1b72GJO P6y65BgIAUdwxJjzoKk93tXpwumc5ucbCcV1g+F7EoDdFInzP6Tj2jmTjoszmAyNURdU4x ZANi/N+JFAVuVsaxoMOBz6siniwgulin7+qj3RdU3Zeh+AwibIMdZOPx9mVdbzESuZhxbW pSGf5ukBdHXy6PEiUtdcRc3IW0wvUqanSQFLjfjG8RjUHdiAsvtCma5rwZ65vaiYJcSQC/ iqyiCoyAAs+DiZz01jZjgv1m1y4eYcl4EwlCIcelEprXVONIhvag9TR+U/H9LQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789567974; b=tqmz2XjkFEyPnqy5nRF5b2ci+UUqLaQJzC3k4fH0G3GYATYqgKcfWGNH0AJCDw9O+vwEIv BwHFvPcfDcu416YCtnjh1gjpvAEdA+dtGcKruUItFKVqLziVgYrJ7d5Rhqh1tAbzqICDnT fHu1fWrAbArxlCV5qkm+JGbLhRaErRG1IdMrV1OPo5Hp7X5jpLxGsti10w6tvtujZmeDZf 5i+ZcUALZ8Tk0G83XXcprru8cdXuKaMyJxQ4MGiyi4t6cGFRAVKBm9Q9b8XJLiMSKWjdbJ +tmkwvIv+Z1qq33S0dIiIptxh9kQMX9CzBgWfFsrGTFZmU3nKUV0QD2PmAQxvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567974; 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=pN5YGO1QvalIQsFrNAA0q05ghEvwz6fHZRSo53WwgUk=; b=SevERH0V1MtoVg3m5ZY8W7C5aNYR2p+caoc00WQCP5o2Odm1dJgoZKr74y1DsdPK8o6lRw qCfSYOLZCo5rtktCXdN9w/OogZDS6aZB8RQEpPeQfrbjeC5+PubR/voe27tJlmrPAJqL82 cKzB2ZYScR3M3/8C43b1cYCNh1irHw01/TW550DEBLySLqh3Z5ko9BIkDuXKId2bklHYOG lbbx86jWrl1VFQmHy7skqvJk8sG63KBVOu28tlgixsYeCDnzDS/YcfRwf4g666u64w/Yfy wfjEzWQA1MpX5NkM57lTeabWbOs/3yncIpNaHpBJHzsEWLbNI4Da2IICLaCVbA== 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 4hlLSj3jmmzqbx for ; Wed, 16 Sep 2026 14:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35fcd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 14:12:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Vag Singh From: Konstantin Belousov Subject: git: d86bdbbb92ca - main - mlx5/linuxkpi: Add MLX5_PCI_DEV_IS_VF to 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/main X-Git-Reftype: branch X-Git-Commit: d86bdbbb92cae35f37fd33ba163b65f5d50c867c Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 14:12:53 +0000 Message-Id: <6aaaa3e5.35fcd.6e7f48d6@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d86bdbbb92cae35f37fd33ba163b65f5d50c867c commit d86bdbbb92cae35f37fd33ba163b65f5d50c867c Author: Vag Singh AuthorDate: 2025-08-14 05:50:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-16 14:12:07 +0000 mlx5/linuxkpi: Add MLX5_PCI_DEV_IS_VF to mlx5_core_pci_table [PATCH 11/31] FreeBSD OFED support for DPDK MLX5 PMD The MLX5 core driver recognizes a VF device as a PF device in FreeBSD VM, because mlx5_core_pci_table was not having VF flag MLX5_PCI_DEV_IS_VF. Added MLX5_PCI_DEV_IS_VF flag in mlx5_core_pci_table. Updated PCI_VDEVICE macro in LinuxKPI for class and class_mask, same as linux. Differential revision: https://reviews.freebsd.org/D32185 MFC after: 1 month --- sys/compat/linuxkpi/common/include/linux/pci.h | 2 +- sys/dev/mlx5/mlx5_core/mlx5_main.c | 32 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 8ecc4caaca70..4cdc68412adb 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -98,7 +98,7 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define PCI_VDEVICE(_vendor, _device) \ .vendor = PCI_VENDOR_ID_##_vendor, .device = (_device), \ - .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID + .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0 #define PCI_DEVICE(_vendor, _device) \ .vendor = (_vendor), .device = (_device), \ .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index 32e6ba9b509d..0b4c4d49ff7d 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -2111,21 +2111,21 @@ static void shutdown_one(struct pci_dev *pdev) * 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 */ - { PCI_VDEVICE(MELLANOX, 4115) }, /* ConnectX-4 */ - { PCI_VDEVICE(MELLANOX, 4116) }, /* ConnectX-4 VF */ - { PCI_VDEVICE(MELLANOX, 4117) }, /* ConnectX-4LX */ - { PCI_VDEVICE(MELLANOX, 4118) }, /* ConnectX-4LX VF */ - { PCI_VDEVICE(MELLANOX, 4119) }, /* ConnectX-5, PCIe 3.0 */ - { PCI_VDEVICE(MELLANOX, 4120) }, /* ConnectX-5 VF */ - { PCI_VDEVICE(MELLANOX, 4121) }, /* ConnectX-5 Ex */ - { PCI_VDEVICE(MELLANOX, 4122) }, /* ConnectX-5 Ex VF */ - { PCI_VDEVICE(MELLANOX, 4123) }, /* ConnectX-6 */ - { PCI_VDEVICE(MELLANOX, 4124) }, /* ConnectX-6 VF */ - { PCI_VDEVICE(MELLANOX, 4125) }, /* ConnectX-6 Dx */ - { PCI_VDEVICE(MELLANOX, 4126) }, /* ConnectX Family mlx5Gen Virtual Function */ - { PCI_VDEVICE(MELLANOX, 4127) }, /* ConnectX-6 LX */ + { PCI_VDEVICE(MELLANOX, 4113) }, /* Connect-IB */ + { PCI_VDEVICE(MELLANOX, 4114), MLX5_PCI_DEV_IS_VF}, /* Connect-IB VF */ + { PCI_VDEVICE(MELLANOX, 4115) }, /* ConnectX-4 */ + { PCI_VDEVICE(MELLANOX, 4116), MLX5_PCI_DEV_IS_VF}, /* ConnectX-4 VF */ + { PCI_VDEVICE(MELLANOX, 4117) }, /* ConnectX-4LX */ + { PCI_VDEVICE(MELLANOX, 4118), MLX5_PCI_DEV_IS_VF}, /* ConnectX-4LX VF */ + { PCI_VDEVICE(MELLANOX, 4119) }, /* ConnectX-5, PCIe 3.0 */ + { PCI_VDEVICE(MELLANOX, 4120), MLX5_PCI_DEV_IS_VF}, /* ConnectX-5 VF */ + { PCI_VDEVICE(MELLANOX, 4121) }, /* ConnectX-5 Ex */ + { PCI_VDEVICE(MELLANOX, 4122), MLX5_PCI_DEV_IS_VF}, /* ConnectX-5 Ex VF */ + { PCI_VDEVICE(MELLANOX, 4123) }, /* ConnectX-6 */ + { PCI_VDEVICE(MELLANOX, 4124), MLX5_PCI_DEV_IS_VF}, /* ConnectX-6 VF */ + { PCI_VDEVICE(MELLANOX, 4125) }, /* ConnectX-6 Dx */ + { PCI_VDEVICE(MELLANOX, 4126), MLX5_PCI_DEV_IS_VF}, /* ConnectX Family mlx5Gen Virtual Function */ + { PCI_VDEVICE(MELLANOX, 4127) }, /* ConnectX-6 LX */ { PCI_VDEVICE(MELLANOX, 4128) }, { PCI_VDEVICE(MELLANOX, 4129) }, /* ConnectX-7 */ { PCI_VDEVICE(MELLANOX, 4130) }, @@ -2144,7 +2144,7 @@ static const struct pci_device_id mlx5_core_pci_table[] = { { PCI_VDEVICE(MELLANOX, 4143) }, { PCI_VDEVICE(MELLANOX, 4144) }, { PCI_VDEVICE(MELLANOX, 0xa2d2) }, /* BlueField integrated ConnectX-5 network controller */ - { PCI_VDEVICE(MELLANOX, 0xa2d3) }, /* BlueField integrated ConnectX-5 network controller VF */ + { PCI_VDEVICE(MELLANOX, 0xa2d3), MLX5_PCI_DEV_IS_VF }, /* BlueField integrated ConnectX-5 network controller VF */ { PCI_VDEVICE(MELLANOX, 0xa2d6) }, /* BlueField-2 integrated ConnectX-6 Dx network controller */ { PCI_VDEVICE(MELLANOX, 0xa2dc) }, /* BlueField-3 integrated ConnectX-7 network controller */ { PCI_VDEVICE(MELLANOX, 0xa2df) }, /* BlueField-4 Family integrated network controller */