From nobody Tue Sep 22 15:48:55 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 4hq4Jl5xCvz6sPTS for ; Tue, 22 Sep 2026 15:48:55 +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 4hq4Jl4LK5z50j6 for ; Tue, 22 Sep 2026 15:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790092135; 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=AXO0DUYhNSQm2pKPkDqb49TIsLGuWrOUIibt428Uv+g=; b=r1omc+lDi0PQe4smPoyBcP0IVuKOlWU7ywDpjkQLdgN1ohuI9CwdQ41XfVH01gwGP9VRUG cacZhVKpfJVmkOi1QLuyjxZpBaJ9dXaGFtJGNCr4zxv/sAMqCLdkPLBFzhCY6LajJ1CiTf PT6BEQsu1kOrnzvfw7B8BctBsfah8/Q+8ZT8QWb1xMDVSByjPsuZTV0EHRHNaS7MVLa+jX sdfhVy5q4TUfPZmIZCR/jHI8252zPktKHgQfYaPsJPPYk7GgT1cW+7hH2M8IPLFyEedZf+ 1KqYhn8aZxu1w50CRWNrTGi/SouWGUn6iDI4UrJjTOpg26J5UEIA/gjC7pwltg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790092135; b=CfY5AKX1sD9s4xNsRvCyTvW85OuZiT09Iobi8Yw51astzpR16vk5tsyDSr7jdepje7oGOs vkOHEOh9iG3EtD60e3xOcWnxdgxqhjOib2Y09BUneZOSUJJn9GWYDitiroRW8vwIfZjMQn xaj/XHkKQO72C4gDbKUWrElm2s0jnw159SvaBVeQpAw3bIkXPJTILcp1bKeHmlO5ilHaRH a8JEKlEkzBpaun1I28DrXgWcJ2ppBmbx3qmrTO9+4PxcWHjTn5Zxc3URJF9B7loeKKbkow CkmRNRy8t1vgXX6SjrLpLMOCg4QqmP4yTvKVk1fHngJNxf6oPw/vJh3qU9+UhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790092135; 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=AXO0DUYhNSQm2pKPkDqb49TIsLGuWrOUIibt428Uv+g=; b=qaDeO8A1hVE2rTvN39KD2BLnBiBs5iFqdb1ftPy2pHen+n2jgETDajwPWP0qjO7MbP1q3C 6oDiZSRzRlYU89bor0QH+RywBC8Gqt8muABAf0Qzl+izpi9EuXDOh3Sz77qwnraG1ZLybp yKPq3bDlwpQcVFQIsUtQwRvvuJvQcAfvGeEcW/I1gJuBbeyyfq2DLY7vOQIfV7WQ8OMrYw 73nwYgjAKOCCagi6fAP9eychGj84KIff3DvcXvwts7QfVcDR27JKvurL+4JT3sUVsTkZKj hpQH08C5Sy2Ote4DAkBr0vcK+kxE03x5gtFMjo9ieENoyUk0fiC+1UZ3TpZoAw== 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 4hq4Jl2sZQz1CLm for ; Tue, 22 Sep 2026 15:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 348d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 15:48:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: b85fe129b864 - stable/15 - LinuxKPI: Add PCI_EXP_TYPE_UPSTREAM and PCI_VENDOR_ID_AMD defines 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b85fe129b8647c3a06c16dd1ad4afb9b33b2d5c5 Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 15:48:55 +0000 Message-Id: <6ab2a367.348d2.69a6ef4d@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b85fe129b8647c3a06c16dd1ad4afb9b33b2d5c5 commit b85fe129b8647c3a06c16dd1ad4afb9b33b2d5c5 Author: Vladimir Kondratyev AuthorDate: 2026-09-17 07:42:48 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-09-22 15:47:03 +0000 LinuxKPI: Add PCI_EXP_TYPE_UPSTREAM and PCI_VENDOR_ID_AMD defines Required by drm-kmod v6.12.105 Reviewed by: bz, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D59734 (cherry picked from commit 52d1a0c62be1b4bd8e78ee57c86288246d948046) --- sys/compat/linuxkpi/common/include/linux/pci.h | 1 + sys/compat/linuxkpi/common/include/linux/pci_ids.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index ab564538fb3b..a73d7d4ef515 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -147,6 +147,7 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define PCI_EXP_TYPE_ROOT_PORT PCIEM_TYPE_ROOT_PORT /* Root Port */ #define PCI_EXP_TYPE_ENDPOINT PCIEM_TYPE_ENDPOINT /* Express Endpoint */ #define PCI_EXP_TYPE_LEG_END PCIEM_TYPE_LEGACY_ENDPOINT /* Legacy Endpoint */ +#define PCI_EXP_TYPE_UPSTREAM PCIEM_TYPE_UPSTREAM_PORT /* Upstream Port */ #define PCI_EXP_TYPE_DOWNSTREAM PCIEM_TYPE_DOWNSTREAM_PORT /* Downstream Port */ #define PCI_EXP_FLAGS_SLOT PCIEM_FLAGS_SLOT /* Slot implemented */ #define PCI_EXP_TYPE_RC_EC PCIEM_TYPE_ROOT_EC /* Root Complex Event Collector */ diff --git a/sys/compat/linuxkpi/common/include/linux/pci_ids.h b/sys/compat/linuxkpi/common/include/linux/pci_ids.h index e318f6f75ce7..7ec898927224 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci_ids.h +++ b/sys/compat/linuxkpi/common/include/linux/pci_ids.h @@ -44,6 +44,7 @@ /* XXX We should really generate these and use them throughout the tree. */ +#define PCI_VENDOR_ID_AMD 0x1022 #define PCI_VENDOR_ID_APPLE 0x106b #define PCI_VENDOR_ID_ASUSTEK 0x1043 #define PCI_VENDOR_ID_ASMEDIA 0x1b21