[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <163969087174.23020.3972970702277481795.tip-bot2@tip-bot2>
Date: Thu, 16 Dec 2021 21:41:11 -0000
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>,
Jason Gunthorpe <jgg@...dia.com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: irq/msi] powerpc/pseries/msi: Use PCI device properties
The following commit has been merged into the irq/msi branch of tip:
Commit-ID: ed1533b5810141aceed2c2a3f13a17736f40e7fa
Gitweb: https://git.kernel.org/tip/ed1533b5810141aceed2c2a3f13a17736f40e7fa
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Fri, 10 Dec 2021 23:18:52 +01:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Thu, 16 Dec 2021 22:16:38 +01:00
powerpc/pseries/msi: Use PCI device properties
instead of fiddling with MSI descriptors.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Jason Gunthorpe <jgg@...dia.com>
Link: https://lore.kernel.org/r/20211210221813.556202506@linutronix.de
---
arch/powerpc/platforms/pseries/msi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index 8e28720..dc8cf36 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -448,8 +448,7 @@ static int pseries_msi_ops_prepare(struct irq_domain *domain, struct device *dev
int nvec, msi_alloc_info_t *arg)
{
struct pci_dev *pdev = to_pci_dev(dev);
- struct msi_desc *desc = first_pci_msi_entry(pdev);
- int type = desc->pci.msi_attrib.is_msix ? PCI_CAP_ID_MSIX : PCI_CAP_ID_MSI;
+ int type = pdev->msix_enabled ? PCI_CAP_ID_MSIX : PCI_CAP_ID_MSI;
return rtas_prepare_msi_irqs(pdev, nvec, type, arg);
}
Powered by blists - more mailing lists