From patchwork Wed Dec 9 16:50:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 7810611 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 D8ECEBEEE1 for ; Wed, 9 Dec 2015 16:50:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F822204FB for ; Wed, 9 Dec 2015 16:50:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98D97204A2 for ; Wed, 9 Dec 2015 16:50:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752374AbbLIQuu (ORCPT ); Wed, 9 Dec 2015 11:50:50 -0500 Received: from foss.arm.com ([217.140.101.70]:50740 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366AbbLIQut (ORCPT ); Wed, 9 Dec 2015 11:50:49 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4AFFB49; Wed, 9 Dec 2015 08:50:27 -0800 (PST) Received: from [10.1.209.24] (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 549513F4FF; Wed, 9 Dec 2015 08:50:47 -0800 (PST) Message-ID: <56685BE5.3000909@arm.com> Date: Wed, 09 Dec 2015 16:50:45 +0000 From: Marc Zyngier Organization: ARM Ltd User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.7.0 MIME-Version: 1.0 To: jakeo@microsoft.com, 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, bhelgaas@google.com, linux-pci@vger.kernel.org Subject: Re: [PATCH v7 4/7] PCI: Add fwnode_handle to pci_sysdata References: <1449275767-1510-1-git-send-email-jakeo@microsoft.com> <1449275767-1510-5-git-send-email-jakeo@microsoft.com> In-Reply-To: <1449275767-1510-5-git-send-email-jakeo@microsoft.com> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 On 05/12/15 00:36, jakeo@microsoft.com wrote: > 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/asm-generic/pci.h | 4 ++++ > 2 files changed, 19 insertions(+) > [...] > diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h > index f24bc51..4092886 100644 > --- a/include/asm-generic/pci.h > +++ b/include/asm-generic/pci.h > @@ -21,4 +21,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) > #define PCI_DMA_BUS_IS_PHYS (1) > #endif > > +#ifndef pci_root_bus_fwnode > +#define pci_root_bus_fwnode(bus) ((void)(bus), NULL) > +#endif > + > #endif /* _ASM_GENERIC_PCI_H */ > This breaks at least arm64 (as you can see from the reply to patch #5, because it does have its own asm/pci.h. Instead, how about moving this to linux/pci.h, just after the include of asm/pci.h? I just gave it a go, and it seems to work nicely (the first hunk fixes the rest of the arm64 compile issue): Thanks, M. diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8f3d056..c6369dd 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/asm-generic/pci.h b/include/asm-generic/pci.h index 4092886..f24bc51 100644 --- a/include/asm-generic/pci.h +++ b/include/asm-generic/pci.h @@ -21,8 +21,4 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) #define PCI_DMA_BUS_IS_PHYS (1) #endif -#ifndef pci_root_bus_fwnode -#define pci_root_bus_fwnode(bus) ((void)(bus), NULL) -#endif - #endif /* _ASM_GENERIC_PCI_H */ diff --git a/include/linux/pci.h b/include/linux/pci.h index 6ae25aa..b4144228 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)