[PATCH] of/address: Add of_iomap_nocache

[PATCH] of/address: Add of_iomap_nocache

[David Brown]

Add uncached mappings from devicetree nodes similar to regular io
mappings.

Signed-off-by: David Brown <davidb@codeaurora.org>
---
 drivers/of/address.c       |   19 +++++++++++++++++++
 include/linux/of_address.h |    1 +
 2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 72c33fb..9bee7f8 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -613,3 +613,22 @@ void __iomem *of_iomap(struct device_node *np, int index)
 	return ioremap(res.start, resource_size(&res));
 }
 EXPORT_SYMBOL(of_iomap);
+
+/**
+ * of_iomap_nocache - Maps the memory mapped IO for a given
+ *                    device_node, using ioremap_nocache.
+ * @device:	the device whose io range will be mapped
+ * @index:	index of the io range
+ *
+ * Returns a pointer to the mapped memory
+ */
+void __iomem *of_iomap_nocache(struct device_node *np, int index)
+{
+	struct resource res;
+
+	if (of_address_to_resource(np, index, &res))
+		return NULL;
+
+	return ioremap_nocache(res.start, 1 + res.end - res.start);
+}
+EXPORT_SYMBOL(of_iomap_nocache);
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 3118623..3ce1277 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -12,6 +12,7 @@ extern struct device_node *of_find_matching_node_by_address(
 					const struct of_device_id *matches,
 					u64 base_address);
 extern void __iomem *of_iomap(struct device_node *device, int index);
+extern void __iomem *of_iomap_nocache(struct device_node *device, int index);
 
 /* Extract an address from a device, returns the region size and
  * the address space flags too. The PCI version uses a BAR number
-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH] of/address: Add of_iomap_nocache

[David Miller]

From: David Brown <davidb@codeaurora.org>
Date: Thu,  4 Aug 2011 02:53:49 -0700

> Add uncached mappings from devicetree nodes similar to regular io
> mappings.
> 
> Signed-off-by: David Brown <davidb@codeaurora.org>

You'll need to add a sparc implementation.

[PATCH v2] of/address: Add of_iomap_nocache

[David Brown]

Add uncached mappings from devicetree nodes similar to regular io
mappings.

SPARC is coherent, so there this call is the same as regular of_iomap.

Cc: David Miller <davem@davemloft.net>
Signed-off-by: David Brown <davidb@codeaurora.org>
---
v2 - Add implementation for SPARC

 drivers/of/address.c       |   19 +++++++++++++++++++
 include/linux/of_address.h |   10 ++++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 72c33fb..9bee7f8 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -613,3 +613,22 @@ void __iomem *of_iomap(struct device_node *np, int index)
 	return ioremap(res.start, resource_size(&res));
 }
 EXPORT_SYMBOL(of_iomap);
+
+/**
+ * of_iomap_nocache - Maps the memory mapped IO for a given
+ *                    device_node, using ioremap_nocache.
+ * @device:	the device whose io range will be mapped
+ * @index:	index of the io range
+ *
+ * Returns a pointer to the mapped memory
+ */
+void __iomem *of_iomap_nocache(struct device_node *np, int index)
+{
+	struct resource res;
+
+	if (of_address_to_resource(np, index, &res))
+		return NULL;
+
+	return ioremap_nocache(res.start, 1 + res.end - res.start);
+}
+EXPORT_SYMBOL(of_iomap_nocache);
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 3118623..0e4734b 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -13,6 +13,16 @@ extern struct device_node *of_find_matching_node_by_address(
 					u64 base_address);
 extern void __iomem *of_iomap(struct device_node *device, int index);
 
