From patchwork Mon Oct 26 23:15:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 536369 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 7BA241412FD for ; Tue, 27 Oct 2015 10:23:55 +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=hdrugnQn; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752896AbbJZXXD (ORCPT ); Mon, 26 Oct 2015 19:23:03 -0400 Received: from o1.f.az.sendgrid.net ([208.117.55.132]:21781 "EHLO o1.f.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752038AbbJZXW6 (ORCPT ); Mon, 26 Oct 2015 19:22:58 -0400 X-Greylist: delayed 324 seconds by postgrey-1.27 at vger.kernel.org; Mon, 26 Oct 2015 19:22:58 EDT DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sendgrid.me; h=from:to:cc:subject:in-reply-to:references; s=smtpapi; bh=oKfLSzXiuFAVXTONY2l3usQtnMs=; b=hdrugnQnH4sc/mqDsTcReri9jpQXM ROa8I2FW6xBWre9rjoy1yt8y+/WDzrH+9WZgMzsmJFDGJt8BVJbvZfXJ6a8RhWZ/ JrKJM/pgv9F20wmtq0j4IjnUb6yRFdY+sezrWOfmcleK3NhL0+dwMJ302v0vRwtP eq7hOMkmFLhkPE= Received: by filter-357.sjc1.sendgrid.net with SMTP id filter-357.11629.562EB44C12 2015-10-26 23:16:28.277982385 +0000 UTC Received: from jakeoshinsu2.jakeoshinsu2.d1.internal.cloudapp.net (unknown [104.210.40.47]) by ismtpd-070 (SG) with ESMTP id 150a67049fd.6dcf.2c970c0 Mon, 26 Oct 2015 23:16:28 +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, jiang.liu@linux.intel.com, bhelgaas@google.com, linux-pci@vger.kernel.org Cc: Jake Oshins Subject: [PATCH v3 5/7] PCI: irqdomain: Look up IRQ domain by fwnode_handle Date: Mon, 26 Oct 2015 23:15:37 +0000 Message-Id: <1445901339-11924-6-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445901339-11924-1-git-send-email-jakeo@microsoft.com> References: <1445901339-11924-1-git-send-email-jakeo@microsoft.com> X-SG-EID: lfnueJVzSjg1mfuVqqukVH7tZvRy9mfCIcBnfbfzaMNXRboFZbs4fRkXDwZHFZIOzhZ7fzb8u4JA44 zr+cKwEM5KnidAbohME3s3NkS+JoIFNuk/VQNr0LsO6K9XtuLRHHbxKIoPdMGg7zdmQn8IP88ZyAjE FAArvHHroU8Tgr4wf75KdOE7YFxK7a3XFSpB Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jake Oshins The existing PCI code looks for an IRQ domain associated with a root PCI bus by looking in the Open Firmware tree. This patch introduces a second way to identify the associated IRQ domain, if the lookup in the OF tree fails. The handle used for the IRQ domain lookup was introduced in the previous patch in the series. Signed-off-by: Jake Oshins --- drivers/pci/probe.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index c0f2e44..62c9ac7 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -664,6 +664,7 @@ static void pci_set_bus_speed(struct pci_bus *bus) static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus) { struct irq_domain *d; + struct pci_host_bridge *host_bridge; /* * Any firmware interface that can resolve the msi_domain @@ -671,6 +672,18 @@ static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus) */ d = pci_host_bridge_of_msi_domain(bus); + /* + * If no IRQ domain was found via the OF tree, try looking it up + * directly through the fwnode_handle. + */ + if (!d) { + host_bridge = to_pci_host_bridge(bus->bridge); + if (host_bridge->fwnode) { + d = irq_find_matching_fwnode(host_bridge->fwnode, + DOMAIN_BUS_ANY); + } + } + return d; }