From patchwork Fri Aug 31 09:26:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 1392201 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 20EC9DF215 for ; Fri, 31 Aug 2012 09:35:32 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T7NYi-0000kJ-Q7; Fri, 31 Aug 2012 09:30:43 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T7NVS-00079k-Oc for linux-arm-kernel@lists.infradead.org; Fri, 31 Aug 2012 09:27:19 +0000 Received: from dude.hi.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1T7NVN-0000Gh-9o; Fri, 31 Aug 2012 11:27:09 +0200 From: Philipp Zabel To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Grant Likely , Rob Herring , Paul Gortmaker , Shawn Guo , Richard Zhao , Huang Shijie , Dong Aisheng , kernel@pengutronix.de, devicetree-discuss@lists.ozlabs.org Subject: [PATCH v2 4/9] iram_alloc: store the virt and phys mem address in gen_pool chunks Date: Fri, 31 Aug 2012 11:26:59 +0200 Message-Id: <1346405224-20399-5-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1346405224-20399-1-git-send-email-p.zabel@pengutronix.de> References: <1346405224-20399-1-git-send-email-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.1 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Philipp Zabel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This improves the symmetry of iram_alloc and iram_free in that iram_free has to be called with the virtual address now. Also, gen_pool_virt_to_phys is now functional. Signed-off-by: Philipp Zabel --- arch/arm/plat-mxc/iram_alloc.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/arch/arm/plat-mxc/iram_alloc.c b/arch/arm/plat-mxc/iram_alloc.c index 673deb4..343e96d 100644 --- a/arch/arm/plat-mxc/iram_alloc.c +++ b/arch/arm/plat-mxc/iram_alloc.c @@ -26,25 +26,22 @@ #include #include -static unsigned long iram_phys_base; -static void __iomem *iram_virt_base; static struct gen_pool *iram_pool; -static inline void __iomem *iram_phys_to_virt(unsigned long p) -{ - return iram_virt_base + (p - iram_phys_base); -} - void __iomem *iram_alloc(unsigned int size, unsigned long *dma_addr) { + unsigned long virt; + if (!iram_pool) return NULL; - *dma_addr = gen_pool_alloc(iram_pool, size); + virt = gen_pool_alloc(iram_pool, size); pr_debug("iram alloc - %dB@0x%lX\n", size, *dma_addr); - if (!*dma_addr) + if (!virt) return NULL; - return iram_phys_to_virt(*dma_addr); + + *dma_addr = gen_pool_virt_to_phys(iram_pool, virt); + return (void __iomem *)virt; } EXPORT_SYMBOL(iram_alloc); @@ -59,29 +56,37 @@ EXPORT_SYMBOL(iram_free); static int __devinit iram_probe(struct platform_device *pdev) { + void __iomem *virt_base; struct resource *res; unsigned long size; + int ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) return -EINVAL; - if (iram_phys_base) + if (iram_pool) return -EBUSY; - iram_phys_base = res->start; size = resource_size(res); + virt_base = devm_ioremap(&pdev->dev, res->start, size); + if (!virt_base) + return -ENOMEM; + iram_pool = gen_pool_create(PAGE_SHIFT, -1); if (!iram_pool) return -ENOMEM; - gen_pool_add(iram_pool, res->start, size, -1); - iram_virt_base = ioremap(iram_phys_base, size); - if (!iram_virt_base) - return -EIO; + ret = gen_pool_add_virt(iram_pool, (unsigned long)virt_base, + res->start, size, -1); + if (ret < 0) { + gen_pool_destroy(iram_pool); + iram_pool = NULL; + return ret; + } - pr_debug("i.MX IRAM pool: %ld KB@0x%p\n", size / 1024, iram_virt_base); + pr_debug("i.MX IRAM pool: %ld KB@0x%p\n", size / 1024, virt_base); return 0; }