Cc: Arnd Bergmann <redacted>
Signed-off-by: Liviu Dudau <redacted>
---
 drivers/of/address.c       | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/of_address.h | 13 ++-----------
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 4dab700..3735ac7 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c

@@ -906,3 +906,49 @@ 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 28e6836..6015f21 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.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel