From nobody Thu Aug 01 22:27:28 2024 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 4WZk9Y254Xz5RZV5; Thu, 01 Aug 2024 22:27:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZk9X6jb1z4YfY; Thu, 1 Aug 2024 22:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722551248; 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=37VpnetjxCpmAW2ZTOC4l/a11+D3aiILqx5itjzaaOs=; b=OJRMAAfkqp37pIfffbsd0qK/oZT7SMHbe1TKplnkjXZOicMUE7lEfIosNCV6Q0mLGL6gy9 V442K6GWg2jdOWG1E/akideDbVaDWNvo5YF9cwiNpf5VR3h/sBfgNbM+TuWleIuKFv0xA+ CTfgWan45yoRAROjGk+sSZAJqvurhJt2IjP9+pr3/yQAXUlcjhB3qZGwjSYFhPmCICO27s zAzCzhGiL1UErLf8bxSnnlFJUGP7UQXDM3CSh7uM9GlI71K7uXYwg8It7eSJFHkxiCL8pe H3OotnxGU/yQovorUtcHluVaO40QAR7IRQUTz16GPXBuetPGmOSPv1zDTJIkAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722551248; a=rsa-sha256; cv=none; b=KCYLGxBTIkmANqOQMrz+S+8fOixvPXBWIJub7KNvfji4L72NQAYkpXnhMRAOfkUBoabazi /oUPHlT4B+0icZtPbGf7iNPHOksQkpxnwfm0bumRaNZ4065lxkCOw4S21uEGn/BtrOWd3w yX0Wty4KfP8ThBzLj4Ph8hKK+1g5JqWqvLiiGBFZ8C0/5LZohBDctV03wmmejyWGdEmus+ GddyCZ5Bk9QXD7+BxHPwq27xr5JZffrPkpmnjUZZuTCoCCpROKqVvZcpS7IGSL6uwqTDKL qcFBS3ewsMhYqR4EKhSI2JylxYyxy41WfnSYQ/wW7kR+4CcrcimCSWpe3EzCgw== 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=1722551248; 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=37VpnetjxCpmAW2ZTOC4l/a11+D3aiILqx5itjzaaOs=; b=KSMlZRjP/uyyvg7DGzWQT4NAhcuS80FOn5IDzfzNQ59w02SldKVUYQRFf/InRBoWJZbmmE acOmSnaYf4r18kamR6GSEOczadtOCW1TQxMSBjxGM9z8ZlL2y06vbMstjM89bJ4wihFVBF FVflqlwext9s2D1bN62TFdAYfdiozGktD1+czVgoJaWpQ24Y5DGcIqf0V7qrxVNhI48Lap FTS0qCEgyrenNGb8ZdDnWMeCj4+rBlZ44QP4pINjUKJA3N48XPwAK4NGhHCmHcDyRdE8t2 MFSexEaIJSpoXAzPVlPemrtLHYEFvYGg6JiURk379mj+qZ8/frAjw0qCjkpMnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WZk9X6Khgz12Jj; Thu, 1 Aug 2024 22:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471MRSsO027135; Thu, 1 Aug 2024 22:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471MRSdH027132; Thu, 1 Aug 2024 22:27:28 GMT (envelope-from git) Date: Thu, 1 Aug 2024 22:27:28 GMT Message-Id: <202408012227.471MRSdH027132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: acfd6cea1f57 - stable/14 - LinuxKPI: Add pci_dev_id to linux/pci.h 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 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/14 X-Git-Reftype: branch X-Git-Commit: acfd6cea1f570baf0ec866b42f9fe56de1ec1ea9 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=acfd6cea1f570baf0ec866b42f9fe56de1ec1ea9 commit acfd6cea1f570baf0ec866b42f9fe56de1ec1ea9 Author: Vladimir Kondratyev AuthorDate: 2024-04-08 06:47:43 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-08-01 21:09:38 +0000 LinuxKPI: Add pci_dev_id to linux/pci.h It returns bus/device/function number for given PCI device. Also add intermediate PCI_DEVID macro used in some drivers. Sponsored by: Serenity Cyber Security, LLC Reviewed by: emaste MFC after: 1 week (cherry picked from commit f1206503e5a0073f56710bfebb6e503dcf612536) --- sys/compat/linuxkpi/common/include/linux/pci.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 98ba160150f7..f8ee6c5600da 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -94,6 +94,7 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) #define PCI_FUNC(devfn) ((devfn) & 0x07) #define PCI_BUS_NUM(devfn) (((devfn) >> 8) & 0xff) +#define PCI_DEVID(bus, devfn) ((((uint16_t)(bus)) << 8) | (devfn)) #define PCI_VDEVICE(_vendor, _device) \ .vendor = PCI_VENDOR_ID_##_vendor, .device = (_device), \ @@ -386,6 +387,12 @@ dev_is_pci(struct device *dev) return (device_get_devclass(dev->bsddev) == devclass_find("pci")); } +static inline uint16_t +pci_dev_id(struct pci_dev *pdev) +{ + return (PCI_DEVID(pdev->bus->number, pdev->devfn)); +} + static inline int pci_resource_type(struct pci_dev *pdev, int bar) {