From nobody Thu Sep 22 16:16:23 2022 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 4MYL4m40sZz4cj9R; Thu, 22 Sep 2022 16:16:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MYL4m0YY5z3Nhn; Thu, 22 Sep 2022 16:16:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663863384; 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=lZXjR8zMcagoklKHRBWb0A4FGlbo7SqCepPIQ2Z0Pl4=; b=ytsWc8cR8M0w2F2FXvt8pFJExiKV908XEjusmS5puFtE4LV1xRShN4mRnHznJEn9gtIvHQ cBO+p5mDHpvZ/OFTUmKBb3SubFSks+/JzbdteiGGDGWKO5qKDQDE92whx8GKCpyt9E0Y/A cxfRsPgoAS7YlSv+TRTILD9NPvDkTdGv90d1b4XmCG5NS0TJMmwd01FpX4x8SyMJKB3Kzv 2Ek5pe1rPxS+21Ym+5aOyqRC+GuYPsiH693msJ7Bpm1g5GpcTdruWSk7xC+Zc5gN5n+6sf FwiO4g0b6Y5Y0c5KveBOtAwJLVFjbr6rGTJo/+WZFliv9w8DrSQFXTX9PTJ+QQ== 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 4MYL4l6RWHzSDB; Thu, 22 Sep 2022 16:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28MGGNL1050281; Thu, 22 Sep 2022 16:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28MGGNpf050280; Thu, 22 Sep 2022 16:16:23 GMT (envelope-from git) Date: Thu, 22 Sep 2022 16:16:23 GMT Message-Id: <202209221616.28MGGNpf050280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c41d83548b6c - main - LinuxKPI: pci.h add more defines and functions 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c41d83548b6cf18b48af974ad995354f38cf04a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663863384; 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=lZXjR8zMcagoklKHRBWb0A4FGlbo7SqCepPIQ2Z0Pl4=; b=HI2ISUA9uZn/08e0jDGeo4SpsIs+JHM1wI0RAWiYQnnuqrm3EhwcuJwXIZoEU+TjZ3PAV+ OWb1/COPR1ltDsaYLNfiOlDugpdoS+5mA0oTWiLBPpjQGPNUFgBA1cjWzc/hzstSJw3CzL TBQV3Zc3HYyflW3pxooDUV3RyDcD6Cecjex3xBhqh1r/ZFUGLcwJgzqkko7KovOpxHZSZx 7Fb6p5C/pTlHkhrt6Em+9VWZBwhaYizALYPhKRwr+6/SyOVqgx43IR8RMU9WNXwcKfExfM H9S9SQa+as3PDOJXInyK5ToFKi6/OFcx0klhFuUFxvgG/NQ8TpBnRoXr6VACiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663863384; a=rsa-sha256; cv=none; b=jvzQyfvhqlOBiydDFO4kAXWDFU23vyy7q0abseW2atw1zPtHDKVdROpoOEi0MThysceK9O ERTCDPzOUG/UqQtcAnUtNBdDQ9OcIkhEUo/GQcBKrf0kfwvSvEdgtkQrMVVXwhmjSY+yoj jRpIRW2Z88fL+twLQBct1stIMaFl4eFcsJTRn78fY0dBzxLsDgfm26XfUrjAXaj6WMk+pT Lp6G6x/zcTf8myvQJFWLjpIA1uvVR+NzzuUN08hvR+X1kRzV1/uQnnhj7LYs0ocYCk/t4Y yuyCg3R8UrpL6bZqtHzqWkr8+uikIBurIrzQdlaosPPFJy9i1gUp0TUENVC6cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c41d83548b6cf18b48af974ad995354f38cf04a4 commit c41d83548b6cf18b48af974ad995354f38cf04a4 Author: Bjoern A. Zeeb AuthorDate: 2022-09-21 19:39:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-22 15:10:03 +0000 LinuxKPI: pci.h add more defines and functions Add #defines for PCI_DEVICE_ID and repoint the PCI_VENDOR_ID one. Add dev_is_pci(). Add pcie_capability_clear_word() according to similar implementations. Sponsored by: The FreeBSD Foundation MFC after: 7 days Reviewed by: hselasky, emaste Differential Revision: https://reviews.freebsd.org/D36653 --- sys/compat/linuxkpi/common/include/linux/pci.h | 29 ++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 0652a250c697..1f41bdb5b1db 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -4,7 +4,7 @@ * Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Ltd. * All rights reserved. - * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2020-2022 The FreeBSD Foundation * * Portions of this software were developed by Björn Zeeb * under sponsorship from the FreeBSD Foundation. @@ -106,7 +106,8 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define to_pci_dev(n) container_of(n, struct pci_dev, dev) -#define PCI_VENDOR_ID PCIR_DEVVENDOR +#define PCI_VENDOR_ID PCIR_VENDOR +#define PCI_DEVICE_ID PCIR_DEVICE #define PCI_COMMAND PCIR_COMMAND #define PCI_COMMAND_INTX_DISABLE PCIM_CMD_INTxDIS #define PCI_EXP_DEVCTL PCIER_DEVICE_CTL /* Device Control */ @@ -213,6 +214,7 @@ typedef int pci_power_t; #define PCI_IRQ_LEGACY 0x01 #define PCI_IRQ_MSI 0x02 #define PCI_IRQ_MSIX 0x04 +#define PCI_IRQ_ALL_TYPES (PCI_IRQ_MSIX|PCI_IRQ_MSI|PCI_IRQ_LEGACY) struct pci_dev; @@ -328,6 +330,13 @@ struct resource *_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size); struct pcim_iomap_devres *lkpi_pcim_iomap_devres_find(struct pci_dev *pdev); void lkpi_pcim_iomap_table_release(struct device *, void *); +static inline bool +dev_is_pci(struct device *dev) +{ + + return (device_get_devclass(dev->bsddev) == devclass_find("pci")); +} + static inline int pci_resource_type(struct pci_dev *pdev, int bar) { @@ -1159,6 +1168,22 @@ pcie_capability_set_word(struct pci_dev *dev, int pos, uint16_t val) return (error); } +static inline int +pcie_capability_clear_word(struct pci_dev *dev, int pos, uint16_t val) +{ + int error; + uint16_t v; + + error = pcie_capability_read_word(dev, pos, &v); + if (error != 0) + return (error); + + v &= ~val; + + error = pcie_capability_write_word(dev, pos, v); + return (error); +} + static inline int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed, enum pcie_link_width *width) {