From patchwork Thu Dec 10 17:53:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 7821261 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 69BBE9F387 for ; Thu, 10 Dec 2015 17:56:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8075B205C2 for ; Thu, 10 Dec 2015 17:56:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 498A420588 for ; Thu, 10 Dec 2015 17:56:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753525AbbLJR4v (ORCPT ); Thu, 10 Dec 2015 12:56:51 -0500 Received: from o1.f.az.sendgrid.net ([208.117.55.132]:39078 "EHLO o1.f.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752792AbbLJR4u (ORCPT ); Thu, 10 Dec 2015 12:56:50 -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=MHs82XGzbMbon0bkxIT4NsvlZwmUS 5iZNu/WFkx98xdp13zTNUmZkIdYj3J3pMRnRFwLzVMAkjI+Ex2piVw0/L4U0RYUZ 5US+Z6UQazoxHfbaHOYCSY3vUvjDqPHGq7We24XdScHy0PXxi6c0ILnY51sB/3xj q2ORD6j7K5JN/k= Received: by filter0205p1las1.sendgrid.net with SMTP id filter0205p1las1.3187.5669BC1A48 2015-12-10 17:53:30.519417145 +0000 UTC Received: from jakeoshinsu2.jakeoshinsu2.d1.internal.cloudapp.net (unknown [10.43.18.4]) by ismtpd0013p1las1.sendgrid.net (SG) with ESMTP id 14TELlf-RdC6uQ8aC22U_g Thu, 10 Dec 2015 17:53:30.067 +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 v10 5/7] PCI: irqdomain: Look up IRQ domain by fwnode_handle Date: Thu, 10 Dec 2015 17:53:01 +0000 Message-Id: <1449769983-12948-6-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449769983-12948-1-git-send-email-jakeo@microsoft.com> References: <1449769983-12948-1-git-send-email-jakeo@microsoft.com> X-SG-EID: lfnueJVzSjg1mfuVqqukVH7tZvRy9mfCIcBnfbfzaMPk1IlZhn+6PO85eytgnmaMDwcE7sYfNuV14P Gy2sG/gTlkv+zrwfkbFNsKvuZi5jGRKtOyzP7DxYct3Rn7NHGRAorDLm+fmuRdhvoSwonNdkYEWisn D0aXq/pUnGzboAk4iFuhZLZjlgdaN91PFovkxneilbOww777uDXtVy3FUw== 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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Reviewed-by: Marc Zyngier --- 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; }