From patchwork Tue Feb 16 21:56:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 583747 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 9DD48140271 for ; Wed, 17 Feb 2016 08:57:44 +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=x46VwSy+; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756035AbcBPV5I (ORCPT ); Tue, 16 Feb 2016 16:57:08 -0500 Received: from o1.f.az.sendgrid.net ([208.117.55.132]:47540 "EHLO o1.f.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756022AbcBPV5G (ORCPT ); Tue, 16 Feb 2016 16:57:06 -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=Yn27kqyMs4k5dnJd5dDXAz3vZL0=; b=x46VwSy+HRpRX66gdB1VEb2r4bw0d 5JGP9cCqB5CaparwUXjGmY97bTMb6NpkW3yZfT2nZKMqTQv0fHMA02O9u1wF/Bez hfrU9SUsyg0uONUkrw+BLnQGJuvRujbyCnhAYKqG6rK2moe5E9EpGbSErgXvFCCm pba6r5LwDLKDxs= Received: by filter0034p1las1.sendgrid.net with SMTP id filter0034p1las1.6714.56C39B31F 2016-02-16 21:57:05.300687277 +0000 UTC Received: from jakeoshinsu2.jakeoshinsu2.d1.internal.cloudapp.net (unknown [104.210.40.47]) by ismtpd0011p1las1.sendgrid.net (SG) with ESMTP id gCYsvOQdSOKSb6GFj4bsiw Tue, 16 Feb 2016 21:57:05.247 +0000 (UTC) From: jakeo@microsoft.com To: bhelgaas@google.com, linux-pci@vger.kernel.org, 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, haddenh@microsoft.com Cc: Jake Oshins Subject: [PATCH RESEND v3 2/3] PCI: irqdomain: Look up IRQ domain by fwnode_handle Date: Tue, 16 Feb 2016 21:56:22 +0000 Message-Id: <1455659783-20036-3-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455659783-20036-1-git-send-email-jakeo@microsoft.com> References: <1455659783-20036-1-git-send-email-jakeo@microsoft.com> X-SG-EID: lfnueJVzSjg1mfuVqqukVH7tZvRy9mfCIcBnfbfzaMN3MAuEe5vZU91JoOAiyq+e/f3xJOTU+FNJrQ wq+gsY88dpdaaPtic0OpNzIwTqsbQrUX+qhtV9N+3W1nOEyjWUruOlEXqNoDCNXO9AOqbDbDsdAH8h 6hNLqOhSLI0n9SvA7L10a0L28rpWWDvNovBCFJe8wTs94kDnhpneAFVLmw== 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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 6d7ab9b..1e34d21 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "pci.h" @@ -675,6 +676,20 @@ static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus) if (!d) d = pci_host_bridge_acpi_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; }