From: Liviu.Dudau@arm.com (Liviu Dudau)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 4/9] pci: OF: Fix the conversion of IO ranges into IO resources.
Date: Tue, 1 Jul 2014 19:43:29 +0100 [thread overview]
Message-ID: <1404240214-9804-5-git-send-email-Liviu.Dudau@arm.com> (raw)
In-Reply-To: <1404240214-9804-1-git-send-email-Liviu.Dudau@arm.com>
The ranges property for a host bridge controller in DT describes
the mapping between the PCI bus address and the CPU physical address.
The resources framework however expects that the IO resources start
at a pseudo "port" address 0 (zero) and have a maximum size of IO_SPACE_LIMIT.
The conversion from pci ranges to resources failed to take that into account.
In the process move the function into drivers/of/address.c as it now
depends on pci_address_to_pio() code and make it return an error message.
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Tested-by: Tanmay Inamdar <tinamdar@apm.com>
---
drivers/of/address.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++
include/linux/of_address.h | 13 ++-----------
2 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 1345733..cbbaed2 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -872,3 +872,50 @@ bool of_dma_is_coherent(struct device_node *np)
return false;
}
EXPORT_SYMBOL_GPL(of_dma_is_coherent);
+
+/*
+ * of_pci_range_to_resource - Create a resource from an of_pci_range
+ * @range: the PCI range that describes the resource
+ * @np: device node where the range belongs to
+ * @res: pointer to a valid resource that will be updated to
+ * reflect the values contained in the range.
+ *
+ * Returns EINVAL if the range cannot be converted to resource.
+ *
+ * Note that if the range is an IO range, the resource will be converted
+ * using pci_address_to_pio() which can fail if it is called too early or
+ * if the range cannot be matched to any host bridge IO space (our case here).
+ * To guard against that we try to register the IO range first.
+ * If that fails we know that pci_address_to_pio() will do too.
+ */
+int of_pci_range_to_resource(struct of_pci_range *range,
+ struct device_node *np, struct resource *res)
+{
+ int err;
+ res->flags = range->flags;
+ res->parent = res->child = res->sibling = NULL;
+ res->name = np->full_name;
+
+ if (res->flags & IORESOURCE_IO) {
+ unsigned long port = -1;
+ err = pci_register_io_range(range->cpu_addr, range->size);
+ if (err)
+ goto invalid_range;
+ port = pci_address_to_pio(range->cpu_addr);
+ if (port == (unsigned long)-1) {
+ err = -EINVAL;
+ goto invalid_range;
+ }
+ res->start = port;
+ } else {
+ res->start = range->cpu_addr;
+ }
+ res->end = res->start + range->size - 1;
+ return 0;
+
+invalid_range:
+ res->start = (resource_size_t)OF_BAD_ADDR;
+ res->end = (resource_size_t)OF_BAD_ADDR;
+ return err;
+}
+
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index ac4aac4..33c0420 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -23,17 +23,8 @@ struct of_pci_range {
#define for_each_of_pci_range(parser, range) \
for (; of_pci_range_parser_one(parser, range);)
-static inline void of_pci_range_to_resource(struct of_pci_range *range,
- struct device_node *np,
- struct resource *res)
-{
- res->flags = range->flags;
- res->start = range->cpu_addr;
- res->end = range->cpu_addr + range->size - 1;
- res->parent = res->child = res->sibling = NULL;
- res->name = np->full_name;
-}
-
+extern int of_pci_range_to_resource(struct of_pci_range *range,
+ struct device_node *np, struct resource *res);
/* Translate a DMA address from device space to CPU space */
extern u64 of_translate_dma_address(struct device_node *dev,
const __be32 *in_addr);
--
2.0.0
next prev parent reply other threads:[~2014-07-01 18:43 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-01 18:43 [PATCH v8 0/9] Support for creating generic PCI host bridges from DT Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 1/9] Fix ioport_map() for !CONFIG_GENERIC_IOMAP cases Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 2/9] pci: Export find_pci_host_bridge() function Liviu Dudau
2014-07-02 18:06 ` Tanmay Inamdar
2014-07-02 19:12 ` Arnd Bergmann
2014-07-02 20:43 ` Tanmay Inamdar
2014-07-03 9:53 ` Liviu Dudau
2014-07-03 10:26 ` Arnd Bergmann
2014-07-07 23:27 ` Bjorn Helgaas
2014-07-08 10:42 ` Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 3/9] pci: Introduce pci_register_io_range() helper function Liviu Dudau
2014-07-01 19:36 ` Arnd Bergmann
2014-07-01 20:45 ` Liviu Dudau
2014-07-02 12:30 ` Arnd Bergmann
2014-07-02 14:23 ` Liviu Dudau
2014-07-02 14:58 ` Arnd Bergmann
2014-07-02 11:22 ` Will Deacon
2014-07-02 16:00 ` Liviu Dudau
2014-07-02 12:38 ` Arnd Bergmann
2014-07-02 13:20 ` Liviu Dudau
2014-07-08 0:14 ` Bjorn Helgaas
2014-07-08 7:00 ` Arnd Bergmann
2014-07-08 21:29 ` Bjorn Helgaas
2014-07-08 22:45 ` Liviu Dudau
2014-07-09 6:32 ` Arnd Bergmann
2014-07-09 9:13 ` Liviu Dudau
2014-07-09 6:20 ` Arnd Bergmann
2014-07-09 9:14 ` Liviu Dudau
2014-07-09 15:21 ` Bjorn Helgaas
2014-07-08 10:40 ` Liviu Dudau
2014-07-08 14:14 ` Arnd Bergmann
2014-07-09 8:59 ` Liviu Dudau
2014-07-01 18:43 ` Liviu Dudau [this message]
2014-07-05 19:25 ` [PATCH v8 4/9] pci: OF: Fix the conversion of IO ranges into IO resources Rob Herring
2014-07-05 20:46 ` Arnd Bergmann
2014-07-07 11:11 ` Liviu Dudau
2014-07-07 21:22 ` Arnd Bergmann
2014-07-08 10:03 ` Liviu Dudau
2014-07-09 8:31 ` Arnd Bergmann
2014-07-09 9:27 ` Liviu Dudau
2014-07-16 14:35 ` Rob Herring
2014-07-16 14:47 ` Liviu Dudau
2014-07-16 14:47 ` Arnd Bergmann
2014-07-01 18:43 ` [PATCH v8 5/9] pci: Create pci_host_bridge before its associated bus in pci_create_root_bus Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 6/9] pci: Introduce a domain number for pci_host_bridge Liviu Dudau
2014-07-08 0:59 ` Bjorn Helgaas
2014-07-08 10:46 ` Liviu Dudau
2014-07-08 18:41 ` Bjorn Helgaas
2014-07-08 22:48 ` Liviu Dudau
2014-07-09 15:10 ` Bjorn Helgaas
2014-07-10 9:47 ` Liviu Dudau
2014-07-10 22:36 ` Bjorn Helgaas
2014-07-11 9:30 ` Liviu Dudau
2014-07-11 14:11 ` Catalin Marinas
2014-07-11 15:08 ` Liviu Dudau
2014-07-11 16:09 ` Catalin Marinas
2014-07-11 17:02 ` Bjorn Helgaas
2014-07-11 18:02 ` Catalin Marinas
2014-07-14 16:39 ` Catalin Marinas
2014-07-22 3:15 ` Bjorn Helgaas
2014-07-25 15:42 ` Catalin Marinas
2014-07-01 18:43 ` [PATCH v8 7/9] pci: of: Parse and map the IRQ when adding the PCI device Liviu Dudau
2014-07-02 11:17 ` Will Deacon
2014-07-05 19:04 ` Rob Herring
2014-07-01 18:43 ` [PATCH v8 8/9] pci: Add support for creating a generic host_bridge from device tree Liviu Dudau
2014-07-01 20:50 ` [RESEND] " Liviu Dudau
2014-07-01 21:04 ` Liviu Dudau
2014-07-02 11:22 ` Will Deacon
2014-07-02 17:23 ` Liviu Dudau
2014-07-02 17:31 ` Will Deacon
2014-07-02 19:09 ` Arnd Bergmann
2014-07-08 1:01 ` Bjorn Helgaas
2014-07-08 10:29 ` Liviu Dudau
2014-07-08 21:33 ` Bjorn Helgaas
2014-07-08 22:27 ` Liviu Dudau
2014-07-08 22:37 ` Bjorn Helgaas
2014-07-08 22:57 ` Liviu Dudau
2014-07-09 6:47 ` Arnd Bergmann
2014-07-11 7:43 ` Jingoo Han
2014-07-11 9:08 ` Liviu Dudau
2014-07-01 18:43 ` [PATCH v8 9/9] pci: Remap I/O bus resources into CPU space with pci_remap_iospace() Liviu Dudau
2014-07-14 16:54 ` Catalin Marinas
2014-07-14 16:56 ` Liviu Dudau
2014-07-14 18:15 ` Arnd Bergmann
2014-07-15 0:14 ` Liviu Dudau
2014-07-15 9:09 ` Catalin Marinas
2014-07-06 15:23 ` [PATCH v8 0/9] Support for creating generic PCI host bridges from DT Rob Herring
2014-07-07 11:12 ` Liviu Dudau
2014-07-08 17:18 ` Liviu Dudau
2014-07-11 0:44 ` Tanmay Inamdar
2014-07-11 7:33 ` Jingoo Han
2014-07-11 9:11 ` 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=1404240214-9804-5-git-send-email-Liviu.Dudau@arm.com \
--to=liviu.dudau@arm.com \
--cc=linux-arm-kernel@lists.infradead.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).