From patchwork Tue Feb 2 17:41:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 8192391 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8819CBEEE5 for ; Tue, 2 Feb 2016 17:48:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5257202D1 for ; Tue, 2 Feb 2016 17:48:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F293020204 for ; Tue, 2 Feb 2016 17:48:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933049AbcBBRsJ (ORCPT ); Tue, 2 Feb 2016 12:48:09 -0500 Received: from o1.f.az.sendgrid.net ([208.117.55.132]:24749 "EHLO o1.f.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932840AbcBBRsI (ORCPT ); Tue, 2 Feb 2016 12:48:08 -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=TfXN/gs3sd2unLe60EbGw2ifo+Q=; b=R1gCv6oDb8nDUaZn9C7R5oZwKMJls lIqtNtJwlvUqDF1cZTSIOJGhVS0taOBkkgEntynWMTNskjAqiMH54u4/vpQ9rOig faawQ+JsEjqd9ccdEGuUT37Cw7PIQOt4qYdMjpkLJE2+ZXmEyDWtXbd1q+DQiiWr 1sf4btpU9pzl4g= Received: by filter0164p1las1.sendgrid.net with SMTP id filter0164p1las1.1884.56B0EA7615 2016-02-02 17:42:14.227298761 +0000 UTC Received: from jakeoshinsu2.jakeoshinsu2.d1.internal.cloudapp.net (unknown [104.210.40.47]) by ismtpd0005p1las1.sendgrid.net (SG) with ESMTP id 4TluyikESHWhBPHftB4Skg Tue, 02 Feb 2016 17:42:14.137 +0000 (UTC) From: jakeo@microsoft.com To: gregkh@linuxfoundation.org, kys@microsoft.com, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, haiyangz@microsoft.com, marc.zyngier@arm.com, bhelgaas@google.com, linux-pci@vger.kernel.org Cc: Jake Oshins Subject: [PATCH RESEND 2/3] PCI: irqdomain: Look up IRQ domain by fwnode_handle Date: Tue, 2 Feb 2016 17:41:42 +0000 Message-Id: <1454434903-1680-3-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454434903-1680-1-git-send-email-jakeo@microsoft.com> References: <1454434903-1680-1-git-send-email-jakeo@microsoft.com> X-SG-EID: lfnueJVzSjg1mfuVqqukVH7tZvRy9mfCIcBnfbfzaMMuKnVpEETAfG4QYUcGnTERUcEzAlFgMph3Yn a4V+sBsYTxVk9HtQx99tHUTRmSsgFORg0bZeB+gzgkeVdGyqNyc3bU6LZSdlCLn7aGNGH+pg6O2rDf u+89Y5marFxvREJXpL3mDiKlFc2z6gFJc5aAr47TSrJbJ9xaTf4nmpx61A== 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.8 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b207e74..1e34d21 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -676,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; }