From patchwork Tue Feb 9 19:24:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 8265181 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4F2F99F88A for ; Tue, 9 Feb 2016 19:26:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7154C20251 for ; Tue, 9 Feb 2016 19:26:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78BCD20263 for ; Tue, 9 Feb 2016 19:26:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754428AbcBITZz (ORCPT ); Tue, 9 Feb 2016 14:25:55 -0500 Received: from o1.f.az.sendgrid.net ([208.117.55.132]:27137 "EHLO o1.f.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753464AbcBITZL (ORCPT ); Tue, 9 Feb 2016 14:25:11 -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=WL5PKP5iKPHD2GS0G1+tvVU0dybrw X6Ttc2tiJ2h7Dgrr2JGkGcvw0mKAoC1kf+jNWJgbQ5EPvVVy6YwgxFdB4y6dbWyJ Fm5k8Xb+6M+tJIfzL0IIuErlBmiB64I87ZwcYaOv4fLXR7wpGjO6R14HmNWzwVne /1ibYCnbn00RPs= Received: by filter0160p1las1.sendgrid.net with SMTP id filter0160p1las1.13217.56BA3D152E 2016-02-09 19:25:09.67633862 +0000 UTC Received: from jakeoshinsu2.jakeoshinsu2.d1.internal.cloudapp.net (unknown [104.210.40.47]) by ismtpd0006p1las1.sendgrid.net (SG) with ESMTP id GOLLgtuJTbmGgx45g4KnQg Tue, 09 Feb 2016 19:25:09.615 +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 v2 2/3] PCI: irqdomain: Look up IRQ domain by fwnode_handle Date: Tue, 9 Feb 2016 19:24:27 +0000 Message-Id: <1455045869-38341-3-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455045869-38341-1-git-send-email-jakeo@microsoft.com> References: <1455045869-38341-1-git-send-email-jakeo@microsoft.com> X-SG-EID: lfnueJVzSjg1mfuVqqukVH7tZvRy9mfCIcBnfbfzaMNNFc2VZCbXG9OEMmWW+ZWH33LIYFxm6KL4Zo m78tQ073HFA7+yBIPf5VBnOzc/aBfPicWn42W9zyk+S0qUS/D7twMSAzalVw06bCqoCGXvs9ORKAMv T0NCgCBgvxuq5TC4qgM4y+3ZcPgxGHaLORh4eTxTIse4GcajV2D2r/rUhA== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY, URIBL_GREY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }