From: Leo Yan <leoy@marvell.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, haojian.zhuang@marvell.com, nicolas.pitre@linaro.org, linux@arm.linux.org.uk, plagnioj@jcrosoft.com Cc: Leo Yan <leoy@marvell.com> Subject: [PATCH 2/2] ARM: mmp: add audio sram allocator Date: Mon, 1 Aug 2011 10:59:07 +0800 [thread overview] Message-ID: <1312167547-26740-3-git-send-email-leoy@marvell.com> (raw) In-Reply-To: <1312167547-26740-1-git-send-email-leoy@marvell.com> Implement the audio sram allocator with genalloc, so that can dynamically allocate the buffer to pcm devices as need. Signed-off-by: Leo Yan <leoy@marvell.com> --- arch/arm/Kconfig | 1 + arch/arm/mach-mmp/Makefile | 2 +- arch/arm/mach-mmp/audio_sram.c | 99 +++++++++++++++++++++++++++ arch/arm/mach-mmp/include/mach/audio_sram.h | 24 +++++++ 4 files changed, 125 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mmp/audio_sram.c create mode 100644 arch/arm/mach-mmp/include/mach/audio_sram.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3eacf57..480e1524 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -546,6 +546,7 @@ config ARCH_MMP select TICK_ONESHOT select PLAT_PXA select SPARSE_IRQ + select GENERIC_ALLOCATOR help Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile index b0ac942..290182b 100644 --- a/arch/arm/mach-mmp/Makefile +++ b/arch/arm/mach-mmp/Makefile @@ -7,7 +7,7 @@ obj-y += common.o clock.o devices.o time.o # SoC support obj-$(CONFIG_CPU_PXA168) += pxa168.o irq-pxa168.o obj-$(CONFIG_CPU_PXA910) += pxa910.o irq-pxa168.o -obj-$(CONFIG_CPU_MMP2) += mmp2.o irq-mmp2.o +obj-$(CONFIG_CPU_MMP2) += mmp2.o irq-mmp2.o audio_sram.o # board support obj-$(CONFIG_MACH_ASPENITE) += aspenite.o diff --git a/arch/arm/mach-mmp/audio_sram.c b/arch/arm/mach-mmp/audio_sram.c new file mode 100644 index 0000000..73c7dc5 --- /dev/null +++ b/arch/arm/mach-mmp/audio_sram.c @@ -0,0 +1,99 @@ +/* + * linux/arch/arm/mach-mmp/audio_sram.c + * + * based on mach-davinci/sram.c - DaVinci simple SRAM allocator + * + * Copyright (c) 2011 Marvell Semiconductors Inc. + * All Rights Reserved + * + * Add for mmp audio sram support - Leo Yan <leoy@marvell.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/io.h> +#include <linux/err.h> +#include <linux/genalloc.h> + +#include <mach/audio_sram.h> + +static phys_addr_t audio_sram_phys; +static void __iomem *audio_sram_virt; +static u32 audio_sram_size; + +struct gen_pool *mmp_audio_sram_gpool; +EXPORT_SYMBOL_GPL(mmp_audio_sram_gpool); + +static int __devinit audio_sram_probe(struct platform_device *pdev) +{ + struct resource *res; + int ret = 0; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (res == NULL) { + dev_err(&pdev->dev, "no memory resource defined\n"); + ret = -ENODEV; + goto out; + } + audio_sram_phys = (phys_addr_t)res->start; + audio_sram_size = res->end - res->start + 1; + audio_sram_virt = ioremap(audio_sram_phys, audio_sram_size); + + if (!audio_sram_size) + return 0; + + mmp_audio_sram_gpool = + gen_pool_create(ilog2(AUDIO_SRAM_GRANULARITY), -1); + if (!mmp_audio_sram_gpool) { + dev_err(&pdev->dev, "create pool failed\n"); + ret = -ENOMEM; + goto create_pool_err; + } + + ret = gen_pool_add_virt(mmp_audio_sram_gpool, + (unsigned long)audio_sram_virt, + audio_sram_phys, audio_sram_size, -1); + if (ret < 0) { + dev_err(&pdev->dev, "add new chunk failed\n"); + ret = -ENOMEM; + goto add_chunk_err; + } + + return 0; + +add_chunk_err: + gen_pool_destroy(mmp_audio_sram_gpool); +create_pool_err: + iounmap(audio_sram_virt); +out: + return ret; +} + +static int __devexit audio_sram_remove(struct platform_device *pdev) +{ + gen_pool_destroy(mmp_audio_sram_gpool); + iounmap(audio_sram_virt); + return 0; +} + +static struct platform_driver audio_sram_driver = { + .probe = audio_sram_probe, + .remove = audio_sram_remove, + .driver = { + .name = "mmp-audio-sram", + }, +}; + +static int __init audio_sram_init(void) +{ + return platform_driver_register(&audio_sram_driver); +} +core_initcall(audio_sram_init); + +MODULE_LICENSE("GPL"); diff --git a/arch/arm/mach-mmp/include/mach/audio_sram.h b/arch/arm/mach-mmp/include/mach/audio_sram.h new file mode 100644 index 0000000..27124d5 --- /dev/null +++ b/arch/arm/mach-mmp/include/mach/audio_sram.h @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-mmp/include/mach/audio_sram.h + * + * Audio SRAM Memory Management + * + * Copyright (c) 2011 Marvell Semiconductors Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#ifndef __ASM_ARCH_AUDIO_SRAM_H +#define __ASM_ARCH_AUDIO_SRAM_H + +#include <linux/genalloc.h> + +/* ARBITRARY: SRAM allocations are multiples of this 2^N size */ +#define AUDIO_SRAM_GRANULARITY 512 + +extern struct gen_pool *mmp_audio_sram_gpool; + +#endif /* __ASM_ARCH_AUDIO_SRAM_H */ -- 1.7.4.1
WARNING: multiple messages have this Message-ID (diff)
From: leoy@marvell.com (Leo Yan) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: mmp: add audio sram allocator Date: Mon, 1 Aug 2011 10:59:07 +0800 [thread overview] Message-ID: <1312167547-26740-3-git-send-email-leoy@marvell.com> (raw) In-Reply-To: <1312167547-26740-1-git-send-email-leoy@marvell.com> Implement the audio sram allocator with genalloc, so that can dynamically allocate the buffer to pcm devices as need. Signed-off-by: Leo Yan <leoy@marvell.com> --- arch/arm/Kconfig | 1 + arch/arm/mach-mmp/Makefile | 2 +- arch/arm/mach-mmp/audio_sram.c | 99 +++++++++++++++++++++++++++ arch/arm/mach-mmp/include/mach/audio_sram.h | 24 +++++++ 4 files changed, 125 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mmp/audio_sram.c create mode 100644 arch/arm/mach-mmp/include/mach/audio_sram.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3eacf57..480e1524 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -546,6 +546,7 @@ config ARCH_MMP select TICK_ONESHOT select PLAT_PXA select SPARSE_IRQ + select GENERIC_ALLOCATOR help Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile index b0ac942..290182b 100644 --- a/arch/arm/mach-mmp/Makefile +++ b/arch/arm/mach-mmp/Makefile @@ -7,7 +7,7 @@ obj-y += common.o clock.o devices.o time.o # SoC support obj-$(CONFIG_CPU_PXA168) += pxa168.o irq-pxa168.o obj-$(CONFIG_CPU_PXA910) += pxa910.o irq-pxa168.o -obj-$(CONFIG_CPU_MMP2) += mmp2.o irq-mmp2.o +obj-$(CONFIG_CPU_MMP2) += mmp2.o irq-mmp2.o audio_sram.o # board support obj-$(CONFIG_MACH_ASPENITE) += aspenite.o diff --git a/arch/arm/mach-mmp/audio_sram.c b/arch/arm/mach-mmp/audio_sram.c new file mode 100644 index 0000000..73c7dc5 --- /dev/null +++ b/arch/arm/mach-mmp/audio_sram.c @@ -0,0 +1,99 @@ +/* + * linux/arch/arm/mach-mmp/audio_sram.c + * + * based on mach-davinci/sram.c - DaVinci simple SRAM allocator + * + * Copyright (c) 2011 Marvell Semiconductors Inc. + * All Rights Reserved + * + * Add for mmp audio sram support - Leo Yan <leoy@marvell.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/io.h> +#include <linux/err.h> +#include <linux/genalloc.h> + +#include <mach/audio_sram.h> + +static phys_addr_t audio_sram_phys; +static void __iomem *audio_sram_virt; +static u32 audio_sram_size; + +struct gen_pool *mmp_audio_sram_gpool; +EXPORT_SYMBOL_GPL(mmp_audio_sram_gpool); + +static int __devinit audio_sram_probe(struct platform_device *pdev) +{ + struct resource *res; + int ret = 0; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (res == NULL) { + dev_err(&pdev->dev, "no memory resource defined\n"); + ret = -ENODEV; + goto out; + } + audio_sram_phys = (phys_addr_t)res->start; + audio_sram_size = res->end - res->start + 1; + audio_sram_virt = ioremap(audio_sram_phys, audio_sram_size); + + if (!audio_sram_size) + return 0; + + mmp_audio_sram_gpool = + gen_pool_create(ilog2(AUDIO_SRAM_GRANULARITY), -1); + if (!mmp_audio_sram_gpool) { + dev_err(&pdev->dev, "create pool failed\n"); + ret = -ENOMEM; + goto create_pool_err; + } + + ret = gen_pool_add_virt(mmp_audio_sram_gpool, + (unsigned long)audio_sram_virt, + audio_sram_phys, audio_sram_size, -1); + if (ret < 0) { + dev_err(&pdev->dev, "add new chunk failed\n"); + ret = -ENOMEM; + goto add_chunk_err; + } + + return 0; + +add_chunk_err: + gen_pool_destroy(mmp_audio_sram_gpool); +create_pool_err: + iounmap(audio_sram_virt); +out: + return ret; +} + +static int __devexit audio_sram_remove(struct platform_device *pdev) +{ + gen_pool_destroy(mmp_audio_sram_gpool); + iounmap(audio_sram_virt); + return 0; +} + +static struct platform_driver audio_sram_driver = { + .probe = audio_sram_probe, + .remove = audio_sram_remove, + .driver = { + .name = "mmp-audio-sram", + }, +}; + +static int __init audio_sram_init(void) +{ + return platform_driver_register(&audio_sram_driver); +} +core_initcall(audio_sram_init); + +MODULE_LICENSE("GPL"); diff --git a/arch/arm/mach-mmp/include/mach/audio_sram.h b/arch/arm/mach-mmp/include/mach/audio_sram.h new file mode 100644 index 0000000..27124d5 --- /dev/null +++ b/arch/arm/mach-mmp/include/mach/audio_sram.h @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-mmp/include/mach/audio_sram.h + * + * Audio SRAM Memory Management + * + * Copyright (c) 2011 Marvell Semiconductors Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#ifndef __ASM_ARCH_AUDIO_SRAM_H +#define __ASM_ARCH_AUDIO_SRAM_H + +#include <linux/genalloc.h> + +/* ARBITRARY: SRAM allocations are multiples of this 2^N size */ +#define AUDIO_SRAM_GRANULARITY 512 + +extern struct gen_pool *mmp_audio_sram_gpool; + +#endif /* __ASM_ARCH_AUDIO_SRAM_H */ -- 1.7.4.1
next prev parent reply other threads:[~2011-08-01 2:57 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-01 2:59 [PATCH V2 0/2] ARM: mmp: add audio sram support Leo Yan 2011-08-01 2:59 ` Leo Yan 2011-08-01 2:59 ` [PATCH 1/2] ARM: mmp: register audio sram device Leo Yan 2011-08-01 2:59 ` Leo Yan 2011-08-01 2:59 ` Leo Yan [this message] 2011-08-01 2:59 ` [PATCH 2/2] ARM: mmp: add audio sram allocator Leo Yan 2011-09-15 14:38 ` Jean-Christophe PLAGNIOL-VILLARD 2011-09-15 14:38 ` Jean-Christophe PLAGNIOL-VILLARD 2011-09-16 1:13 ` Leo Yan 2011-09-16 1:13 ` Leo Yan 2011-09-18 0:47 ` Jean-Christophe PLAGNIOL-VILLARD 2011-09-18 0:47 ` Jean-Christophe PLAGNIOL-VILLARD -- strict thread matches above, loose matches on Subject: below -- 2011-07-18 11:18 [PATCH 0/2] Add audio sram support Leo Yan 2011-07-18 11:18 ` [PATCH 2/2] ARM: mmp: add audio sram allocator Leo Yan 2011-07-18 11:18 ` Leo Yan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1312167547-26740-3-git-send-email-leoy@marvell.com \ --to=leoy@marvell.com \ --cc=haojian.zhuang@marvell.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=nicolas.pitre@linaro.org \ --cc=plagnioj@jcrosoft.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.