From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Bjorn Helgaas <helgaas@kernel.org>, Marc Zygnier <maz@kernel.org>,
Alex Williamson <alex.williamson@redhat.com>,
Kevin Tian <kevin.tian@intel.com>,
Jason Gunthorpe <jgg@nvidia.com>, Megha Dey <megha.dey@intel.com>,
Ashok Raj <ashok.raj@intel.com>,
linux-pci@vger.kernel.org, Cedric Le Goater <clg@kaod.org>,
xen-devel@lists.xenproject.org, Juergen Gross <jgross@suse.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sinan Kaya <okaya@kernel.org>,
dmaengine@vger.kernel.org, Will Deacon <will@kernel.org>,
Santosh Shilimkar <ssantosh@kernel.org>,
iommu@lists.linux-foundation.org,
Stuart Yoder <stuyoder@gmail.com>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
Nishanth Menon <nm@ti.com>, Tero Kristo <kristo@kernel.org>,
linux-arm-kernel@lists.infradead.org,
Vinod Koul <vkoul@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Robin Murphy <robin.murphy@arm.com>
Subject: [patch V2 36/36] dmaengine: qcom_hidma: Cleanup MSI handling
Date: Mon, 6 Dec 2021 23:39:54 +0100 (CET) [thread overview]
Message-ID: <20211206210439.616608151@linutronix.de> (raw)
In-Reply-To: 20211206210307.625116253@linutronix.de
There is no reason to walk the MSI descriptors to retrieve the interrupt
number for a device. Use msi_get_virq() instead.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Acked-by: Sinan Kaya <okaya@kernel.org>
Cc: dmaengine@vger.kernel.org
---
drivers/dma/qcom/hidma.c | 42 ++++++++++++++++++------------------------
1 file changed, 18 insertions(+), 24 deletions(-)
--- a/drivers/dma/qcom/hidma.c
+++ b/drivers/dma/qcom/hidma.c
@@ -678,11 +678,13 @@ static void hidma_free_msis(struct hidma
{
#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
struct device *dev = dmadev->ddev.dev;
- struct msi_desc *desc;
+ int i, virq;
- /* free allocated MSI interrupts above */
- for_each_msi_entry(desc, dev)
- devm_free_irq(dev, desc->irq, &dmadev->lldev);
+ for (i = 0; i < HIDMA_MSI_INTS; i++) {
+ virq = msi_get_virq(dev, i);
+ if (virq)
+ devm_free_irq(dev, virq, &dmadev->lldev);
+ }
platform_msi_domain_free_irqs(dev);
#endif
@@ -692,45 +694,37 @@ static int hidma_request_msi(struct hidm
struct platform_device *pdev)
{
#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
- int rc;
- struct msi_desc *desc;
- struct msi_desc *failed_desc = NULL;
+ int rc, i, virq;
rc = platform_msi_domain_alloc_irqs(&pdev->dev, HIDMA_MSI_INTS,
hidma_write_msi_msg);
if (rc)
return rc;
- for_each_msi_entry(desc, &pdev->dev) {
- if (!desc->msi_index)
- dmadev->msi_virqbase = desc->irq;
-
- rc = devm_request_irq(&pdev->dev, desc->irq,
+ for (i = 0; i < HIDMA_MSI_INTS; i++) {
+ virq = msi_get_virq(&pdev->dev, i);
+ rc = devm_request_irq(&pdev->dev, virq,
hidma_chirq_handler_msi,
0, "qcom-hidma-msi",
&dmadev->lldev);
- if (rc) {
- failed_desc = desc;
+ if (rc)
break;
- }
+ if (!i)
+ dmadev->msi_virqbase = virq;
}
if (rc) {
/* free allocated MSI interrupts above */
- for_each_msi_entry(desc, &pdev->dev) {
- if (desc == failed_desc)
- break;
- devm_free_irq(&pdev->dev, desc->irq,
- &dmadev->lldev);
+ for (--i; i >= 0; i--) {
+ virq = msi_get_virq(&pdev->dev, i);
+ devm_free_irq(&pdev->dev, virq, &dmadev->lldev);
}
+ dev_warn(&pdev->dev,
+ "failed to request MSI irq, falling back to wired IRQ\n");
} else {
/* Add callback to free MSIs on teardown */
hidma_ll_setup_irq(dmadev->lldev, true);
-
}
- if (rc)
- dev_warn(&pdev->dev,
- "failed to request MSI irq, falling back to wired IRQ\n");
return rc;
#else
return -EINVAL;
prev parent reply other threads:[~2021-12-06 22:41 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 22:38 [patch V2 00/36] genirq/msi, PCI/MSI: Spring cleaning - Part 2 Thomas Gleixner
2021-12-06 22:38 ` [patch V2 01/36] device: Move MSI related data into a struct Thomas Gleixner
2021-12-06 22:38 ` [patch V2 02/36] device: Add device::msi_data pointer and struct msi_device_data Thomas Gleixner
2021-12-06 22:39 ` [patch V2 03/36] PCI/MSI: Allocate MSI device data on first use Thomas Gleixner
2021-12-07 21:03 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 04/36] platform-msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 05/36] bus: fsl-mc-msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 06/36] soc: ti: ti_sci_inta_msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 07/36] genirq/msi: Provide msi_device_populate/destroy_sysfs() Thomas Gleixner
2021-12-06 22:39 ` [patch V2 08/36] PCI/MSI: Let the irq code handle sysfs groups Thomas Gleixner
2021-12-07 21:04 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 09/36] platform-msi: Let the core " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 10/36] genirq/msi: Remove the original sysfs interfaces Thomas Gleixner
2021-12-06 22:39 ` [patch V2 11/36] platform-msi: Rename functions and clarify comments Thomas Gleixner
2021-12-06 22:39 ` [patch V2 12/36] platform-msi: Store platform private data pointer in msi_device_data Thomas Gleixner
2021-12-06 22:39 ` [patch V2 13/36] genirq/msi: Consolidate MSI descriptor data Thomas Gleixner
2021-12-06 22:39 ` [patch V2 14/36] platform-msi: Use msi_desc::msi_index Thomas Gleixner
2021-12-06 22:39 ` [patch V2 15/36] bus: fsl-mc-msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 16/36] soc: ti: ti_sci_inta_msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 17/36] PCI/MSI: " Thomas Gleixner
2021-12-07 21:04 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 18/36] genirq/msi: Add msi_device_data::properties Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-07 9:04 ` Cédric Le Goater
2021-12-07 12:47 ` Thomas Gleixner
2021-12-07 12:53 ` Thomas Gleixner
2021-12-06 22:39 ` [patch V2 19/36] PCI/MSI: Store properties in device::msi::data Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-07 21:05 ` Bjorn Helgaas
2021-12-08 15:58 ` Jason Gunthorpe
2021-12-09 17:53 ` Thomas Gleixner
2021-12-09 21:02 ` Thomas Gleixner
2021-12-06 22:39 ` [patch V2 20/36] x86/pci/XEN: Use device MSI properties Thomas Gleixner
2021-12-08 15:53 ` Jason Gunthorpe
2021-12-08 17:53 ` Thomas Gleixner
2021-12-06 22:39 ` [patch V2 21/36] x86/apic/msi: " Thomas Gleixner
2021-12-08 15:45 ` Jason Gunthorpe
2021-12-06 22:39 ` [patch V2 22/36] genirq/msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 23/36] powerpc/cell/axon_msi: Use MSI device properties Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-08 15:54 ` Jason Gunthorpe
2021-12-06 22:39 ` [patch V2 24/36] powerpc/pseries/msi: " Thomas Gleixner
2021-12-08 15:51 ` Jason Gunthorpe
2021-12-06 22:39 ` [patch V2 25/36] PCI/MSI: Provide MSI_FLAG_MSIX_CONTIGUOUS Thomas Gleixner
2021-12-07 21:05 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 26/36] powerpc/pseries/msi: Let core code check for contiguous entries Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-06 22:39 ` [patch V2 27/36] genirq/msi: Provide interface to retrieve Linux interrupt number Thomas Gleixner
2021-12-07 7:51 ` Greg Kroah-Hartman
2021-12-06 22:39 ` [patch V2 28/36] PCI/MSI: Use __msi_get_virq() in pci_get_vector() Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-07 21:05 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 29/36] PCI/MSI: Simplify pci_irq_get_affinity() Thomas Gleixner
2021-12-07 17:42 ` Cédric Le Goater
2021-12-07 21:19 ` Thomas Gleixner
2021-12-06 22:39 ` [patch V2 30/36] dmaengine: mv_xor_v2: Get rid of msi_desc abuse Thomas Gleixner
2021-12-06 22:39 ` [patch V2 31/36] perf/smmuv3: Use msi_get_virq() Thomas Gleixner
2021-12-06 22:39 ` [patch V2 32/36] iommu/arm-smmu-v3: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 33/36] mailbox: bcm-flexrm-mailbox: Rework MSI interrupt handling Thomas Gleixner
2021-12-06 22:39 ` [patch V2 34/36] bus: fsl-mc: fsl-mc-allocator: Rework MSI handling Thomas Gleixner
2021-12-06 22:39 ` [patch V2 35/36] soc: ti: ti_sci_inta_msi: Get rid of ti_sci_inta_msi_get_virq() Thomas Gleixner
2021-12-06 22:39 ` Thomas Gleixner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211206210439.616608151@linutronix.de \
--to=tglx@linutronix.de \
--cc=alex.williamson@redhat.com \
--cc=ashok.raj@intel.com \
--cc=clg@kaod.org \
--cc=dmaengine@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=helgaas@kernel.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jgg@nvidia.com \
--cc=jgross@suse.com \
--cc=kevin.tian@intel.com \
--cc=kristo@kernel.org \
--cc=laurentiu.tudor@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=megha.dey@intel.com \
--cc=nm@ti.com \
--cc=okaya@kernel.org \
--cc=robin.murphy@arm.com \
--cc=ssantosh@kernel.org \
--cc=stuyoder@gmail.com \
--cc=vkoul@kernel.org \
--cc=will@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).