linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv3] ARM: imx: Add iram allocator functions
@ 2010-10-05 19:41 Dinh.Nguyen at freescale.com
  2010-10-05 19:55 ` Linus Walleij
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Dinh.Nguyen at freescale.com @ 2010-10-05 19:41 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                   |    9 ++++
 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, 107 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..e6de0df 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -57,6 +57,15 @@ source "arch/arm/mach-mx5/Kconfig"
 
 endmenu
 
+config IRAM_ALLOC
+	bool "Enable IRAM allocator"
+	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..d59fe75
--- /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(PAGE_SHIFT, -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] 5+ messages in thread

* [PATCHv3] ARM: imx: Add iram allocator functions
  2010-10-05 19:41 [PATCHv3] ARM: imx: Add iram allocator functions Dinh.Nguyen at freescale.com
@ 2010-10-05 19:55 ` Linus Walleij
  2010-10-05 20:22 ` Uwe Kleine-König
  2010-10-06 10:35 ` Sascha Hauer
  2 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2010-10-05 19:55 UTC (permalink / raw)
  To: linux-arm-kernel

2010/10/5  <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.

Neither here...

> +config IRAM_ALLOC
> + ? ? ? bool "Enable IRAM allocator"
> + ? ? ? 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.

Nor here is is explained what an IRAM is.

What is it? Is this yet another fancy name for on-chip-memory?

And why I? = Initial? Interrupt? ...?

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCHv3] ARM: imx: Add iram allocator functions
  2010-10-05 19:41 [PATCHv3] ARM: imx: Add iram allocator functions Dinh.Nguyen at freescale.com
  2010-10-05 19:55 ` Linus Walleij
@ 2010-10-05 20:22 ` Uwe Kleine-König
  2010-10-06 16:04   ` Nguyen Dinh-R00091
  2010-10-06 10:35 ` Sascha Hauer
  2 siblings, 1 reply; 5+ messages in thread
From: Uwe Kleine-König @ 2010-10-05 20:22 UTC (permalink / raw)
  To: linux-arm-kernel

Hello,

On Tue, Oct 05, 2010 at 02:41:55PM -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                   |    9 ++++
>  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, 107 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..e6de0df 100644
> --- a/arch/arm/plat-mxc/Kconfig
> +++ b/arch/arm/plat-mxc/Kconfig
> @@ -57,6 +57,15 @@ source "arch/arm/mach-mx5/Kconfig"
>  
>  endmenu
>  
> +config IRAM_ALLOC
> +	bool "Enable IRAM allocator"
> +	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.
> +
I thought you didn't want to have that user selectible?

>  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
> +
please remove trailing newlines

> diff --git a/arch/arm/plat-mxc/iram.c b/arch/arm/plat-mxc/iram.c
> new file mode 100644
> index 0000000..d59fe75
> --- /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>
Hmm, I have a d?j? vu, and that's already the second time in this mail.
IIRC I asked you to remove spinlock.h and use linux/init.h insteadof
linux/module.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(PAGE_SHIFT, -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
> 
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCHv3] ARM: imx: Add iram allocator functions
  2010-10-05 19:41 [PATCHv3] ARM: imx: Add iram allocator functions Dinh.Nguyen at freescale.com
  2010-10-05 19:55 ` Linus Walleij
  2010-10-05 20:22 ` Uwe Kleine-König
@ 2010-10-06 10:35 ` Sascha Hauer
  2 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2010-10-06 10:35 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Oct 05, 2010 at 02:41:55PM -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                   |    9 ++++
>  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, 107 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..e6de0df 100644
> --- a/arch/arm/plat-mxc/Kconfig
> +++ b/arch/arm/plat-mxc/Kconfig
> @@ -57,6 +57,15 @@ source "arch/arm/mach-mx5/Kconfig"
>  
>  endmenu
>  
> +config IRAM_ALLOC
> +	bool "Enable IRAM allocator"
> +	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..d59fe75
> --- /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);

When gen_pool_alloc fails you should return 0 instead of iram_virt_base
- iram_phys_base

> +}
> +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(PAGE_SHIFT, -1);
> +	gen_pool_add(iram_pool, base, size, -1);
> +	iram_virt_base = ioremap(iram_phys_base, size);

Uwe already mentioned that all these functions can fail.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCHv3] ARM: imx: Add iram allocator functions
  2010-10-05 20:22 ` Uwe Kleine-König
@ 2010-10-06 16:04   ` Nguyen Dinh-R00091
  0 siblings, 0 replies; 5+ messages in thread
From: Nguyen Dinh-R00091 @ 2010-10-06 16:04 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

>-----Original Message-----
From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-owner at vger.kernel.org] On Behalf Of Uwe
>Kleine-K?nig
>Sent: Tuesday, October 05, 2010 3:23 PM
>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
>Subject: Re: [PATCHv3] ARM: imx: Add iram allocator functions
>
>Hello,
>
>On Tue, Oct 05, 2010 at 02:41:55PM -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                   |    9 ++++
>>  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, 107 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..e6de0df 100644
>> --- a/arch/arm/plat-mxc/Kconfig
>> +++ b/arch/arm/plat-mxc/Kconfig
>> @@ -57,6 +57,15 @@ source "arch/arm/mach-mx5/Kconfig"
>>
>>  endmenu
>>
>> +config IRAM_ALLOC
>> +	bool "Enable IRAM allocator"
>> +	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.
>> +
>I thought you didn't want to have that user selectible?
>
>>  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
>> +
>please remove trailing newlines
Will fix in PATCHv4

>
>> diff --git a/arch/arm/plat-mxc/iram.c b/arch/arm/plat-mxc/iram.c
>> new file mode 100644
>> index 0000000..d59fe75
>> --- /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>
>Hmm, I have a d?j? vu, and that's already the second time in this mail.
>IIRC I asked you to remove spinlock.h and use linux/init.h insteadof
>linux/module.h.

I apologize for missing this comment on the previous review. It appears that I need to include linux/spinlock.h, otherwise I get a compile error.

include/linux/genalloc.h:16: error: expected specifier-qualifier-list before 'rwlock_t'
include/linux/genalloc.h:25: error: expected specifier-qualifier-list before 'spinlock_t'

>
>> +#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);
>> +

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2010-10-06 16:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-05 19:41 [PATCHv3] ARM: imx: Add iram allocator functions Dinh.Nguyen at freescale.com
2010-10-05 19:55 ` Linus Walleij
2010-10-05 20:22 ` Uwe Kleine-König
2010-10-06 16:04   ` Nguyen Dinh-R00091
2010-10-06 10:35 ` Sascha Hauer

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).