From nobody Mon Nov 28 17:14:36 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 4NLXC04HY9z4jPZp; Mon, 28 Nov 2022 17:14:36 +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 4NLXC03lwSz3yj6; Mon, 28 Nov 2022 17:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669655676; 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=mU9UeiFrPmuscddd5FHsW8Ka3ADmkWA3en9MhIcjYj4=; b=kLXJdsUDo9A1wAUoax5EjhgzxaJT823DsuS/Rov6PcE5qb5WBJR8wpibjCGLwkEvsYHw7S Aj8k227Fn5eor1K+OSFHdT8ftdXlzMUpxYq1Ztptb/Fq0LExJ+zWfdOUtGyFh/bGmbnBIy CV+yBwqUE4N2COo3KnRAsxeIxAgdT680R4k8WHizmK5cM4ifHoPTmTVOujLkr/3JoW9RK2 dhWfOFemOdtSZo21DWg15XP/nsCNU6Zq+aQHNwd5A6byFlW0mZ4XlMKjVhzqKDXLlKdz3e AIDjvGXpIfy4+B4PLRdFaNtHAW5u1VH/env+DeF26QRS6UZQO4OhOFlmRbAGJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669655676; 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=mU9UeiFrPmuscddd5FHsW8Ka3ADmkWA3en9MhIcjYj4=; b=HNNcZSO44ZM49Wjg6UhFBIKhQwNeTN/v/zP6DVDn1+I68swD84YngFuQ6pKuE2CtsSzGmO MQ5U47hSTC3PbG/MQssrDPzZ1o1UOkPDeXAPicBcDvtjQi1tfohWhcyPSv/Aa2j7EvERPH W5fkA17+IIz5tOWV3BUlrRiX+WJ1cW2DKhRmW+muvhU+JglXrbRVpLN+ow4qbEXBrj96o7 w4P0l7vUcf2vPxNb/d1Scuh/z3SIEJrE1CVmvzgcTSLfieFEdb0eYIUUPQFF4eVhtPsnvv h6CZRpCVkZ+pbdQv6+Vpo69dps0MyVbVA/yki5GAp9QvZG9PH+d4q3+uHsfphA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669655676; a=rsa-sha256; cv=none; b=Z0fLZfffPMX2FK7Au+Qm2lnbDJzUSJ3dslfY43Zi+V1ub0zSdsZOJwYCUDMAxVggBDGuiP hsrds+100NmTFbzTUksfa82nSMt1eEGdBoUwMH6MlkhOEXwWyzgecD682Fw2sOSpnzlUuo Fkc+/d0Nu/4LT8NLe7f7d2rxDkE/lRw6+1GTRpsuccaMvbjgRPFxy0SGCq9oze/TTwBb4b CmmYJK/D8oFsdh6lMGb3xUQExicwdmGdNSkNGBzg0ZJCdkNZLzxKiDILhUITfTmrgKdebO a4LFGc9Ch8a6ftuprA/Kk0ezMn14Jh79DMp+eaMUNkPt1RzoSIVYSLLgJZE4Tw== 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 4NLXC02b1rzlHP; Mon, 28 Nov 2022 17:14:36 +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 2ASHEaX0066380; Mon, 28 Nov 2022 17:14:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ASHEaMF066379; Mon, 28 Nov 2022 17:14:36 GMT (envelope-from git) Date: Mon, 28 Nov 2022 17:14:36 GMT Message-Id: <202211281714.2ASHEaMF066379@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: 5f2f582cccee - main - LinuxKPI: pci.h add more MSI related constanst and pci_is_enabled() 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: 5f2f582ccceec8729ee85bf191a2f7373c2994a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5f2f582ccceec8729ee85bf191a2f7373c2994a4 commit 5f2f582ccceec8729ee85bf191a2f7373c2994a4 Author: Bjoern A. Zeeb AuthorDate: 2022-10-31 22:14:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-11-28 17:11:47 +0000 LinuxKPI: pci.h add more MSI related constanst and pci_is_enabled() Add more MSI related constansts defined to our native defines and pci_is_enabled(). All are needed for another wireless driver. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D37225 --- sys/compat/linuxkpi/common/include/linux/pci.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 72fe345a72a6..20f9b917fbdc 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -161,6 +161,11 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define PCI_EXP_LNKCTL2_ENTER_COMP 0x0010 /* Enter Compliance */ #define PCI_EXP_LNKCTL2_TX_MARGIN 0x0380 /* Transmit Margin */ +#define PCI_MSI_ADDRESS_LO PCIR_MSI_ADDR +#define PCI_MSI_ADDRESS_HI PCIR_MSI_ADDR_HIGH +#define PCI_MSI_FLAGS PCIR_MSI_CTRL +#define PCI_MSI_FLAGS_ENABLE PCIM_MSICTRL_MSI_ENABLE + #define PCI_EXP_LNKCAP_CLKPM 0x00040000 #define PCI_EXP_DEVSTA_TRPND 0x0020 @@ -1608,4 +1613,12 @@ pcie_get_readrq(struct pci_dev *dev) return (128 << ((ctl & PCI_EXP_DEVCTL_READRQ) >> 12)); } +static inline bool +pci_is_enabled(struct pci_dev *pdev) +{ + + return ((pci_read_config(pdev->dev.bsddev, PCIR_COMMAND, 2) & + PCIM_CMD_BUSMASTEREN) != 0); +} + #endif /* _LINUXKPI_LINUX_PCI_H_ */