From patchwork Thu Dec 10 17:53:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 7821151 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 080AEBEEE5 for ; Thu, 10 Dec 2015 17:53:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 113C220573 for ; Thu, 10 Dec 2015 17:53:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2217E2057E for ; Thu, 10 Dec 2015 17:53:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754571AbbLJRxr (ORCPT ); Thu, 10 Dec 2015 12:53:47 -0500 Received: from o1.f.az.sendgrid.net ([208.117.55.132]:47175 "EHLO o1.f.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754912AbbLJRxd (ORCPT ); Thu, 10 Dec 2015 12:53:33 -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=kCBAtXNT5sYp7F+9kTjLG6Ega2k=; b=mzkV/kHC4o57x2YZAYLLkGKVL4EiQ CxQyaZrbQ5+4E0MhelvyEFvWcsK9CQbr/6FhqcGuf7xlLDs7P+Z+RRh3i5RHTN+I JcoN7AhOsP60LTkVy2qo1JMRUtYOAV5c+SWd6ObDsnrySQ5GVxEg2k2Afvwe83p3 q+H7CTluDWl3eE= Received: by filter0155p1las1.sendgrid.net with SMTP id filter0155p1las1.19266.5669BC1AF 2015-12-10 17:53:30.147393967 +0000 UTC Received: from jakeoshinsu2.jakeoshinsu2.d1.internal.cloudapp.net (unknown [10.43.18.4]) by ismtpd0013p1las1.sendgrid.net (SG) with ESMTP id qS2TNLW_QMC-bmsJtDLLyw Thu, 10 Dec 2015 17:53:29.750 +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 4/7] PCI: Add fwnode_handle to pci_sysdata Date: Thu, 10 Dec 2015 17:53:00 +0000 Message-Id: <1449769983-12948-5-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: lfnueJVzSjg1mfuVqqukVH7tZvRy9mfCIcBnfbfzaMPh2YtyMM2pulMntJMGoYF3K3oHFEXvfs4TQM vfQNkt+5pRL2NZCQKPpSpukQE1GBfGhp3DP/uq+Qx1WgxpXLiv+yGDqZzDKwVpI2YRaNhJwdSFxxx/ SNQBooRDncSvUWltf9Epw2khugOyp54QuDcGceSseEc1iRxmha4Jo6N15A== 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 an fwnode_handle to struct pci_sysdata, which is used by the next patch in the series when trying to locate an IRQ domain associated with a root PCI bus. Signed-off-by: Jake Oshins Reviewed-by: Marc Zyngier --- arch/x86/include/asm/pci.h | 15 +++++++++++++++ drivers/pci/probe.c | 1 + include/linux/pci.h | 4 ++++ 3 files changed, 20 insertions(+) diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 4625943..6fc3c7c 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -20,6 +20,9 @@ struct pci_sysdata { #ifdef CONFIG_X86_64 void *iommu; /* IOMMU private data */ #endif +#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN + void *fwnode; /* IRQ domain for MSI assignment */ +#endif }; extern int pci_routeirq; @@ -32,6 +35,7 @@ extern int noioapicreroute; static inline int pci_domain_nr(struct pci_bus *bus) { struct pci_sysdata *sd = bus->sysdata; + return sd->domain; } @@ -41,6 +45,17 @@ static inline int pci_proc_domain(struct pci_bus *bus) } #endif +#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN +static inline void *_pci_root_bus_fwnode(struct pci_bus *bus) +{ + struct pci_sysdata *sd = bus->sysdata; + + return sd->fwnode; +} + +#define pci_root_bus_fwnode _pci_root_bus_fwnode +#endif + /* Can be used to override the logic in pci_scan_bus for skipping already-configured bus numbers - to be used for buggy BIOSes or architectures with incomplete PCI setup by the loader */ diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index edb1984..750f907 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "pci.h" diff --git a/include/linux/pci.h b/include/linux/pci.h index 6ae25aa..b414422 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1517,6 +1517,10 @@ static inline int pci_get_new_domain_nr(void) { return -ENOSYS; } #include +#ifndef pci_root_bus_fwnode +#define pci_root_bus_fwnode(bus) ((void)(bus), NULL) +#endif + /* these helpers provide future and backwards compatibility * for accessing popular PCI BAR info */ #define pci_resource_start(dev, bar) ((dev)->resource[(bar)].start)