* [PATCH] ARM: imx: Add iram allocator functions
@ 2010-10-05 0:03 Dinh.Nguyen at freescale.com
2010-10-05 7:44 ` Uwe Kleine-König
0 siblings, 1 reply; 9+ messages in thread
From: Dinh.Nguyen at freescale.com @ 2010-10-05 0:03 UTC (permalink / raw)
To: linux-arm-kernel
From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Add iram allocation functions using GENERIC_ALLOCATOR. The
allocation size is 4KB multiples to guarantee alignment. The
idea for these functions is for i.MX platforms to use them
to dynamically allocate IRAM usage.
Applies on 2.6.36-rc6
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Reviewed-by: Amit Kucheria <amit.kucheria@canonical.com>
---
arch/arm/plat-mxc/Kconfig | 10 ++++
arch/arm/plat-mxc/Makefile | 1 +
arch/arm/plat-mxc/include/mach/iram_alloc.h | 35 +++++++++++++++
arch/arm/plat-mxc/iram.c | 62 +++++++++++++++++++++++++++
4 files changed, 108 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-mxc/include/mach/iram_alloc.h
create mode 100644 arch/arm/plat-mxc/iram.c
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 6785db4..5e4ff93 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -57,6 +57,16 @@ source "arch/arm/mach-mx5/Kconfig"
endmenu
+config IRAM_ALLOC
+ bool "Enable IRAM allocator"
+ default y
+ select GENERIC_ALLOCATOR
+ help
+ Select this to have access to generic IRAM allocation functions that
+ use the GENERIC_ALLOCATOR. The allocation size is 4KB multiples to
+ guarantee alignment. The idea for these functions is for i.MX platforms
+ to use them to dynamically allocate IRAM usage.
+
config MXC_IRQ_PRIOR
bool "Use IRQ priority"
help
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index 78d405e..35cf07b 100644
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_MXC_TZIC) += tzic.o
obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
+obj-$(CONFIG_IRAM_ALLOC) += iram.o
obj-$(CONFIG_MXC_PWM) += pwm.o
obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
obj-$(CONFIG_MXC_ULPI) += ulpi.o
diff --git a/arch/arm/plat-mxc/include/mach/iram_alloc.h b/arch/arm/plat-mxc/include/mach/iram_alloc.h
new file mode 100644
index 0000000..12881aa
--- /dev/null
+++ b/arch/arm/plat-mxc/include/mach/iram_alloc.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifdef CONFIG_IRAM_ALLOC
+int __init iram_init(unsigned long base, unsigned long size);
+void *iram_alloc(unsigned int size, unsigned long *dma_addr);
+void iram_free(unsigned long dma_addr, unsigned int size);
+#else
+static inline int __init iram_init(unsigned long base, unsigned long size)
+{
+ return -ENOMEM;
+}
+static inline void *iram_alloc(unsigned int size, unsigned long *dma_addr)
+{
+ return NULL;
+}
+static inline void iram_free(unsigned long base, unsigned long size) {}
+#endif
+
diff --git a/arch/arm/plat-mxc/iram.c b/arch/arm/plat-mxc/iram.c
new file mode 100644
index 0000000..3d2a391
--- /dev/null
+++ b/arch/arm/plat-mxc/iram.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/genalloc.h>
+
+static unsigned long iram_phys_base;
+static __iomem void *iram_virt_base;
+static struct gen_pool *iram_pool;
+
+#define iram_phys_to_virt(p) (iram_virt_base + ((p) - iram_phys_base))
+
+void *iram_alloc(unsigned int size, unsigned long *dma_addr)
+{
+ if (!iram_pool)
+ return NULL;
+
+ *dma_addr = gen_pool_alloc(iram_pool, size);
+ pr_debug("iram alloc - %dB at 0x%p\n", size, (void *)*dma_addr);
+ return iram_phys_to_virt(*dma_addr);
+}
+EXPORT_SYMBOL(iram_alloc);
+
+void iram_free(unsigned long addr, unsigned int size)
+{
+ if (!iram_pool)
+ return;
+
+ gen_pool_free(iram_pool, addr, size);
+}
+EXPORT_SYMBOL(iram_free);
+
+int __init iram_init(unsigned long base, unsigned long size)
+{
+ iram_phys_base = base;
+
+ iram_pool = gen_pool_create(12, -1);
+ gen_pool_add(iram_pool, base, size, -1);
+ iram_virt_base = ioremap(iram_phys_base, size);
+
+ pr_info("i.MX IRAM pool: %ld KB at 0x%p\n", size / 1024, iram_virt_base);
+ return 0;
+}
--
1.6.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH] ARM: imx: Add iram allocator functions
2010-10-05 0:03 [PATCH] ARM: imx: Add iram allocator functions Dinh.Nguyen at freescale.com
@ 2010-10-05 7:44 ` Uwe Kleine-König
2010-10-05 7:55 ` Uwe Kleine-König
0 siblings, 1 reply; 9+ messages in thread
From: Uwe Kleine-König @ 2010-10-05 7:44 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Oct 04, 2010 at 07:03:27PM -0500, Dinh.Nguyen at freescale.com wrote:
> From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
>
> Add iram allocation functions using GENERIC_ALLOCATOR. The
> allocation size is 4KB multiples to guarantee alignment. The
> idea for these functions is for i.MX platforms to use them
> to dynamically allocate IRAM usage.
>
> Applies on 2.6.36-rc6
>
> Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> Reviewed-by: Amit Kucheria <amit.kucheria@canonical.com>
> ---
> arch/arm/plat-mxc/Kconfig | 10 ++++
> arch/arm/plat-mxc/Makefile | 1 +
> arch/arm/plat-mxc/include/mach/iram_alloc.h | 35 +++++++++++++++
> arch/arm/plat-mxc/iram.c | 62 +++++++++++++++++++++++++++
> 4 files changed, 108 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/plat-mxc/include/mach/iram_alloc.h
> create mode 100644 arch/arm/plat-mxc/iram.c
>
> diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
> index 6785db4..5e4ff93 100644
> --- a/arch/arm/plat-mxc/Kconfig
> +++ b/arch/arm/plat-mxc/Kconfig
> @@ -57,6 +57,16 @@ source "arch/arm/mach-mx5/Kconfig"
>
> endmenu
>
> +config IRAM_ALLOC
> + bool "Enable IRAM allocator"
> + default y
The iram allocator isn't useful taken alone, no? So I suggest to make
it
> + select GENERIC_ALLOCATOR
> + help
> + Select this to have access to generic IRAM allocation functions that
> + use the GENERIC_ALLOCATOR. The allocation size is 4KB multiples to
> + guarantee alignment. The idea for these functions is for i.MX platforms
> + to use them to dynamically allocate IRAM usage.
> +
> config MXC_IRQ_PRIOR
> bool "Use IRQ priority"
> help
> diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
> index 78d405e..35cf07b 100644
> --- a/arch/arm/plat-mxc/Makefile
> +++ b/arch/arm/plat-mxc/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_MXC_TZIC) += tzic.o
>
> obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
> obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
> +obj-$(CONFIG_IRAM_ALLOC) += iram.o
> obj-$(CONFIG_MXC_PWM) += pwm.o
> obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
> obj-$(CONFIG_MXC_ULPI) += ulpi.o
> diff --git a/arch/arm/plat-mxc/include/mach/iram_alloc.h b/arch/arm/plat-mxc/include/mach/iram_alloc.h
> new file mode 100644
> index 0000000..12881aa
> --- /dev/null
> +++ b/arch/arm/plat-mxc/include/mach/iram_alloc.h
I'd prefer include/mach/iram.h here
> @@ -0,0 +1,35 @@
> +/*
> + * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
> + *
> + * 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 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + * MA 02110-1301, USA.
> + */
> +
> +#ifdef CONFIG_IRAM_ALLOC
> +int __init iram_init(unsigned long base, unsigned long size);
> +void *iram_alloc(unsigned int size, unsigned long *dma_addr);
> +void iram_free(unsigned long dma_addr, unsigned int size);
> +#else
> +static inline int __init iram_init(unsigned long base, unsigned long size)
> +{
> + return -ENOMEM;
I suggest to add an #include to assert ENOMEM is #defined.
> +}
> +static inline void *iram_alloc(unsigned int size, unsigned long *dma_addr)
> +{
> + return NULL;
> +}
> +static inline void iram_free(unsigned long base, unsigned long size) {}
> +#endif
> +
please remove the trailing newline. I'd add some new lines around the
cpp lines, though.
> diff --git a/arch/arm/plat-mxc/iram.c b/arch/arm/plat-mxc/iram.c
> new file mode 100644
> index 0000000..3d2a391
> --- /dev/null
> +++ b/arch/arm/plat-mxc/iram.c
> @@ -0,0 +1,62 @@
> +/*
> + * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
> + *
> + * 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 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + * MA 02110-1301, USA.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/io.h>
> +#include <linux/module.h>
Why do you need linux/module.h? Maybe linux/init.h is enough?
> +#include <linux/spinlock.h>
This can simply go, can't it?
> +#include <linux/genalloc.h>
> +
> +static unsigned long iram_phys_base;
> +static __iomem void *iram_virt_base;
I assume it doesn't make any difference for gcc, but using
static void __iomem *iram_virt_base
seems to be the more usual form.
> +static struct gen_pool *iram_pool;
> +
> +#define iram_phys_to_virt(p) (iram_virt_base + ((p) - iram_phys_base))
Can you make this a static inline please?
> +
> +void *iram_alloc(unsigned int size, unsigned long *dma_addr)
> +{
> + if (!iram_pool)
> + return NULL;
> +
> + *dma_addr = gen_pool_alloc(iram_pool, size);
> + pr_debug("iram alloc - %dB at 0x%p\n", size, (void *)*dma_addr);
> + return iram_phys_to_virt(*dma_addr);
if iram_virt_base is __iomem, the return value of iram_alloc should be
__iomem, too, no?
> +}
> +EXPORT_SYMBOL(iram_alloc);
> +
> +void iram_free(unsigned long addr, unsigned int size)
> +{
> + if (!iram_pool)
> + return;
> +
> + gen_pool_free(iram_pool, addr, size);
> +}
> +EXPORT_SYMBOL(iram_free);
> +
> +int __init iram_init(unsigned long base, unsigned long size)
> +{
> + iram_phys_base = base;
> +
> + iram_pool = gen_pool_create(12, -1);
if (!iram_pool)
...
> + gen_pool_add(iram_pool, base, size, -1);
> + iram_virt_base = ioremap(iram_phys_base, size);
These two can fail, too.
> + pr_info("i.MX IRAM pool: %ld KB at 0x%p\n", size / 1024, iram_virt_base);
> + return 0;
> +}
iram_init isn't called yet. I assume calls to it should be added to the
cpu init routines (later)?
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] ARM: imx: Add iram allocator functions
2010-10-05 7:44 ` Uwe Kleine-König
@ 2010-10-05 7:55 ` Uwe Kleine-König
2010-10-05 16:49 ` Nguyen Dinh-R00091
0 siblings, 1 reply; 9+ messages in thread
From: Uwe Kleine-König @ 2010-10-05 7:55 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 05, 2010 at 09:44:23AM +0200, Uwe Kleine-K?nig wrote:
> On Mon, Oct 04, 2010 at 07:03:27PM -0500, Dinh.Nguyen at freescale.com wrote:
> > From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> >
> > Add iram allocation functions using GENERIC_ALLOCATOR. The
> > allocation size is 4KB multiples to guarantee alignment. The
> > idea for these functions is for i.MX platforms to use them
> > to dynamically allocate IRAM usage.
> >
> > Applies on 2.6.36-rc6
> >
> > Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > Reviewed-by: Amit Kucheria <amit.kucheria@canonical.com>
> > ---
> > arch/arm/plat-mxc/Kconfig | 10 ++++
> > arch/arm/plat-mxc/Makefile | 1 +
> > arch/arm/plat-mxc/include/mach/iram_alloc.h | 35 +++++++++++++++
> > arch/arm/plat-mxc/iram.c | 62 +++++++++++++++++++++++++++
> > 4 files changed, 108 insertions(+), 0 deletions(-)
> > create mode 100644 arch/arm/plat-mxc/include/mach/iram_alloc.h
> > create mode 100644 arch/arm/plat-mxc/iram.c
> >
> > diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
> > index 6785db4..5e4ff93 100644
> > --- a/arch/arm/plat-mxc/Kconfig
> > +++ b/arch/arm/plat-mxc/Kconfig
> > @@ -57,6 +57,16 @@ source "arch/arm/mach-mx5/Kconfig"
> >
> > endmenu
> >
> > +config IRAM_ALLOC
> > + bool "Enable IRAM allocator"
> > + default y
> The iram allocator isn't useful taken alone, no? So I suggest to make
> it
Hmm. It seems I forgot to finish this sentence, sorry.
Unless IRAM_ALLOC is an optional feature for new features to come I'd
not make it user selectible, but let the new features select IRAM_ALLOC.
If it's optional I wonder if "default y" should really be done.
Maybe better call the symbol just IRAM?
> > + iram_pool = gen_pool_create(12, -1);
> if (!iram_pool)
> ...
After rereading the commit log I wondered where the 4 KB are enforced.
Maybe do
s/12/PAGE_SHIFT/
to make it more obvious?
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] ARM: imx: Add iram allocator functions
2010-10-05 7:55 ` Uwe Kleine-König
@ 2010-10-05 16:49 ` Nguyen Dinh-R00091
2010-10-05 18:15 ` Uwe Kleine-König
0 siblings, 1 reply; 9+ messages in thread
From: Nguyen Dinh-R00091 @ 2010-10-05 16:49 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Uwe Kleine-K?nig [mailto:u.kleine-koenig at pengutronix.de]
> Sent: Tuesday, October 05, 2010 2:56 AM
> To: Nguyen Dinh-R00091
> Cc: linux-kernel at vger.kernel.org; amit.kucheria at canonical.com;
> s.hauer at pengutronix.de; grant.likely at secretlab.ca;
> valentin.longchamp at epfl.ch; daniel at caiaq.de; Zhang Lily-R58066;
> r.schwebel at pengutronix.de; linux-arm-kernel at lists.infradead.org;
> kernel at pengutronix.de
> Subject: Re: [PATCH] ARM: imx: Add iram allocator functions
>
> On Tue, Oct 05, 2010 at 09:44:23AM +0200, Uwe Kleine-K?nig wrote:
> > On Mon, Oct 04, 2010 at 07:03:27PM -0500, Dinh.Nguyen at freescale.com
> wrote:
> > > From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > >
> > > Add iram allocation functions using GENERIC_ALLOCATOR. The
> > > allocation size is 4KB multiples to guarantee alignment. The
> > > idea for these functions is for i.MX platforms to use them
> > > to dynamically allocate IRAM usage.
> > >
> > > Applies on 2.6.36-rc6
> > >
> > > Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > > Reviewed-by: Amit Kucheria <amit.kucheria@canonical.com>
> > > ---
> > > arch/arm/plat-mxc/Kconfig | 10 ++++
> > > arch/arm/plat-mxc/Makefile | 1 +
> > > arch/arm/plat-mxc/include/mach/iram_alloc.h | 35 +++++++++++++++
> > > arch/arm/plat-mxc/iram.c | 62
> +++++++++++++++++++++++++++
> > > 4 files changed, 108 insertions(+), 0 deletions(-)
> > > create mode 100644 arch/arm/plat-mxc/include/mach/iram_alloc.h
> > > create mode 100644 arch/arm/plat-mxc/iram.c
> > >
> > > diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
> > > index 6785db4..5e4ff93 100644
> > > --- a/arch/arm/plat-mxc/Kconfig
> > > +++ b/arch/arm/plat-mxc/Kconfig
> > > @@ -57,6 +57,16 @@ source "arch/arm/mach-mx5/Kconfig"
> > >
> > > endmenu
> > >
> > > +config IRAM_ALLOC
> > > + bool "Enable IRAM allocator"
> > > + default y
> > The iram allocator isn't useful taken alone, no? So I suggest to make
> > it
> Hmm. It seems I forgot to finish this sentence, sorry.
>
> Unless IRAM_ALLOC is an optional feature for new features to come I'd
> not make it user selectible, but let the new features select IRAM_ALLOC.
> If it's optional I wonder if "default y" should really be done.
>
> Maybe better call the symbol just IRAM?
IRAM should be in almost all SoCs, but it will be dependent on various drivers to make use of the IRAM. I think not making it user selectable and add IRAM_ALLOC to defconfigs where IRAM_ALLOC is needed makes sense. For example, the reason I am adding IRAM_ALLOC is to support MX51 suspend code. The MX51 suspend code needs to be run from IRAM. I think also IRAM_ALLOC is more descriptive symbol.
>
> > > + iram_pool = gen_pool_create(12, -1);
> > if (!iram_pool)
> > ...
> After rereading the commit log I wondered where the 4 KB are enforced.
> Maybe do
>
> s/12/PAGE_SHIFT/
>
> to make it more obvious?
I'm unclear about your comment. Should I add a comment of something like this?
/* 12^2 will create a 4KB granularity. */
>
> Best regards
> Uwe
>
> --
> Pengutronix e.K. | Uwe Kleine-K?nig
> |
> Industrial Linux Solutions | http://www.pengutronix.de/
> |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] ARM: imx: Add iram allocator functions
2010-10-05 16:49 ` Nguyen Dinh-R00091
@ 2010-10-05 18:15 ` Uwe Kleine-König
0 siblings, 0 replies; 9+ messages in thread
From: Uwe Kleine-König @ 2010-10-05 18:15 UTC (permalink / raw)
To: linux-arm-kernel
Hello Nguyen (assuming this is the part of your name corresponding to
the first name),
On Tue, Oct 05, 2010 at 09:49:19AM -0700, Nguyen Dinh-R00091 wrote:
>
>
> > -----Original Message-----
> > From: Uwe Kleine-K?nig [mailto:u.kleine-koenig at pengutronix.de]
> > Sent: Tuesday, October 05, 2010 2:56 AM
> > To: Nguyen Dinh-R00091
> > Cc: linux-kernel at vger.kernel.org; amit.kucheria at canonical.com;
> > s.hauer at pengutronix.de; grant.likely at secretlab.ca;
> > valentin.longchamp at epfl.ch; daniel at caiaq.de; Zhang Lily-R58066;
> > r.schwebel at pengutronix.de; linux-arm-kernel at lists.infradead.org;
> > kernel at pengutronix.de
> > Subject: Re: [PATCH] ARM: imx: Add iram allocator functions
> >
> > On Tue, Oct 05, 2010 at 09:44:23AM +0200, Uwe Kleine-K?nig wrote:
> > > On Mon, Oct 04, 2010 at 07:03:27PM -0500, Dinh.Nguyen at freescale.com
> > wrote:
> > > > From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > > >
> > > > Add iram allocation functions using GENERIC_ALLOCATOR. The
> > > > allocation size is 4KB multiples to guarantee alignment. The
> > > > idea for these functions is for i.MX platforms to use them
> > > > to dynamically allocate IRAM usage.
> > > >
> > > > Applies on 2.6.36-rc6
> > > >
> > > > Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > > > Reviewed-by: Amit Kucheria <amit.kucheria@canonical.com>
> > > > ---
> > > > arch/arm/plat-mxc/Kconfig | 10 ++++
> > > > arch/arm/plat-mxc/Makefile | 1 +
> > > > arch/arm/plat-mxc/include/mach/iram_alloc.h | 35 +++++++++++++++
> > > > arch/arm/plat-mxc/iram.c | 62
> > +++++++++++++++++++++++++++
> > > > 4 files changed, 108 insertions(+), 0 deletions(-)
> > > > create mode 100644 arch/arm/plat-mxc/include/mach/iram_alloc.h
> > > > create mode 100644 arch/arm/plat-mxc/iram.c
> > > >
> > > > diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
> > > > index 6785db4..5e4ff93 100644
> > > > --- a/arch/arm/plat-mxc/Kconfig
> > > > +++ b/arch/arm/plat-mxc/Kconfig
> > > > @@ -57,6 +57,16 @@ source "arch/arm/mach-mx5/Kconfig"
> > > >
> > > > endmenu
> > > >
> > > > +config IRAM_ALLOC
> > > > + bool "Enable IRAM allocator"
> > > > + default y
> > > The iram allocator isn't useful taken alone, no? So I suggest to make
> > > it
> > Hmm. It seems I forgot to finish this sentence, sorry.
> >
> > Unless IRAM_ALLOC is an optional feature for new features to come I'd
> > not make it user selectible, but let the new features select IRAM_ALLOC.
> > If it's optional I wonder if "default y" should really be done.
> >
> > Maybe better call the symbol just IRAM?
>
> IRAM should be in almost all SoCs, but it will be dependent on various
> drivers to make use of the IRAM. I think not making it user selectable
> and add IRAM_ALLOC to defconfigs where IRAM_ALLOC is needed makes
> sense.
You cannot add something that is not user selectible to a defconfig.
(Well you can, but it won't get selected even if you do.) You can just
let (say) MX51_PM select IRAM.
> For example, the reason I am adding IRAM_ALLOC is to support
> MX51 suspend code. The MX51 suspend code needs to be run from IRAM. I
> think also IRAM_ALLOC is more descriptive symbol.
I don't care much, still I think _ALLOC doesn't add much information
here.
> >
> > > > + iram_pool = gen_pool_create(12, -1);
> > > if (!iram_pool)
> > > ...
> > After rereading the commit log I wondered where the 4 KB are enforced.
> > Maybe do
> >
> > s/12/PAGE_SHIFT/
> >
> > to make it more obvious?
>
> I'm unclear about your comment. Should I add a comment of something like this?
> /* 12^2 will create a 4KB granularity. */
I suggested to do:
iram_pool = gen_pool_create(PAGE_SHIFT, -1);
(see sed(1) to understand the syntax I used.)
or maybe something else that more obvious implies 4KiB than 12.
__fls(SZ_4K) comes to mind.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] ARM: imx: Add iram allocator functions
@ 2010-10-01 20:51 Dinh.Nguyen at freescale.com
2010-10-04 11:49 ` Amit Kucheria
0 siblings, 1 reply; 9+ messages in thread
From: Dinh.Nguyen at freescale.com @ 2010-10-01 20:51 UTC (permalink / raw)
To: linux-arm-kernel
From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Add iram allocation functions using GENERIC_ALLOCATOR. The
allocation size is 4KB multiples to guarantee alignment. The
idea for these functions is for i.MX platforms to use them
to dynamically allocate IRAM usage.
Applies on 2.6.36-rc6
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
---
arch/arm/plat-mxc/Kconfig | 5 ++
arch/arm/plat-mxc/Makefile | 1 +
arch/arm/plat-mxc/include/mach/iram_alloc.h | 35 +++++++++++++++
arch/arm/plat-mxc/iram.c | 62 +++++++++++++++++++++++++++
4 files changed, 103 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-mxc/include/mach/iram_alloc.h
create mode 100644 arch/arm/plat-mxc/iram.c
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 6785db4..283d5bc 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -57,6 +57,11 @@ source "arch/arm/mach-mx5/Kconfig"
endmenu
+config IRAM_ALLOC
+ bool
+ default y
+ select GENERIC_ALLOCATOR
+
config MXC_IRQ_PRIOR
bool "Use IRQ priority"
help
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index 78d405e..35cf07b 100644
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_MXC_TZIC) += tzic.o
obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
+obj-$(CONFIG_IRAM_ALLOC) += iram.o
obj-$(CONFIG_MXC_PWM) += pwm.o
obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
obj-$(CONFIG_MXC_ULPI) += ulpi.o
diff --git a/arch/arm/plat-mxc/include/mach/iram_alloc.h b/arch/arm/plat-mxc/include/mach/iram_alloc.h
new file mode 100644
index 0000000..12881aa
--- /dev/null
+++ b/arch/arm/plat-mxc/include/mach/iram_alloc.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifdef CONFIG_IRAM_ALLOC
+int __init iram_init(unsigned long base, unsigned long size);
+void *iram_alloc(unsigned int size, unsigned long *dma_addr);
+void iram_free(unsigned long dma_addr, unsigned int size);
+#else
+static inline int __init iram_init(unsigned long base, unsigned long size)
+{
+ return -ENOMEM;
+}
+static inline void *iram_alloc(unsigned int size, unsigned long *dma_addr)
+{
+ return NULL;
+}
+static inline void iram_free(unsigned long base, unsigned long size) {}
+#endif
+
diff --git a/arch/arm/plat-mxc/iram.c b/arch/arm/plat-mxc/iram.c
new file mode 100644
index 0000000..3d2a391
--- /dev/null
+++ b/arch/arm/plat-mxc/iram.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/genalloc.h>
+
+static unsigned long iram_phys_base;
+static __iomem void *iram_virt_base;
+static struct gen_pool *iram_pool;
+
+#define iram_phys_to_virt(p) (iram_virt_base + ((p) - iram_phys_base))
+
+void *iram_alloc(unsigned int size, unsigned long *dma_addr)
+{
+ if (!iram_pool)
+ return NULL;
+
+ *dma_addr = gen_pool_alloc(iram_pool, size);
+ pr_debug("iram alloc - %dB at 0x%p\n", size, (void *)*dma_addr);
+ return iram_phys_to_virt(*dma_addr);
+}
+EXPORT_SYMBOL(iram_alloc);
+
+void iram_free(unsigned long addr, unsigned int size)
+{
+ if (!iram_pool)
+ return;
+
+ gen_pool_free(iram_pool, addr, size);
+}
+EXPORT_SYMBOL(iram_free);
+
+int __init iram_init(unsigned long base, unsigned long size)
+{
+ iram_phys_base = base;
+
+ iram_pool = gen_pool_create(12, -1);
+ gen_pool_add(iram_pool, base, size, -1);
+ iram_virt_base = ioremap(iram_phys_base, size);
+
+ pr_info("i.MX IRAM pool: %ld KB at 0x%p\n", size / 1024, iram_virt_base);
+ return 0;
+}
--
1.6.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH] ARM: imx: Add iram allocator functions
2010-10-01 20:51 Dinh.Nguyen at freescale.com
@ 2010-10-04 11:49 ` Amit Kucheria
2010-10-04 11:59 ` Lothar Waßmann
0 siblings, 1 reply; 9+ messages in thread
From: Amit Kucheria @ 2010-10-04 11:49 UTC (permalink / raw)
To: linux-arm-kernel
On 10 Oct 01, Dinh.Nguyen at freescale.com wrote:
> From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
>
> Add iram allocation functions using GENERIC_ALLOCATOR. The
> allocation size is 4KB multiples to guarantee alignment. The
> idea for these functions is for i.MX platforms to use them
> to dynamically allocate IRAM usage.
>
> Applies on 2.6.36-rc6
>
> Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> ---
> arch/arm/plat-mxc/Kconfig | 5 ++
> arch/arm/plat-mxc/Makefile | 1 +
> arch/arm/plat-mxc/include/mach/iram_alloc.h | 35 +++++++++++++++
> arch/arm/plat-mxc/iram.c | 62 +++++++++++++++++++++++++++
> 4 files changed, 103 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/plat-mxc/include/mach/iram_alloc.h
> create mode 100644 arch/arm/plat-mxc/iram.c
>
> diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
> index 6785db4..283d5bc 100644
> --- a/arch/arm/plat-mxc/Kconfig
> +++ b/arch/arm/plat-mxc/Kconfig
> @@ -57,6 +57,11 @@ source "arch/arm/mach-mx5/Kconfig"
>
> endmenu
>
> +config IRAM_ALLOC
> + bool
If it is a bool, shouldn't it need a description entry so it shows up in the
menuconfig?
It can't be disabled currently.
> + default y
> + select GENERIC_ALLOCATOR
> +
> config MXC_IRQ_PRIOR
> bool "Use IRQ priority"
> help
> diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
> index 78d405e..35cf07b 100644
> --- a/arch/arm/plat-mxc/Makefile
> +++ b/arch/arm/plat-mxc/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_MXC_TZIC) += tzic.o
>
> obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
> obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
> +obj-$(CONFIG_IRAM_ALLOC) += iram.o
> obj-$(CONFIG_MXC_PWM) += pwm.o
> obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
> obj-$(CONFIG_MXC_ULPI) += ulpi.o
> diff --git a/arch/arm/plat-mxc/include/mach/iram_alloc.h b/arch/arm/plat-mxc/include/mach/iram_alloc.h
> new file mode 100644
> index 0000000..12881aa
> --- /dev/null
> +++ b/arch/arm/plat-mxc/include/mach/iram_alloc.h
> @@ -0,0 +1,35 @@
> +/*
> + * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
> + *
> + * 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 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + * MA 02110-1301, USA.
> + */
> +
> +#ifdef CONFIG_IRAM_ALLOC
> +int __init iram_init(unsigned long base, unsigned long size);
> +void *iram_alloc(unsigned int size, unsigned long *dma_addr);
> +void iram_free(unsigned long dma_addr, unsigned int size);
> +#else
> +static inline int __init iram_init(unsigned long base, unsigned long size)
> +{
> + return -ENOMEM;
> +}
> +static inline void *iram_alloc(unsigned int size, unsigned long *dma_addr)
> +{
> + return NULL;
Return for a void function
> +static inline void iram_free(unsigned long base, unsigned long size) {}
> +#endif
> +
> diff --git a/arch/arm/plat-mxc/iram.c b/arch/arm/plat-mxc/iram.c
> new file mode 100644
> index 0000000..3d2a391
> --- /dev/null
> +++ b/arch/arm/plat-mxc/iram.c
> @@ -0,0 +1,62 @@
> +/*
> + * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
> + *
> + * 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 2
> + * of the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> + * MA 02110-1301, USA.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/io.h>
> +#include <linux/module.h>
> +#include <linux/spinlock.h>
> +#include <linux/genalloc.h>
> +
> +static unsigned long iram_phys_base;
> +static __iomem void *iram_virt_base;
> +static struct gen_pool *iram_pool;
> +
> +#define iram_phys_to_virt(p) (iram_virt_base + ((p) - iram_phys_base))
> +
> +void *iram_alloc(unsigned int size, unsigned long *dma_addr)
> +{
> + if (!iram_pool)
> + return NULL;
> +
> + *dma_addr = gen_pool_alloc(iram_pool, size);
> + pr_debug("iram alloc - %dB at 0x%p\n", size, (void *)*dma_addr);
> + return iram_phys_to_virt(*dma_addr);
> +}
> +EXPORT_SYMBOL(iram_alloc);
> +
> +void iram_free(unsigned long addr, unsigned int size)
> +{
> + if (!iram_pool)
> + return;
> +
> + gen_pool_free(iram_pool, addr, size);
> +}
> +EXPORT_SYMBOL(iram_free);
> +
> +int __init iram_init(unsigned long base, unsigned long size)
> +{
> + iram_phys_base = base;
> +
> + iram_pool = gen_pool_create(12, -1);
> + gen_pool_add(iram_pool, base, size, -1);
> + iram_virt_base = ioremap(iram_phys_base, size);
> +
> + pr_info("i.MX IRAM pool: %ld KB at 0x%p\n", size / 1024, iram_virt_base);
> + return 0;
> +}
> --
> 1.6.0.4
>
>
--
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com
----------------------------------------------------------------------
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] ARM: imx: Add iram allocator functions
2010-10-04 11:49 ` Amit Kucheria
@ 2010-10-04 11:59 ` Lothar Waßmann
2010-10-04 12:14 ` Amit Kucheria
0 siblings, 1 reply; 9+ messages in thread
From: Lothar Waßmann @ 2010-10-04 11:59 UTC (permalink / raw)
To: linux-arm-kernel
Amit Kucheria writes:
> On 10 Oct 01, Dinh.Nguyen at freescale.com wrote:
> > From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> >
> > Add iram allocation functions using GENERIC_ALLOCATOR. The
> > allocation size is 4KB multiples to guarantee alignment. The
> > idea for these functions is for i.MX platforms to use them
> > to dynamically allocate IRAM usage.
> >
> > Applies on 2.6.36-rc6
> >
> > Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > ---
> > arch/arm/plat-mxc/Kconfig | 5 ++
> > arch/arm/plat-mxc/Makefile | 1 +
> > arch/arm/plat-mxc/include/mach/iram_alloc.h | 35 +++++++++++++++
> > arch/arm/plat-mxc/iram.c | 62 +++++++++++++++++++++++++++
> > 4 files changed, 103 insertions(+), 0 deletions(-)
> > create mode 100644 arch/arm/plat-mxc/include/mach/iram_alloc.h
> > create mode 100644 arch/arm/plat-mxc/iram.c
> >
> > diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
> > index 6785db4..283d5bc 100644
> > --- a/arch/arm/plat-mxc/Kconfig
> > +++ b/arch/arm/plat-mxc/Kconfig
> > @@ -57,6 +57,11 @@ source "arch/arm/mach-mx5/Kconfig"
> >
> > endmenu
> >
> > +config IRAM_ALLOC
> > + bool
>
> If it is a bool, shouldn't it need a description entry so it shows up in the
> menuconfig?
>
> It can't be disabled currently.
>
> > + default y
> > + select GENERIC_ALLOCATOR
> > +
> > config MXC_IRQ_PRIOR
> > bool "Use IRQ priority"
> > help
> > diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
> > index 78d405e..35cf07b 100644
> > --- a/arch/arm/plat-mxc/Makefile
> > +++ b/arch/arm/plat-mxc/Makefile
> > @@ -10,6 +10,7 @@ obj-$(CONFIG_MXC_TZIC) += tzic.o
> >
> > obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
> > obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
> > +obj-$(CONFIG_IRAM_ALLOC) += iram.o
> > obj-$(CONFIG_MXC_PWM) += pwm.o
> > obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
> > obj-$(CONFIG_MXC_ULPI) += ulpi.o
> > diff --git a/arch/arm/plat-mxc/include/mach/iram_alloc.h b/arch/arm/plat-mxc/include/mach/iram_alloc.h
> > new file mode 100644
> > index 0000000..12881aa
> > --- /dev/null
> > +++ b/arch/arm/plat-mxc/include/mach/iram_alloc.h
> > @@ -0,0 +1,35 @@
> > +/*
> > + * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
> > + *
> > + * 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 2
> > + * of the License, or (at your option) any later version.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License
> > + * along with this program; if not, write to the Free Software
> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> > + * MA 02110-1301, USA.
> > + */
> > +
> > +#ifdef CONFIG_IRAM_ALLOC
> > +int __init iram_init(unsigned long base, unsigned long size);
> > +void *iram_alloc(unsigned int size, unsigned long *dma_addr);
> > +void iram_free(unsigned long dma_addr, unsigned int size);
> > +#else
> > +static inline int __init iram_init(unsigned long base, unsigned long size)
> > +{
> > + return -ENOMEM;
> > +}
> > +static inline void *iram_alloc(unsigned int size, unsigned long *dma_addr)
^
> > +{
> > + return NULL;
>
> Return for a void function
>
Not quite. You obviously missed the one and only star in the void. ;)
Lothar Wa?mann
--
___________________________________________________________
Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Gesch?ftsf?hrer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996
www.karo-electronics.de | info at karo-electronics.de
___________________________________________________________
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH] ARM: imx: Add iram allocator functions
2010-10-04 11:59 ` Lothar Waßmann
@ 2010-10-04 12:14 ` Amit Kucheria
0 siblings, 0 replies; 9+ messages in thread
From: Amit Kucheria @ 2010-10-04 12:14 UTC (permalink / raw)
To: linux-arm-kernel
On 10 Oct 04, Lothar Wa?mann wrote:
> Amit Kucheria writes:
> > On 10 Oct 01, Dinh.Nguyen at freescale.com wrote:
> > > From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > >
> > > Add iram allocation functions using GENERIC_ALLOCATOR. The
> > > allocation size is 4KB multiples to guarantee alignment. The
> > > idea for these functions is for i.MX platforms to use them
> > > to dynamically allocate IRAM usage.
> > >
> > > Applies on 2.6.36-rc6
> > >
> > > Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > > ---
> > > arch/arm/plat-mxc/Kconfig | 5 ++
> > > arch/arm/plat-mxc/Makefile | 1 +
> > > arch/arm/plat-mxc/include/mach/iram_alloc.h | 35 +++++++++++++++
> > > arch/arm/plat-mxc/iram.c | 62 +++++++++++++++++++++++++++
> > > 4 files changed, 103 insertions(+), 0 deletions(-)
> > > create mode 100644 arch/arm/plat-mxc/include/mach/iram_alloc.h
> > > create mode 100644 arch/arm/plat-mxc/iram.c
> > >
> > > diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
> > > index 6785db4..283d5bc 100644
> > > --- a/arch/arm/plat-mxc/Kconfig
> > > +++ b/arch/arm/plat-mxc/Kconfig
> > > @@ -57,6 +57,11 @@ source "arch/arm/mach-mx5/Kconfig"
> > >
> > > endmenu
> > >
> > > +config IRAM_ALLOC
> > > + bool
> >
> > If it is a bool, shouldn't it need a description entry so it shows up in the
> > menuconfig?
> >
> > It can't be disabled currently.
> >
> > > + default y
> > > + select GENERIC_ALLOCATOR
> > > +
> > > config MXC_IRQ_PRIOR
> > > bool "Use IRQ priority"
> > > help
> > > diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
> > > index 78d405e..35cf07b 100644
> > > --- a/arch/arm/plat-mxc/Makefile
> > > +++ b/arch/arm/plat-mxc/Makefile
> > > @@ -10,6 +10,7 @@ obj-$(CONFIG_MXC_TZIC) += tzic.o
> > >
> > > obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
> > > obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
> > > +obj-$(CONFIG_IRAM_ALLOC) += iram.o
> > > obj-$(CONFIG_MXC_PWM) += pwm.o
> > > obj-$(CONFIG_USB_EHCI_MXC) += ehci.o
> > > obj-$(CONFIG_MXC_ULPI) += ulpi.o
> > > diff --git a/arch/arm/plat-mxc/include/mach/iram_alloc.h b/arch/arm/plat-mxc/include/mach/iram_alloc.h
> > > new file mode 100644
> > > index 0000000..12881aa
> > > --- /dev/null
> > > +++ b/arch/arm/plat-mxc/include/mach/iram_alloc.h
> > > @@ -0,0 +1,35 @@
> > > +/*
> > > + * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
> > > + *
> > > + * 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 2
> > > + * of the License, or (at your option) any later version.
> > > + *
> > > + * This program is distributed in the hope that it will be useful,
> > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > + * GNU General Public License for more details.
> > > + *
> > > + * You should have received a copy of the GNU General Public License
> > > + * along with this program; if not, write to the Free Software
> > > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
> > > + * MA 02110-1301, USA.
> > > + */
> > > +
> > > +#ifdef CONFIG_IRAM_ALLOC
> > > +int __init iram_init(unsigned long base, unsigned long size);
> > > +void *iram_alloc(unsigned int size, unsigned long *dma_addr);
> > > +void iram_free(unsigned long dma_addr, unsigned int size);
> > > +#else
> > > +static inline int __init iram_init(unsigned long base, unsigned long size)
> > > +{
> > > + return -ENOMEM;
> > > +}
> > > +static inline void *iram_alloc(unsigned int size, unsigned long *dma_addr)
> ^
> > > +{
> > > + return NULL;
> >
> > Return for a void function
> >
> Not quite. You obviously missed the one and only star in the void. ;)
Heh :) Indeed.
Dinh, you can add a reviewed-by after addressing the Kconfig entry.
/Amit
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-10-05 18:15 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-05 0:03 [PATCH] ARM: imx: Add iram allocator functions Dinh.Nguyen at freescale.com
2010-10-05 7:44 ` Uwe Kleine-König
2010-10-05 7:55 ` Uwe Kleine-König
2010-10-05 16:49 ` Nguyen Dinh-R00091
2010-10-05 18:15 ` Uwe Kleine-König
-- strict thread matches above, loose matches on Subject: below --
2010-10-01 20:51 Dinh.Nguyen at freescale.com
2010-10-04 11:49 ` Amit Kucheria
2010-10-04 11:59 ` Lothar Waßmann
2010-10-04 12:14 ` Amit Kucheria
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).