From patchwork Tue Feb 16 21:56:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 583748 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 889BC140271 for ; Wed, 17 Feb 2016 08:57:53 +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=SzeLItNH; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933254AbcBPV5D (ORCPT ); Tue, 16 Feb 2016 16:57:03 -0500 Received: from o1.f.az.sendgrid.net ([208.117.55.132]:39118 "EHLO o1.f.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756022AbcBPV5C (ORCPT ); Tue, 16 Feb 2016 16:57:02 -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=we8f48uL7UH9mMudSI6sfxnjxvI=; b=SzeLItNHVrIaMKOxcTCD9jqdKdt0I 5aKA+vzASj7otIcbcGfVv+Jeex4Ghaew+TTe7K1FotEbNoZtsSxh9pZ9iEv3eRn/ 20tNLsHFOlQCCP82pJAMJBpxzVcYNKi85bZuuw5iYsVxvLJ7X143qJgP5lXSNygR Cx+u/5xOTE9Tp8= Received: by filter0062p1las1.sendgrid.net with SMTP id filter0062p1las1.5050.56C39B2B52 2016-02-16 21:56:59.880139119 +0000 UTC Received: from jakeoshinsu2.jakeoshinsu2.d1.internal.cloudapp.net (unknown [104.210.40.47]) by ismtpd0011p1las1.sendgrid.net (SG) with ESMTP id VIxpy4ogSLaMLseJvj_wUQ Tue, 16 Feb 2016 21:56:59.828 +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 v3 1/3] PCI: Add fwnode_handle to pci_sysdata Date: Tue, 16 Feb 2016 21:56:21 +0000 Message-Id: <1455659783-20036-2-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455659783-20036-1-git-send-email-jakeo@microsoft.com> References: <1455659783-20036-1-git-send-email-jakeo@microsoft.com> X-SG-EID: lfnueJVzSjg1mfuVqqukVH7tZvRy9mfCIcBnfbfzaMNui2cinlPXt4wXDOzddEChTMEvDF4/CdqzF4 D3j3W4rmDHaEBThzmX7yK9NguUOIuaFFDrDu/aA/fUu4GAOBdlvafKLLiQpGC+odGpr2uqoZlhsnHX tu4CmaU1bjUPkRwV2qsbIvkPFIZIBA5sW4GmOTwVFY30FqPAjy9ZXFavqg== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 --- arch/x86/include/asm/pci.h | 15 +++++++++++++++ include/linux/pci.h | 4 ++++ 2 files changed, 19 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/include/linux/pci.h b/include/linux/pci.h index 27df4a6..1bb44af 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1515,6 +1515,10 @@ static inline int pci_get_new_domain_nr(void) { return -ENOSYS; } #include +#ifndef pci_root_bus_fwnode +#define pci_root_bus_fwnode(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)