+#ifndef SPARC
+extern void __iomem *of_iomap_nocache(struct device_node *device, int index);
+#else
+static inline void __iomem *of_iomap_nocache(struct device_node *device,
+		int index)
+{
+	return of_iomap(device, index);
+}
+#endif
+
 /* Extract an address from a device, returns the region size and
  * the address space flags too. The PCI version uses a BAR number
  * instead of an absolute index
-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH v2] of/address: Add of_iomap_nocache

[David Miller]

From: David Brown <davidb-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Date: Thu,  4 Aug 2011 03:36:36 -0700

> Add uncached mappings from devicetree nodes similar to regular io
> mappings.
> 
> SPARC is coherent, so there this call is the same as regular of_iomap.
> 
> Cc: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
> Signed-off-by: David Brown <davidb-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>

Acked-by: David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>

Re: [PATCH v2] of/address: Add of_iomap_nocache

[Kumar Gala]

On Aug 4, 2011, at 5:36 AM, David Brown wrote:

> Add uncached mappings from devicetree nodes similar to regular io
> mappings.
> 
> SPARC is coherent, so there this call is the same as regular of_iomap.
> 
> Cc: David Miller <davem@davemloft.net>
> Signed-off-by: David Brown <davidb@codeaurora.org>
> ---
> v2 - Add implementation for SPARC
> 
> drivers/of/address.c       |   19 +++++++++++++++++++
> include/linux/of_address.h |   10 ++++++++++
> 2 files changed, 29 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index 72c33fb..9bee7f8 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -613,3 +613,22 @@ void __iomem *of_iomap(struct device_node *np, int index)
> 	return ioremap(res.start, resource_size(&res));
> }
> EXPORT_SYMBOL(of_iomap);
> +
> +/**
> + * of_iomap_nocache - Maps the memory mapped IO for a given
> + *                    device_node, using ioremap_nocache.
> + * @device:	the device whose io range will be mapped
> + * @index:	index of the io range
> + *
> + * Returns a pointer to the mapped memory
> + */
> +void __iomem *of_iomap_nocache(struct device_node *np, int index)
> +{
> +	struct resource res;
> +
> +	if (of_address_to_resource(np, index, &res))
> +		return NULL;
> +
> +	return ioremap_nocache(res.start, 1 + res.end - res.start);
> +}
> +EXPORT_SYMBOL(of_iomap_nocache);
> diff --git a/include/linux/of_address.h b/include/linux/of_address.h
> index 3118623..0e4734b 100644
> --- a/include/linux/of_address.h
> +++ b/include/linux/of_address.h
> @@ -13,6 +13,16 @@ extern struct device_node *of_find_matching_node_by_address(
> 					u64 base_address);
> extern void __iomem *of_iomap(struct device_node *device, int index);
> 
> +#ifndef SPARC
> +extern void __iomem *of_iomap_nocache(struct device_node *device, int index);
> +#else
> +static inline void __iomem *of_iomap_nocache(struct device_node *device,
> +		int index)
> +{
> +	return of_iomap(device, index);
> +}
> +#endif
> +

What about adding an of_iomap_prot() to match ioremap_prot().

- k

Re: [PATCH v2] of/address: Add of_iomap_nocache

[Grant Likely]

On Thu, Aug 4, 2011 at 12:51 PM, David Miller <davem@davemloft.net> wrote:
> From: David Brown <davidb@codeaurora.org>
> Date: Thu,  4 Aug 2011 03:36:36 -0700
>
>> Add uncached mappings from devicetree nodes similar to regular io
>> mappings.
>>
>> SPARC is coherent, so there this call is the same as regular of_iomap.
>>
>> Cc: David Miller <davem@davemloft.net>
>> Signed-off-by: David Brown <davidb@codeaurora.org>
>
> Acked-by: David S. Miller <davem@davemloft.net>

Okay, I'll pick it up when I see patches that use it.

g.

Re: [PATCH v2] of/address: Add of_iomap_nocache

[David Brown]

On Thu, Aug 04, 2011 at 07:44:07AM -0500, Kumar Gala wrote:
> 
> On Aug 4, 2011, at 5:36 AM, David Brown wrote:
> 
> > Add uncached mappings from devicetree nodes similar to regular io
> > mappings.
> > 
> > SPARC is coherent, so there this call is the same as regular of_iomap.
> > 
> > +extern void __iomem *of_iomap_nocache(struct device_node *device, int index);
> 
> What about adding an of_iomap_prot() to match ioremap_prot().

It can be done, but I actually have a use for nocache.  We can
probably add the prot version when first needed.

David

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH] of/address: Add of_iomap_nocache

[Rob Herring]

On 08/04/2011 05:12 AM, David Miller wrote:
> From: David Brown <davidb@codeaurora.org>
> Date: Thu,  4 Aug 2011 02:53:49 -0700
> 
>> Add uncached mappings from devicetree nodes similar to regular io
>> mappings.
>>
>> Signed-off-by: David Brown <davidb@codeaurora.org>
> 
> You'll need to add a sparc implementation.

Sparc just defines ioremap_nocache to ioremap, so is that really needed?

Rob

Re: [PATCH] of/address: Add of_iomap_nocache

[David Brown]

