linux-kernel - [tip:irq/core] PCI/MSI: Let pci_msi_get_domain use struct device: :msi

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 29 Jul 2015 15:26:50 -0700
From:	tip-bot for Marc Zyngier <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	wangyijing@...wei.com, marc.zyngier@....com, bhelgaas@...gle.com,
	linux-arm-kernel@...ts.infradead.org, dhdang@....com,
	jason@...edaemon.net, lorenzo.pieralisi@....com,
	hanjun.guo@...aro.org, linux-kernel@...r.kernel.org,
	jiang.liu@...ux.intel.com, hpa@...or.com, majun258@...wei.com,
	tglx@...utronix.de, mingo@...nel.org
Subject: [tip:irq/core] PCI/MSI: Let pci_msi_get_domain use struct device:
 :msi_domain

Commit-ID:  d8a1cb7575502d2be502a65ecb344ff05c8d9f44
Gitweb:     http://git.kernel.org/tip/d8a1cb7575502d2be502a65ecb344ff05c8d9f44
Author:     Marc Zyngier <marc.zyngier@....com>
AuthorDate: Tue, 28 Jul 2015 14:46:14 +0100
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 30 Jul 2015 00:14:37 +0200

PCI/MSI: Let pci_msi_get_domain use struct device::msi_domain

Now that we can easily find which MSI domain a PCI device is
using, use dev_get_msi_domain as a way to retrieve the information.

The original code is still used as a fallback.

Acked-by: Bjorn Helgaas <bhelgaas@...gle.com>
Reviewed-by: Hanjun Guo <hanjun.guo@...aro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@....com>
Cc: <linux-arm-kernel@...ts.infradead.org>
Cc: Yijing Wang <wangyijing@...wei.com>
Cc: Ma Jun <majun258@...wei.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@....com>
Cc: Duc Dang <dhdang@....com>
Cc: Jiang Liu <jiang.liu@...ux.intel.com>
Cc: Jason Cooper <jason@...edaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-8-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 drivers/pci/msi.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 3aae7c9..4603344 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -39,14 +39,16 @@ struct irq_domain * __weak arch_get_pci_msi_domain(struct pci_dev *dev)
 
 static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev)
 {
-	struct irq_domain *domain = NULL;
+	struct irq_domain *domain;
 
-	if (dev->bus->msi)
-		domain = dev->bus->msi->domain;
-	if (!domain)
-		domain = arch_get_pci_msi_domain(dev);
+	domain = dev_get_msi_domain(&dev->dev);
+	if (domain)
+		return domain;
 
-	return domain;
+	if (dev->bus->msi && (domain = dev->bus->msi->domain))
+		return domain;
+
+	return arch_get_pci_msi_domain(dev);
 }
 
 static int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/