From nobody Thu Feb 23 19:34:40 2023 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 4PN3BT1Ffjz3sfch; Thu, 23 Feb 2023 19:34:41 +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 4PN3BT0Ybqz45tB; Thu, 23 Feb 2023 19:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677180881; 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=GDlIK+Exq989JXxh7ZcQzIhIV416cRq46I6t+9Gwoc4=; b=jLZ5MtAfZfp1Goq9JJyRJ1EFPf1PHN5xI6Hm3E42d3rqBCskkRGhrU5Pjbfa7E2UYe5zbJ OdRBxemhs8R0bW4RROeAgDHlE6V6XhRufZfDa2D1F6E8Ki8R2HCN67DkaQK+/FyQn2zKS4 4OrovIY89nik/2QrbmoujjqruurANuZ6g8RZCHoA3sboG22rct1327idIzwn/1f+tiX7jV kDvSwoPiHIXe798Fl+exzkaWPTIrGJ/6Woy4vnHHphso6YmqcjviEzNxMS/R8Ug5lj5Ggp PLVWpFjLM6FRvNMlFPSOPhGYepSvscjVXB6xLAUX3AEfSz8mfbP4Nc5speyZFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677180881; 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=GDlIK+Exq989JXxh7ZcQzIhIV416cRq46I6t+9Gwoc4=; b=mLDPPd4XqHrF8EdT3EpDoZ6JO1qDmcInaz0k95eSendG/59wn5EMqShYutQRXUvoGH4XP/ Ydwgr10yqT6EbH4iFBbeRHt6o4XE9if4ECWRZ2/hLAsAKyAKOIwOFTAJ2Ln9ApbmgbFtE6 oW6wWIoKtMVHPHLzbpvqmFun3IrvbU0n09LYil4vIUyGn4CAvyCtPwNRZAxZJA1iwavN6i 0OaqGtq8E18PJs3Xob8t9cIpV3u/VzwGtTgzWfxh7lzIbLsS9diQWovMMPI805HGvJYUqr maV8nCfU6w6CWo6puy36t+F5x83oDym1OJ0edp7ggk53f3ql1epFQJargSsXYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677180881; a=rsa-sha256; cv=none; b=OOziYuo2zeo5UbpM4AOKnhZAKIJ+DcuI6M/fWaqhkkClCIcAffr3EmMxcKjC1/S37JpJCD oSipTz+wh5XyngEXmFnkA5xGNeFD25YoHQlzUdzewAhoHva37WNA26V7HBVzWuC0LsLqwk hWB6/ndBnx7pEqjUcDVaeEn82M31d+gxJh0r+sIsMNa1ET+4C9CZdn6KR2mRWnkL5xkA/j H38Bldvon27L2f8Rayr8T7Qmxj+42SV+Mx0uVZIXZflYA/muVyDXHh5eHTgiQ9IHFDb76p jkwwraLXPCXgzBberYmjWj9ZGOP4lYQWTxKrSbYMfo+1xc9fW138Vmrt6DnqRA== 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 4PN3BS6dHxzv9K; Thu, 23 Feb 2023 19:34:40 +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 31NJYe2c020463; Thu, 23 Feb 2023 19:34:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NJYe1T020462; Thu, 23 Feb 2023 19:34:40 GMT (envelope-from git) Date: Thu, 23 Feb 2023 19:34:40 GMT Message-Id: <202302231934.31NJYe1T020462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4fa10614c773 - releng/13.2 - LinuxKPI: pci: add more 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 4fa10614c77369ae4edd09a065a70fd20e526d43 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4fa10614c77369ae4edd09a065a70fd20e526d43 commit 4fa10614c77369ae4edd09a065a70fd20e526d43 Author: Bjoern A. Zeeb AuthorDate: 2023-01-28 15:02:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-02-23 19:33:24 +0000 LinuxKPI: pci: add more functions Add a dummy pci_assign_resource() and an implementation of pci_irq_vector() returning the irq for MSI-X, MSI, and legacy interrupt. Both are needed by wirless drivers. Sponsored by: The FreeBSD Foundation Reviewed by: jhb Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D38237 (cherry picked from commit fd1a2f3dfc0e8fb20d0d397d586000bb918aab47) (cherry picked from commit 7b65e6f377ca0005a986c59f1e31a0421d92660f) --- sys/compat/linuxkpi/common/include/linux/pci.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 5e028774f079..3d43595df047 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -1694,4 +1694,30 @@ pci_is_enabled(struct pci_dev *pdev) PCIM_CMD_BUSMASTEREN) != 0); } +static inline int +pci_assign_resource(struct pci_dev *pdev, int bar) +{ + + return (0); +} + +static inline int +pci_irq_vector(struct pci_dev *pdev, unsigned int vector) +{ + + if (!pdev->msix_enabled && !pdev->msi_enabled) { + if (vector != 0) + return (-EINVAL); + return (pdev->irq); + } + + if (pdev->msix_enabled || pdev->msi_enabled) { + if ((pdev->dev.irq_start + vector) >= pdev->dev.irq_end) + return (-EINVAL); + return (pdev->dev.irq_start + vector); + } + + return (-ENXIO); +} + #endif /* _LINUXKPI_LINUX_PCI_H_ */