From patchwork Tue Feb 2 17:41:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Oshins X-Patchwork-Id: 8192331 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 B9A4F9FBE9 for ; Tue, 2 Feb 2016 17:47:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CB579202E9 for ; Tue, 2 Feb 2016 17:47:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E59CC20155 for ; Tue, 2 Feb 2016 17:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755489AbcBBRre (ORCPT ); Tue, 2 Feb 2016 12:47:34 -0500 Received: from o1.f.az.sendgrid.net ([208.117.55.132]:53208 "EHLO o1.f.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753861AbcBBRrd (ORCPT ); Tue, 2 Feb 2016 12:47:33 -0500 X-Greylist: delayed 335 seconds by postgrey-1.27 at vger.kernel.org; Tue, 02 Feb 2016 12:47:32 EST DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sendgrid.me; h=from:to:cc:subject:in-reply-to:references; s=smtpapi; bh=DCGjyDGGQjH4emroDHpS4RUFxEU=; b=gHnA02+ayWpZlXYnFK5ZPs4qVvOke RlE6VB9LdEx4b5UB1t7jgt3TBNImjxhfTohumTHwRcVIjUjoawR2tBeopswqSXSV FtRWtqRe2RqAa4qTEnQbcJhUJ8Jyao8ukrv8EkRIpP4P3jBcsmGBsfhUpFzz7cZo CcJpNqankLYzvg= Received: by filter0113p1las1.sendgrid.net with SMTP id filter0113p1las1.26196.56B0EA6E41 2016-02-02 17:42:06.994741665 +0000 UTC Received: from jakeoshinsu2.jakeoshinsu2.d1.internal.cloudapp.net (unknown [104.210.40.47]) by ismtpd0005p1las1.sendgrid.net (SG) with ESMTP id OjagnYieQHiNBJTL7qH4IQ Tue, 02 Feb 2016 17:42:07.049 +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 1/3] PCI: Add fwnode_handle to pci_sysdata Date: Tue, 2 Feb 2016 17:41:41 +0000 Message-Id: <1454434903-1680-2-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: lfnueJVzSjg1mfuVqqukVH7tZvRy9mfCIcBnfbfzaMNRfGp0nHojcH7tj4RqSuxzNeKWnHiHzxbAgm nhR+8io7saF4oLJyjjQYXC3LIYexRVpSXNLIlYZievGbrYRoUnQaO233vxsC7CPQT4HBcqNs5pykTm 5VzwF7blJofaj104wgiLZKYduPL4jTDW88NtUBsNEr3JJaJ8GqVi/kfs7w== 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 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 +++++++++++++++ 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 6d7ab9b..b207e74 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 27df4a6..cd05a8e 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) ((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)