From nobody Wed Sep 16 14:12:54 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 4hlLSk6B0Yz6rXCH 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 4hlLSk5BcCz3Ly5 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=Y0wtvytZXivQA39wYg5lPb0V8imx5vCn8DHUhw5qW3o=; b=qCu5mpqTJELw3gOxqsAMLIA0oIw4XdupQCNKtBGKvGklnFwQikQtuHiKNybtNWRBylaEtL tIAG8YQ2tEM6kqGP1HkcDwIuX83tWnDP6XZcP3JdZLASi/XfC5QCM9hn1twsMdGDmh8TwM cANYonMCbdQaj6AIbh20DFR2XvDrSKfMr6VFvdIGqIN0N5yP250JS2aDO8acvKpckCdCxD iKNy6vHDN5BARuWgUDkKOhFIMUHkxC37pN885Ob5gNKnQoGqdpvC9XjCQIatwmoVYMDZXw fJXKK775CvQQ1KbeGrCMQLohTczBaosbpcG7pCR/DHlB5CsSl6qXYauMc+3xYQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789567974; b=FCEds6M/Uhy3zu/vpy715lj3RqNgLgmlAP+OIfK+tVw+lOwZOOXadkPpS3llC4isB5k6qu mAo2e0h4mWeK+BL+5/Aha2TiXLK+USwdSgwiyPQ14u0nxuQ0dqOQcjfVtjvUkZ0ikDbgpY gLnjMWIoIsFbFYj7N+ShQlbZU7ZIRHVnNCs/Rm0kVlaDJWazOi9WwhtqNsvozZ8uTHcJVZ fTlQqjM3k+snVY38Q/30kFd4T8Fd6SJzRnx3tl445tDlWN0t1ocncrIh+9lv1/dXg6x8Fy b8zvdz25HcVilM0ij8n13e73BA2XzlgULHw8Pssmqgl0vEJQP98M7xgQiq9txw== 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=Y0wtvytZXivQA39wYg5lPb0V8imx5vCn8DHUhw5qW3o=; b=U4yMCRemdYLB3jjO6HnZEyYhBOXR/+M5WyJEkA2wL2NrXBGefLXNRkB2g+HOV40KJAQM7s MOWFliCfN3UqobL7stwVyU8CV0TOx0XUj6EqvRgx68Dq0MD7EZtPH9Ehs9sIuKtUurZFy0 IXD3MqBputXCKhswQEhjWcFWHJedx5gsven2V62TrGMY+MPxboSGya1QXEMvp0mnmsbbvZ UzXM7I+YsrBg9nnVfZ0vN1gHToeapgTPHKu5wh5i+ruxMVCP1wfg0DV8c2cPsBzj2DeRER 9ThU5igL8qMRMVSAJ/xRfHOCKbYwxMzAvWE72kZKAJNunJvdG7IYSoPc6d/Giw== 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 4hlLSk4GWWzqyc for ; Wed, 16 Sep 2026 14:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37f0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 14:12:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ariel Ehrenberg From: Konstantin Belousov Subject: git: 7b9dbfc95e09 - main - fixup! 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: 7b9dbfc95e09c9174178f41404f02bbb76399421 Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 14:12:54 +0000 Message-Id: <6aaaa3e6.37f0a.7f149b21@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7b9dbfc95e09c9174178f41404f02bbb76399421 commit 7b9dbfc95e09c9174178f41404f02bbb76399421 Author: Ariel Ehrenberg AuthorDate: 2026-07-28 10:38:58 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-16 14:12:07 +0000 fixup! mlx5/linuxkpi: Add MLX5_PCI_DEV_IS_VF to mlx5_core_pci_table Use designated initializers for .class and .class_mask in PCI_VDEVICE(), and set .driver_data explicitly on the VF entries, rather than relying on positional initializers. Sponsored by: NVidia networking MFC after: 1 month --- sys/compat/linuxkpi/common/include/linux/pci.h | 3 ++- sys/dev/mlx5/mlx5_core/mlx5_main.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 4cdc68412adb..3bf8fec7f587 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -98,7 +98,8 @@ 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, 0, 0 + .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, \ + .class = 0, .class_mask = 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 0b4c4d49ff7d..749fa262351b 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -2112,19 +2112,19 @@ static void shutdown_one(struct pci_dev *pdev) */ static const struct pci_device_id mlx5_core_pci_table[] = { { PCI_VDEVICE(MELLANOX, 4113) }, /* Connect-IB */ - { PCI_VDEVICE(MELLANOX, 4114), MLX5_PCI_DEV_IS_VF}, /* Connect-IB VF */ + { PCI_VDEVICE(MELLANOX, 4114), .driver_data = 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, 4116), .driver_data = 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, 4118), .driver_data = 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, 4120), .driver_data = 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, 4122), .driver_data = 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, 4124), .driver_data = 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, 4126), .driver_data = 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 */ @@ -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), MLX5_PCI_DEV_IS_VF }, /* BlueField integrated ConnectX-5 network controller VF */ + { PCI_VDEVICE(MELLANOX, 0xa2d3), .driver_data = 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 */