LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
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,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sinan Kaya <okaya@kernel.org>,
	dmaengine@vger.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, x86@kernel.org,
	Vinod Koul <vkoul@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Will Deacon <will@kernel.org>
Subject: [patch 37/37] dmaengine: qcom_hidma: Cleanup MSI handling
Date: Sat, 27 Nov 2021 02:21:05 +0100 (CET)	[thread overview]
Message-ID: <20211126230526.111397616@linutronix.de> (raw)
In-Reply-To: <20211126224100.303046749@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>
Cc: 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;


WARNING: multiple messages have this Message-ID
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,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sinan Kaya <okaya@kernel.org>,
	dmaengine@vger.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, x86@kernel.org,
	Vinod Koul <vkoul@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Will Deacon <will@kernel.org>
Subject: [patch 37/37] dmaengine: qcom_hidma: Cleanup MSI handling
Date: Sat, 27 Nov 2021 02:22:15 +0100 (CET)	[thread overview]
Message-ID: <20211126230526.111397616@linutronix.de> (raw)
Message-ID: <20211127012215.pACAgeHwuFwFNTfDmShwjZhX_XrgDtyw2u-AsJnA9nI@z> (raw)
In-Reply-To: <20211126224100.303046749@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>
Cc: 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;


  parent reply	other threads:[~2021-11-27  1:25 UTC|newest]

Thread overview: 97+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-27  1:20 [patch 00/37] genirq/msi, PCI/MSI: Spring cleaning - Part 2 Thomas Gleixner
2021-11-27  1:20 ` [patch 01/37] device: Move MSI related data into a struct Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27 12:11   ` Greg Kroah-Hartman
2021-11-27  1:20 ` [patch 02/37] device: Add device::msi_data pointer and struct msi_device_data Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27 12:12   ` Greg Kroah-Hartman
2021-11-28  0:14   ` Jason Gunthorpe
2021-11-28 19:09     ` Thomas Gleixner
2021-11-27  1:20 ` [patch 03/37] PCI/MSI: Allocate MSI device data on first use Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 05/37] platform-msi: " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 06/37] bus: fsl-mc-msi: " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 07/37] soc: ti: ti_sci_inta_msi: " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 08/37] genirq/msi: Provide msi_device_populate/destroy_sysfs() Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-30 11:53   ` Jonathan Cameron
2021-11-27  1:20 ` [patch 09/37] PCI/MSI: Let the irq code handle sysfs groups Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 10/37] platform-msi: Let the core " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 11/37] genirq/msi: Remove the original sysfs interfaces Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 12/37] platform-msi: Rename functions and clarify comments Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 13/37] platform-msi: Store platform private data pointer in msi_device_data Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 14/37] genirq/msi: Consolidate MSI descriptor data Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 15/37] platform-msi: Use msi_desc::msi_index Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 16/37] bus: fsl-mc-msi: " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 17/37] soc: ti: ti_sci_inta_msi: " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 18/37] PCI/MSI: " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 19/37] genirq/msi: Add msi_device_data::properties Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 20/37] PCI/MSI: Store properties in device::msi::data Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 21/37] x86/pci/XEN: Use device MSI properties Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 22/37] x86/apic/msi: " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 23/37] genirq/msi: " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 24/37] powerpc/cell/axon_msi: Use MSI device properties Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 25/37] powerpc/pseries/msi: " Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 26/37] PCI/MSI: Provide MSI_FLAG_MSIX_CONTIGUOUS Thomas Gleixner
2021-11-27  1:21   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 27/37] powerpc/pseries/msi: Let core code check for contiguous entries Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 28/37] genirq/msi: Provide interface to retrieve Linux interrupt number Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 29/37] PCI/MSI: Use __msi_get_virq() in pci_get_vector() Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-28 19:37   ` Marc Zyngier
2021-11-28 21:00     ` Thomas Gleixner
2021-11-27  1:20 ` [patch 30/37] PCI/MSI: Simplify pci_irq_get_affinity() Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 31/37] dmaengine: mv_xor_v2: Get rid of msi_desc abuse Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 32/37] perf/smmuv3: Use msi_get_virq() Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-27  1:20 ` [patch 33/37] iommu/arm-smmu-v3: " Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-29 10:55   ` Will Deacon
2021-11-29 12:52     ` Thomas Gleixner
2021-11-29 12:58       ` Thomas Gleixner
2021-11-29 13:13     ` Robin Murphy
2021-11-29 14:42       ` Thomas Gleixner
2021-11-29 14:54         ` Robin Murphy
2021-11-30  9:36           ` Will Deacon
2021-11-30 12:30             ` Thomas Gleixner
2021-11-29 13:25   ` Robin Murphy
2021-11-27  1:21 ` [patch 34/37] mailbox: bcm-flexrm-mailbox: Rework MSI interrupt handling Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-27  1:21 ` [patch 35/37] bus: fsl-mc: fsl-mc-allocator: Rework MSI handling Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-27  1:21 ` [patch 36/37] soc: ti: ti_sci_inta_msi: Get rid of ti_sci_inta_msi_get_virq() Thomas Gleixner
2021-11-27  1:22   ` Thomas Gleixner
2021-11-27  1:21 ` Thomas Gleixner [this message]
2021-11-27  1:22   ` [patch 37/37] dmaengine: qcom_hidma: Cleanup MSI handling Thomas Gleixner
2021-11-29 19:56   ` Sinan Kaya
2021-11-27  1:21 ` [patch 00/37] genirq/msi, PCI/MSI: Spring cleaning - Part 2 Thomas Gleixner
2021-11-27  1:21 ` [patch 04/37] PCI/MSI: Use lock from msi_device_data Thomas Gleixner
2021-11-27  1:20   ` Thomas Gleixner
2021-11-27 12:13   ` Greg Kroah-Hartman
2021-11-27 12:17 ` [patch 00/37] genirq/msi, PCI/MSI: Spring cleaning - Part 2 Greg Kroah-Hartman
2021-11-28  0:39 ` Jason Gunthorpe
2021-11-28 20:27   ` Thomas Gleixner

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=20211126230526.111397616@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=alex.williamson@redhat.com \
    --cc=ashok.raj@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=helgaas@kernel.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jgg@nvidia.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=ssantosh@kernel.org \
    --cc=stuyoder@gmail.com \
    --cc=vkoul@kernel.org \
    --cc=will@kernel.org \
    --cc=x86@kernel.org \
    --subject='Re: [patch 37/37] dmaengine: qcom_hidma: Cleanup MSI handling' \
    /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

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).