| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <50A656E2.707@windriver.com>
Date: Fri, 16 Nov 2012 10:08:18 -0500
From: Paul Gortmaker <paul.gortmaker@...driver.com>
To: Philipp Zabel <p.zabel@...gutronix.de>
CC: <linux-kernel@...r.kernel.org>, Arnd Bergmann <arnd@...db.de>,
"Greg Kroah-Hartman" <gregkh@...uxfoundation.org>,
Grant Likely <grant.likely@...retlab.ca>,
Rob Herring <rob.herring@...xeda.com>,
Shawn Guo <shawn.guo@...aro.org>,
Richard Zhao <richard.zhao@...escale.com>,
"Huang Shijie" <shijie8@...il.com>,
Dong Aisheng <dong.aisheng@...aro.org>,
"Matt Porter" <mporter@...com>,
Fabio Estevam <fabio.estevam@...escale.com>,
"Javier Martin" <javier.martin@...ta-silicon.com>,
<kernel@...gutronix.de>, <devicetree-discuss@...ts.ozlabs.org>
Subject: Re: [PATCH v6 3/4] media: coda: use genalloc API
On 12-11-16 05:30 AM, Philipp Zabel wrote:
> This patch depends on "genalloc: add a global pool list,
> allow to find pools by phys address", which provides the
> of_get_named_gen_pool function.
>
> Signed-off-by: Philipp Zabel <p.zabel@...gutronix.de>
> ---
> drivers/media/platform/Kconfig | 3 +--
> drivers/media/platform/coda.c | 47 ++++++++++++++++++++++++++++------------
> 2 files changed, 34 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index 181c768..09d45c6 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -130,10 +130,9 @@ if V4L_MEM2MEM_DRIVERS
>
> config VIDEO_CODA
> tristate "Chips&Media Coda multi-standard codec IP"
> - depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_MXC
> + depends on VIDEO_DEV && VIDEO_V4L2
What was the logic for reducing the dependency scope here?
Your commit log doesn't mention that at all, and when I see
things like that, I predict allyesconfig build failures,
unless there is a similar dependency elsewhere that isn't
visible in just the context of this patch alone.
P.
--
> select VIDEOBUF2_DMA_CONTIG
> select V4L2_MEM2MEM_DEV
> - select IRAM_ALLOC if SOC_IMX53
> ---help---
> Coda is a range of video codec IPs that supports
> H.264, MPEG-4, and other video formats.
> diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
> index cd04ae2..f17b659 100644
> --- a/drivers/media/platform/coda.c
> +++ b/drivers/media/platform/coda.c
> @@ -14,6 +14,7 @@
> #include <linux/clk.h>
> #include <linux/delay.h>
> #include <linux/firmware.h>
> +#include <linux/genalloc.h>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/irq.h>
> @@ -24,7 +25,6 @@
> #include <linux/videodev2.h>
> #include <linux/of.h>
>
> -#include <mach/iram.h>
> #include <media/v4l2-ctrls.h>
> #include <media/v4l2-device.h>
> #include <media/v4l2-ioctl.h>
> @@ -43,6 +43,7 @@
> #define CODA7_WORK_BUF_SIZE (512 * 1024 + CODA_FMO_BUF_SIZE * 8 * 1024)
> #define CODA_PARA_BUF_SIZE (10 * 1024)
> #define CODA_ISRAM_SIZE (2048 * 2)
> +#define CODADX6_IRAM_SIZE 0xb000
> #define CODA7_IRAM_SIZE 0x14000 /* 81920 bytes */
>
> #define CODA_MAX_FRAMEBUFFERS 2
> @@ -128,7 +129,10 @@ struct coda_dev {
>
> struct coda_aux_buf codebuf;
> struct coda_aux_buf workbuf;
> + struct gen_pool *iram_pool;
> + long unsigned int iram_vaddr;
> long unsigned int iram_paddr;
> + unsigned long iram_size;
>
> spinlock_t irqlock;
> struct mutex dev_mutex;
> @@ -1958,6 +1962,22 @@ static int __devinit coda_probe(struct platform_device *pdev)
> return -ENOENT;
> }
>
> + /* Without device tree, get SRAM paddr from second memory resource */
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> + if (res != NULL)
> + dev->iram_pool = gen_pool_find_by_phys(res->start);
> +#ifdef CONFIG_OF
> + if (!dev->iram_pool) {
> + struct device_node *np = pdev->dev.of_node;
> +
> + dev->iram_pool = of_get_named_gen_pool(np, "iram", 0);
> + }
> +#endif
> + if (!dev->iram_pool) {
> + dev_err(&pdev->dev, "iram pool not available\n");
> + return -ENOMEM;
> + }
> +
> ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
> if (ret)
> return ret;
> @@ -1992,18 +2012,17 @@ static int __devinit coda_probe(struct platform_device *pdev)
> return -ENOMEM;
> }
>
> - if (dev->devtype->product == CODA_DX6) {
> - dev->iram_paddr = 0xffff4c00;
> - } else {
> - void __iomem *iram_vaddr;
> -
> - iram_vaddr = iram_alloc(CODA7_IRAM_SIZE,
> - &dev->iram_paddr);
> - if (!iram_vaddr) {
> - dev_err(&pdev->dev, "unable to alloc iram\n");
> - return -ENOMEM;
> - }
> + if (dev->devtype->product == CODA_DX6)
> + dev->iram_size = CODADX6_IRAM_SIZE;
> + else
> + dev->iram_size = CODA7_IRAM_SIZE;
> + dev->iram_vaddr = gen_pool_alloc(dev->iram_pool, dev->iram_size);
> + if (!dev->iram_vaddr) {
> + dev_err(&pdev->dev, "unable to alloc iram\n");
> + return -ENOMEM;
> }
> + dev->iram_paddr = gen_pool_virt_to_phys(dev->iram_pool,
> + dev->iram_vaddr);
>
> platform_set_drvdata(pdev, dev);
>
> @@ -2020,8 +2039,8 @@ static int coda_remove(struct platform_device *pdev)
> if (dev->alloc_ctx)
> vb2_dma_contig_cleanup_ctx(dev->alloc_ctx);
> v4l2_device_unregister(&dev->v4l2_dev);
> - if (dev->iram_paddr)
> - iram_free(dev->iram_paddr, CODA7_IRAM_SIZE);
> + if (dev->iram_vaddr)
> + gen_pool_free(dev->iram_pool, dev->iram_vaddr, dev->iram_size);
> if (dev->codebuf.vaddr)
> dma_free_coherent(&pdev->dev, dev->codebuf.size,
> &dev->codebuf.vaddr, dev->codebuf.paddr);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists