* [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags()
@ 2008-04-30 16:08 Kumar Gala
2008-04-30 17:31 ` Andrew Morton
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Kumar Gala @ 2008-04-30 16:08 UTC (permalink / raw)
To: Greg KH
Cc: Andrew Morton, htejun, Jeff Garzik, linux-kernel, Emilian.Medve,
linuxppc-dev
From: Emil Medve <Emilian.Medve@Freescale.com>
We provide an ioremap_flags so provide a coresphonding devm_ioremap_flags.
Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
Forgot to commit the actual implemtation in arch/powerpc/lib/devres.c
Which tree should this go through, powerpc.git?
- k
arch/powerpc/lib/Makefile | 1 +
arch/powerpc/lib/devres.c | 33 +++++++++++++++++++++++++++++++++
include/asm-powerpc/io.h | 8 +++++++-
include/linux/io.h | 1 +
lib/devres.c | 2 +-
5 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 arch/powerpc/lib/devres.c
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 4bb023f..f1d2cdc 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -23,3 +23,4 @@ obj-$(CONFIG_SMP) += locks.o
endif
obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
+obj-$(CONFIG_HAS_IOMEM) += devres.o
diff --git a/arch/powerpc/lib/devres.c b/arch/powerpc/lib/devres.c
new file mode 100644
index 0000000..b73c64b
--- /dev/null
+++ b/arch/powerpc/lib/devres.c
@@ -0,0 +1,33 @@
+#include <linux/device.h> /* devres_*(), devm_ioremap_release() */
+#include <linux/io.h> /* ioremap_flags() */
+#include <linux/module.h> /* EXPORT_SYMBOL() */
+
+/**
+ * devm_ioremap_flags - Managed ioremap_flags()
+ * @dev: Generic device to remap IO address for
+ * @offset: BUS offset to map
+ * @size: Size of map
+ * @flags: Page flags
+ *
+ * Managed ioremap_flags(). Map is automatically unmapped on driver
+ * detach.
+ */
+void __iomem *devm_ioremap_flags(struct device *dev, resource_size_t offset,
+ size_t size, unsigned long flags)
+{
+ void __iomem **ptr, *addr;
+
+ ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL);
+ if (!ptr)
+ return NULL;
+
+ addr = ioremap_flags(offset, size, flags);
+ if (addr) {
+ *ptr = addr;
+ devres_add(dev, ptr);
+ } else
+ devres_free(ptr);
+
+ return addr;
+}
+EXPORT_SYMBOL(devm_ioremap_flags);
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index afae069..3b8c334 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -2,7 +2,7 @@
#define _ASM_POWERPC_IO_H
#ifdef __KERNEL__
-/*
+/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
@@ -18,6 +18,9 @@ extern int check_legacy_ioport(unsigned long base_port);
#define _PNPWRP 0xa79
#define PNPBIOS_BASE 0xf000
+#include <linux/device.h>
+#include <linux/io.h>
+
#include <linux/compiler.h>
#include <asm/page.h>
#include <asm/byteorder.h>
@@ -744,6 +747,9 @@ static inline void * bus_to_virt(unsigned long address)
#define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
+void __iomem *devm_ioremap_flags(struct device *dev, resource_size_t offset,
+ size_t size, unsigned long flags);
+
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_IO_H */
diff --git a/include/linux/io.h b/include/linux/io.h
index 831f57c..7a390cf 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -58,6 +58,7 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
}
#endif
+void devm_ioremap_release(struct device *dev, void *res);
void __iomem * devm_ioremap(struct device *dev, resource_size_t offset,
unsigned long size);
void __iomem * devm_ioremap_nocache(struct device *dev, resource_size_t offset,
diff --git a/lib/devres.c b/lib/devres.c
index 26c87c4..72c8909 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -2,7 +2,7 @@
#include <linux/io.h>
#include <linux/module.h>
-static void devm_ioremap_release(struct device *dev, void *res)
+void devm_ioremap_release(struct device *dev, void *res)
{
iounmap(*(void __iomem **)res);
}
--
1.5.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags()
2008-04-30 16:08 [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags() Kumar Gala
@ 2008-04-30 17:31 ` Andrew Morton
2008-04-30 21:42 ` Benjamin Herrenschmidt
2008-05-01 1:18 ` Stephen Rothwell
2 siblings, 0 replies; 6+ messages in thread
From: Andrew Morton @ 2008-04-30 17:31 UTC (permalink / raw)
To: Kumar Gala; +Cc: htejun, jeff, greg, linux-kernel, Emilian.Medve, linuxppc-dev
On Wed, 30 Apr 2008 11:08:51 -0500 (CDT)
Kumar Gala <galak@kernel.crashing.org> wrote:
> From: Emil Medve <Emilian.Medve@Freescale.com>
>
> We provide an ioremap_flags so provide a coresphonding devm_ioremap_flags.
>
> Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
>
> Forgot to commit the actual implemtation in arch/powerpc/lib/devres.c
>
> Which tree should this go through, powerpc.git?
I'd say so, yes.
> arch/powerpc/lib/Makefile | 1 +
> arch/powerpc/lib/devres.c | 33 +++++++++++++++++++++++++++++++++
> include/asm-powerpc/io.h | 8 +++++++-
> include/linux/io.h | 1 +
> lib/devres.c | 2 +-
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags()
2008-04-30 16:08 [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags() Kumar Gala
2008-04-30 17:31 ` Andrew Morton
@ 2008-04-30 21:42 ` Benjamin Herrenschmidt
2008-04-30 21:49 ` Kumar Gala
2008-05-01 1:18 ` Stephen Rothwell
2 siblings, 1 reply; 6+ messages in thread
From: Benjamin Herrenschmidt @ 2008-04-30 21:42 UTC (permalink / raw)
To: Kumar Gala
Cc: Andrew Morton, htejun, Jeff Garzik, Greg KH, linux-kernel,
Emilian.Medve, linuxppc-dev
On Wed, 2008-04-30 at 11:08 -0500, Kumar Gala wrote:
> From: Emil Medve <Emilian.Medve@Freescale.com>
>
> We provide an ioremap_flags so provide a coresphonding devm_ioremap_flags.
>
> Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
>
> Forgot to commit the actual implemtation in arch/powerpc/lib/devres.c
>
> Which tree should this go through, powerpc.git?
Let's call it ioremap_prot instead please. I'm about to change
ioremap_flags to ioremap_prot anyways. Keep the flags/prot argument
unsigned long for now (it can be argued it should be a pgprot but that
hasn't been sorted out completely).
Cheers,
Ben.
> - k
>
> arch/powerpc/lib/Makefile | 1 +
> arch/powerpc/lib/devres.c | 33 +++++++++++++++++++++++++++++++++
> include/asm-powerpc/io.h | 8 +++++++-
> include/linux/io.h | 1 +
> lib/devres.c | 2 +-
> 5 files changed, 43 insertions(+), 2 deletions(-)
> create mode 100644 arch/powerpc/lib/devres.c
>
> diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
> index 4bb023f..f1d2cdc 100644
> --- a/arch/powerpc/lib/Makefile
> +++ b/arch/powerpc/lib/Makefile
> @@ -23,3 +23,4 @@ obj-$(CONFIG_SMP) += locks.o
> endif
>
> obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
> +obj-$(CONFIG_HAS_IOMEM) += devres.o
> diff --git a/arch/powerpc/lib/devres.c b/arch/powerpc/lib/devres.c
> new file mode 100644
> index 0000000..b73c64b
> --- /dev/null
> +++ b/arch/powerpc/lib/devres.c
> @@ -0,0 +1,33 @@
> +#include <linux/device.h> /* devres_*(), devm_ioremap_release() */
> +#include <linux/io.h> /* ioremap_flags() */
> +#include <linux/module.h> /* EXPORT_SYMBOL() */
> +
> +/**
> + * devm_ioremap_flags - Managed ioremap_flags()
> + * @dev: Generic device to remap IO address for
> + * @offset: BUS offset to map
> + * @size: Size of map
> + * @flags: Page flags
> + *
> + * Managed ioremap_flags(). Map is automatically unmapped on driver
> + * detach.
> + */
> +void __iomem *devm_ioremap_flags(struct device *dev, resource_size_t offset,
> + size_t size, unsigned long flags)
> +{
> + void __iomem **ptr, *addr;
> +
> + ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL);
> + if (!ptr)
> + return NULL;
> +
> + addr = ioremap_flags(offset, size, flags);
> + if (addr) {
> + *ptr = addr;
> + devres_add(dev, ptr);
> + } else
> + devres_free(ptr);
> +
> + return addr;
> +}
> +EXPORT_SYMBOL(devm_ioremap_flags);
> diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
> index afae069..3b8c334 100644
> --- a/include/asm-powerpc/io.h
> +++ b/include/asm-powerpc/io.h
> @@ -2,7 +2,7 @@
> #define _ASM_POWERPC_IO_H
> #ifdef __KERNEL__
>
> -/*
> +/*
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License
> * as published by the Free Software Foundation; either version
> @@ -18,6 +18,9 @@ extern int check_legacy_ioport(unsigned long base_port);
> #define _PNPWRP 0xa79
> #define PNPBIOS_BASE 0xf000
>
> +#include <linux/device.h>
> +#include <linux/io.h>
> +
> #include <linux/compiler.h>
> #include <asm/page.h>
> #include <asm/byteorder.h>
> @@ -744,6 +747,9 @@ static inline void * bus_to_virt(unsigned long address)
>
> #define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
>
> +void __iomem *devm_ioremap_flags(struct device *dev, resource_size_t offset,
> + size_t size, unsigned long flags);
> +
> #endif /* __KERNEL__ */
>
> #endif /* _ASM_POWERPC_IO_H */
> diff --git a/include/linux/io.h b/include/linux/io.h
> index 831f57c..7a390cf 100644
> --- a/include/linux/io.h
> +++ b/include/linux/io.h
> @@ -58,6 +58,7 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
> }
> #endif
>
> +void devm_ioremap_release(struct device *dev, void *res);
> void __iomem * devm_ioremap(struct device *dev, resource_size_t offset,
> unsigned long size);
> void __iomem * devm_ioremap_nocache(struct device *dev, resource_size_t offset,
> diff --git a/lib/devres.c b/lib/devres.c
> index 26c87c4..72c8909 100644
> --- a/lib/devres.c
> +++ b/lib/devres.c
> @@ -2,7 +2,7 @@
> #include <linux/io.h>
> #include <linux/module.h>
>
> -static void devm_ioremap_release(struct device *dev, void *res)
> +void devm_ioremap_release(struct device *dev, void *res)
> {
> iounmap(*(void __iomem **)res);
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags()
2008-04-30 21:42 ` Benjamin Herrenschmidt
@ 2008-04-30 21:49 ` Kumar Gala
0 siblings, 0 replies; 6+ messages in thread
From: Kumar Gala @ 2008-04-30 21:49 UTC (permalink / raw)
To: benh
Cc: Andrew Morton, htejun, Jeff Garzik, Greg KH, linux-kernel,
Emilian.Medve, linuxppc-dev
On Apr 30, 2008, at 4:42 PM, Benjamin Herrenschmidt wrote:
>
> On Wed, 2008-04-30 at 11:08 -0500, Kumar Gala wrote:
>> From: Emil Medve <Emilian.Medve@Freescale.com>
>>
>> We provide an ioremap_flags so provide a coresphonding
>> devm_ioremap_flags.
>>
>> Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
>> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
>> ---
>>
>> Forgot to commit the actual implemtation in arch/powerpc/lib/devres.c
>>
>> Which tree should this go through, powerpc.git?
>
> Let's call it ioremap_prot instead please. I'm about to change
> ioremap_flags to ioremap_prot anyways. Keep the flags/prot argument
> unsigned long for now (it can be argued it should be a pgprot but that
> hasn't been sorted out completely).
No problem. I've always wondered why ioremap_* aren't better
specified by generic code.
- k
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags()
2008-04-30 16:08 [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags() Kumar Gala
2008-04-30 17:31 ` Andrew Morton
2008-04-30 21:42 ` Benjamin Herrenschmidt
@ 2008-05-01 1:18 ` Stephen Rothwell
2008-05-01 1:29 ` Kumar Gala
2 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2008-05-01 1:18 UTC (permalink / raw)
To: Kumar Gala
Cc: Andrew Morton, htejun, Jeff Garzik, Greg KH, linux-kernel,
Emilian.Medve, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
On Wed, 30 Apr 2008 11:08:51 -0500 (CDT) Kumar Gala <galak@kernel.crashing.org> wrote:
>
> +++ b/arch/powerpc/lib/devres.c
> @@ -0,0 +1,33 @@
> +#include <linux/device.h> /* devres_*(), devm_ioremap_release() */
> +#include <linux/io.h> /* ioremap_flags() */
> +#include <linux/module.h> /* EXPORT_SYMBOL() */
This file needs a copyright notice and license ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags()
2008-05-01 1:18 ` Stephen Rothwell
@ 2008-05-01 1:29 ` Kumar Gala
0 siblings, 0 replies; 6+ messages in thread
From: Kumar Gala @ 2008-05-01 1:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, htejun, Jeff Garzik, Greg KH, linux-kernel,
Emilian.Medve, linuxppc-dev
On Apr 30, 2008, at 8:18 PM, Stephen Rothwell wrote:
> On Wed, 30 Apr 2008 11:08:51 -0500 (CDT) Kumar Gala <galak@kernel.crashing.org
> > wrote:
>>
>> +++ b/arch/powerpc/lib/devres.c
>> @@ -0,0 +1,33 @@
>> +#include <linux/device.h> /* devres_*(), devm_ioremap_release() */
>> +#include <linux/io.h> /* ioremap_flags() */
>> +#include <linux/module.h> /* EXPORT_SYMBOL() */
>
> This file needs a copyright notice and license ...
agreed. will add.
- k
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-05-01 1:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-30 16:08 [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags() Kumar Gala
2008-04-30 17:31 ` Andrew Morton
2008-04-30 21:42 ` Benjamin Herrenschmidt
2008-04-30 21:49 ` Kumar Gala
2008-05-01 1:18 ` Stephen Rothwell
2008-05-01 1:29 ` Kumar Gala
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).