On Thu, Aug 04, 2011 at 10:52:58AM -0500, Rob Herring wrote:
> On 08/04/2011 05:12 AM, David Miller wrote:
> > From: David Brown <davidb@codeaurora.org>
> > Date: Thu,  4 Aug 2011 02:53:49 -0700
> > 
> >> Add uncached mappings from devicetree nodes similar to regular io
> >> mappings.
> >>
> >> Signed-off-by: David Brown <davidb@codeaurora.org>
> > 
> > You'll need to add a sparc implementation.
> 
> Sparc just defines ioremap_nocache to ioremap, so is that really needed?

The first version of my patch only defines the new function in a file
compiled on non-SPARC targets.

David

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Re: [PATCH v2] of/address: Add of_iomap_nocache

[Scott Wood]

On 08/04/2011 05:36 AM, David Brown wrote:
> Add uncached mappings from devicetree nodes similar to regular io
> mappings.
>
> SPARC is coherent, so there this call is the same as regular of_iomap.
>
> Cc: David Miller<davem@davemloft.net>
> Signed-off-by: David Brown<davidb@codeaurora.org>
> ---
> v2 - Add implementation for SPARC
>
>   drivers/of/address.c       |   19 +++++++++++++++++++
>   include/linux/of_address.h |   10 ++++++++++
>   2 files changed, 29 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index 72c33fb..9bee7f8 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -613,3 +613,22 @@ void __iomem *of_iomap(struct device_node *np, int index)
>   	return ioremap(res.start, resource_size(&res));
>   }
>   EXPORT_SYMBOL(of_iomap);
> +
> +/**
> + * of_iomap_nocache - Maps the memory mapped IO for a given
> + *                    device_node, using ioremap_nocache.
> + * @device:	the device whose io range will be mapped
> + * @index:	index of the io range
> + *
> + * Returns a pointer to the mapped memory
> + */
> +void __iomem *of_iomap_nocache(struct device_node *np, int index)
> +{
> +	struct resource res;
> +
> +	if (of_address_to_resource(np, index,&res))
> +		return NULL;
> +
> +	return ioremap_nocache(res.start, 1 + res.end - res.start);
> +}

resource_size()?

> +EXPORT_SYMBOL(of_iomap_nocache);
> diff --git a/include/linux/of_address.h b/include/linux/of_address.h
> index 3118623..0e4734b 100644
> --- a/include/linux/of_address.h
> +++ b/include/linux/of_address.h
> @@ -13,6 +13,16 @@ extern struct device_node *of_find_matching_node_by_address(
>   					u64 base_address);
>   extern void __iomem *of_iomap(struct device_node *device, int index);
>
> +#ifndef SPARC
> +extern void __iomem *of_iomap_nocache(struct device_node *device, int index);
> +#else
> +static inline void __iomem *of_iomap_nocache(struct device_node *device,
> +		int index)
> +{
> +	return of_iomap(device, index);
> +}
> +#endif

Why is sparc special?  It looks like it defines ioremap_nocache() as 
ioremap() just like powerpc and some others, so shouldn't the normal 
of_iomap_nocache just work?

-Scott

Re: [PATCH v2] of/address: Add of_iomap_nocache

[Grant Likely]

On Thu, Aug 4, 2011 at 5:56 PM, Scott Wood <scottwood@freescale.com> wrote:
>> +#ifndef SPARC
>> +extern void __iomem *of_iomap_nocache(struct device_node *device, int
>> index);
>> +#else
>> +static inline void __iomem *of_iomap_nocache(struct device_node *device,
>> +               int index)
>> +{
>> +       return of_iomap(device, index);
>> +}
>> +#endif
>
> Why is sparc special?  It looks like it defines ioremap_nocache() as
> ioremap() just like powerpc and some others, so shouldn't the normal
> of_iomap_nocache just work?

No, the implementation is completely different.  SPARC preparses all
the reg properties.  Everyone else does not.

g.

Re: [PATCH] of/address: Add of_iomap_nocache

[David Miller]

From: Rob Herring <robherring2@gmail.com>
Date: Thu, 04 Aug 2011 10:52:58 -0500

> On 08/04/2011 05:12 AM, David Miller wrote:
>> From: David Brown <davidb@codeaurora.org>
>> Date: Thu,  4 Aug 2011 02:53:49 -0700
>> 
>>> Add uncached mappings from devicetree nodes similar to regular io
>>> mappings.
>>>
>>> Signed-off-by: David Brown <davidb@codeaurora.org>
>> 
>> You'll need to add a sparc implementation.
> 
> Sparc just defines ioremap_nocache to ioremap, so is that really needed?

Yes because if someone uses this of_iomap_nocache() in a driver the
sparc build is going to fail, we need as least the define to make
it equal to of_iomap() as David did in his follow-on patch.