From: Bjorn Helgaas <bhelgaas@google.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Rob Herring <robh@kernel.org>,
Grant Likely <grant.likely@linaro.org>,
devicetree@vger.kernel.org, linux-pci@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] of/pci: add pci_pio_to_address dummy for !CONFIG_OF
Date: Tue, 30 Sep 2014 10:01:39 -0600 [thread overview]
Message-ID: <20140930160139.GA5625@google.com> (raw)
In-Reply-To: <706416181.hbVGLDA3o6@wuerfel>
On Tue, Sep 30, 2014 at 03:19:05PM +0200, Arnd Bergmann wrote:
> The pci_register_io_range() and pci_pio_to_address() were recently
> introduced to generalize the handling of memory mapped PCI I/O space,
> but they are only valid when CONFIG_OF is set, leading to a possible
> build error:
>
> drivers/pci/host/pcie-rcar.c: In function 'rcar_pcie_setup_window':
> drivers/pci/host/pcie-rcar.c:340:3: error: implicit declaration of function 'pci_pio_to_address' [-Werror=implicit-function-declaration]
> res_start = pci_pio_to_address(res->start);
> ^
> drivers/pci/host/pcie-rcar.c: In function 'rcar_pcie_probe':
> drivers/pci/host/pcie-rcar.c:945:3: error: implicit declaration of function 'of_pci_range_to_resource' [-Werror=implicit-function-declaration]
> err = of_pci_range_to_resource(&range, pdev->dev.of_node,
> ^
> cc1: some warnings being treated as errors
>
> This provides inline dummy implementations for the case that
> CONFIG_OF is disabled, to allow better build testing.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 279c5dd046 ("of/pci: Add pci_register_io_range() and pci_pio_to_address()")
I'm rebuilding the pci/host-generic branch to pick up the other v13 fixes,
so I folded this fix directly into the "of/pci: Add pci_register_io_range()
and pci_pio_to_address()" patch. Thanks for finding this; the config
dependencies are a bit of a mess.
> diff --git a/include/linux/of_address.h b/include/linux/of_address.h
> index 7ebb877b07c2..851097aab115 100644
> --- a/include/linux/of_address.h
> +++ b/include/linux/of_address.h
> @@ -71,6 +71,11 @@ static inline const __be32 *of_get_address(struct device_node *dev, int index,
> return NULL;
> }
>
> +static inline phys_addr_t pci_pio_to_address(unsigned long pio)
> +{
> + return 0;
> +}
> +
> static inline int of_pci_range_parser_init(struct of_pci_range_parser *parser,
> struct device_node *node)
> {
> @@ -144,6 +149,12 @@ static inline const __be32 *of_get_pci_address(struct device_node *dev,
> {
> return NULL;
> }
> +static inline int of_pci_range_to_resource(struct of_pci_range *range,
> + struct device_node *np,
> + struct resource *res)
> +{
> + return -ENOSYS;
> +}
> #endif /* CONFIG_OF_ADDRESS && CONFIG_PCI */
>
> #endif /* __OF_ADDRESS_H */
>
next prev parent reply other threads:[~2014-09-30 16:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-30 13:19 [PATCH] of/pci: add pci_pio_to_address dummy for !CONFIG_OF Arnd Bergmann
2014-09-30 14:45 ` Liviu Dudau
2014-09-30 15:15 ` Arnd Bergmann
2014-09-30 15:42 ` Liviu Dudau
2014-09-30 15:54 ` Arnd Bergmann
2014-09-30 16:01 ` Bjorn Helgaas [this message]
2014-09-30 17:10 ` Liviu Dudau
2014-09-30 19:53 ` Bjorn Helgaas
2014-09-30 21:28 ` Liviu Dudau
2014-10-01 8:54 ` Liviu Dudau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140930160139.GA5625@google.com \
--to=bhelgaas@google.com \
--cc=Liviu.Dudau@arm.com \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).