From patchwork Wed Dec 9 19:48:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 554786 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 35F4B1402DE for ; Thu, 10 Dec 2015 06:49:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sendgrid.me header.i=@sendgrid.me header.b=eMdLYE/B; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750849AbbLITt1 (ORCPT ); Wed, 9 Dec 2015 14:49:27 -0500 Received: from o1.f.az.sendgrid.net ([208.117.55.132]:15690 "EHLO o1.f.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754159AbbLITtO (ORCPT ); Wed, 9 Dec 2015 14:49:14 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sendgrid.me; h=from:to:cc:subject:in-reply-to:references; s=smtpapi; bh=6ffZ1vvaQSm8Alb2gvlbX+ULPGQ=; b=eMdLYE/BU3wYs1QxH9ByNEDgY6Jc5 8w4iUGBrrm2Tek3vEq08VqCNgHqukEhhCzz69/70U896CzGdgtmjYJM8Q7sIoZJB FOWEnDppGYkx9DzrzW3f+Y5P6GMYPZaiqA/9QdTeEnB0Kdh/sShFj9Si84BD08J+ Fj3R/FZgjKfy7Q= Received: by filter0033p1las1.sendgrid.net with SMTP id filter0033p1las1.2144.566885B657 2015-12-09 19:49:10.688938518 +0000 UTC Received: from jakeoshinsu2.jakeoshinsu2.d1.internal.cloudapp.net (unknown [10.43.18.4]) by ismtpd0007p1las1.sendgrid.net (SG) with ESMTP id KANuGwRZSkqEmxsI1Hf7jg Wed, 09 Dec 2015 19:49:10.790 +0000 (UTC) From: jakeo@microsoft.com To: gregkh@linuxfoundation.org, kys@microsoft.com, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, tglx@linutronix.de, haiyangz@microsoft.com, marc.zyngier@arm.com, bhelgaas@google.com, linux-pci@vger.kernel.org Cc: Jake Oshins Subject: [PATCH v8 5/7] PCI: irqdomain: Look up IRQ domain by fwnode_handle Date: Wed, 9 Dec 2015 19:48:43 +0000 Message-Id: <1449690525-5240-6-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449690525-5240-1-git-send-email-jakeo@microsoft.com> References: <1449690525-5240-1-git-send-email-jakeo@microsoft.com> X-SG-EID: lfnueJVzSjg1mfuVqqukVH7tZvRy9mfCIcBnfbfzaMNAJKq7IEZ5RwW5If5Z+dCzbg6PQvtMRzEfNy K9g2bV45BbslEN+iuIOdqpq7gpy2ftxg7nhnLX2XJcY0RW2u/AZA0YpnYqRnyuusl9poI/XJ1Iy2QD Pl4CNdN7M1xyRzQy+pBAC3y8zsH+oK/vRnTEICMLF5FW1SDBwKAq5JwuPA== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jake Oshins This patch adds a second way of finding an IRQ domain associated with a root PCI bus. After looking to see if one can be found through the OF tree, it attempts to look up the IRQ domain through an fwnode_handle stored in the pci_sysdata struct. Signed-off-by: Jake Oshins --- drivers/pci/probe.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 750f907..c6369dd 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -674,6 +674,20 @@ static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus) */ d = pci_host_bridge_of_msi_domain(bus); +#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN + /* + * If no IRQ domain was found via the OF tree, try looking it up + * directly through the fwnode_handle. + */ + if (!d) { + struct fwnode_handle *fwnode = pci_root_bus_fwnode(bus); + + if (fwnode) + d = irq_find_matching_fwnode(fwnode, + DOMAIN_BUS_PCI_MSI); + } +#endif + return d; }