From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED90847ECC5; Tue, 11 Aug 2026 23:40:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786491622; cv=none; b=Ecn/r4DAW/r+rSy0s57vRWXWurD8F2x/MZnKcv02E0aajd6NLZBr6xFAHpfVqFIPPS5idcNSf7AlfaZN6G21tmD310jVq07NaqIKEoWpHbNFTAcBfPLwFm8Gq2XIOT06b3rPtngXNxmY1dqeKe+8SDO+Ml3AuqE2s+w8H2cR/3E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786491622; c=relaxed/simple; bh=q0EJTPZzmwGbcmaV8zp6wVDbRSfrkZG7YdI+6QwqN3c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TWfNg0O8Xqg3IX5eTZUTinP23K+Nt+163GW2mmnBkuxo47ZUtdCf3aHEFTWQt1edbaviZsLPh+HcYrIIV8jd24WA2clWNkWjjpTrnaXu+XDusc/qh3UDtduE6v5CBruI9tkoo1jQ4f7ozrSTST2XVPM/vG2kgSYMlvIRRrUmrY8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GbCr7PuN; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GbCr7PuN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFD801F000E9; Tue, 11 Aug 2026 23:40:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786491620; bh=dP/Ow6CSJlTxIV+PgdIArvTtqly361pVDQMqZe4fFsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GbCr7PuNbocBK0oBKjarp2z4Sfp0jLP32jTM4Uovvj7LppoerVctrPklLCw3XOa9C 2Mfctl6Be+fgOXomnEFhxewMF4ysTyTdSt7b7e06YsZD1D9HDwQwfog9VklGihwqpx g1/d5aIyRI9G3Nq0+8tOhDmT3P6fCp45Nvun1DSXJ+yq9urFkQV7VkIOeCfUTdt9Gf HgGkg+er0lK1lzk03uIZZKMuzmt1YDVouGs+GSYvIRdrez9fzraeFhoFvtDrjtKazS A5LdmjEt0prPq2KpXuXbPsnWX/ktn2Nt8F71eq+w+Vivrne9yZYNbih4PIuP3kU59M GcF14iVq8R40A== From: Danilo Krummrich To: bhelgaas@google.com, dakr@kernel.org, kwilczynski@kernel.org, aliceryhl@google.com, daniel.almeida@collabora.com, ojeda@kernel.org, boqun@kernel.org, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, tmgross@umich.edu, tamird@kernel.org, acourbot@nvidia.com, work@onurozkan.dev, jhubbard@nvidia.com, ttabi@nvidia.com, apopple@nvidia.com, ecourtney@nvidia.com, shashanks@nvidia.com, zhiw@nvidia.com Cc: driver-core@lists.linux.dev, linux-pci@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] PCI: Add pci_irq_type() to query the allocated interrupt type Date: Wed, 12 Aug 2026 01:39:35 +0200 Message-ID: <20260811233952.3000968-5-dakr@kernel.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260811233952.3000968-1-dakr@kernel.org> References: <20260811233952.3000968-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add a helper that returns PCI_IRQ_MSIX, PCI_IRQ_MSI, or PCI_IRQ_INTX based on the interrupt type the PCI core selected after pci_alloc_irq_vectors(). Several drivers already open-code this check against pdev->msix_enabled and pdev->msi_enabled, or even open code this helper [1]. A common helper avoids the duplication and keeps drivers from accessing the bitfield directly (see also [2]). Acked-by: Bjorn Helgaas Link: https://elixir.bootlin.com/linux/v7.1/source/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c#L196 [1] Inspired-by: John Hubbard Link: https://lore.kernel.org/all/DKKG2QM3YJYB.Z2H2B2UXJ75N@kernel.org/ [2] Signed-off-by: Danilo Krummrich --- include/linux/pci.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/linux/pci.h b/include/linux/pci.h index 64b308b6e61c..80b8561b5be0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1783,6 +1783,26 @@ void pci_free_irq_vectors(struct pci_dev *dev); int pci_irq_vector(struct pci_dev *dev, unsigned int nr); const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec); +/** + * pci_irq_type - Get the interrupt type of a PCI device + * @pdev: the PCI device to operate on + * + * Discriminate the interrupt type the PCI core selected for this device + * after a successful pci_alloc_irq_vectors() call. + * + * Return: %PCI_IRQ_MSIX, %PCI_IRQ_MSI, or %PCI_IRQ_INTX. + */ +static inline unsigned int pci_irq_type(struct pci_dev *pdev) +{ + if (pdev->msix_enabled) + return PCI_IRQ_MSIX; + + if (pdev->msi_enabled) + return PCI_IRQ_MSI; + + return PCI_IRQ_INTX; +} + #else static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; } static inline void pci_disable_msi(struct pci_dev *dev) { } @@ -1845,6 +1865,11 @@ static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, { return cpu_possible_mask; } + +static inline unsigned int pci_irq_type(struct pci_dev *pdev) +{ + return PCI_IRQ_INTX; +} #endif /** -- 2.55.0