From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVqt6-0006DU-Hk for barebox@lists.infradead.org; Fri, 26 Apr 2013 22:13:05 +0000 Date: Sat, 27 Apr 2013 00:13:02 +0200 From: Sascha Hauer Message-ID: <20130426221302.GD32299@pengutronix.de> References: <1366984338-6649-1-git-send-email-j.weitzel@phytec.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1366984338-6649-1-git-send-email-j.weitzel@phytec.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] ARM: mmu: Use PAGE_ALIGN in dma_free_coherent To: Jan Weitzel Cc: barebox@lists.infradead.org On Fri, Apr 26, 2013 at 03:52:18PM +0200, Jan Weitzel wrote: > We PAGE_ALIGN the size in dma_alloc_coherent so do it also when free the memory. > Use PAGE_SIZE instead of magic numbers. > > Signed-off-by: Jan Weitzel Applied, thanks Sascha > --- > arch/arm/cpu/mmu.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c > index 34fe5c3..e3ea3b6 100644 > --- a/arch/arm/cpu/mmu.c > +++ b/arch/arm/cpu/mmu.c > @@ -189,7 +189,7 @@ static int arm_mmu_remap_sdram(struct memory_bank *bank) > ptes, ttb_start, ttb_end); > > for (i = 0; i < num_ptes; i++) { > - ptes[i] = (phys + i * 4096) | PTE_TYPE_SMALL | > + ptes[i] = (phys + i * PAGE_SIZE) | PTE_TYPE_SMALL | > pte_flags_cached; > } > > @@ -300,7 +300,7 @@ static int mmu_init(void) > asm volatile ("mcr p15,0,%0,c3,c0,0" : : "r"(i) /*:*/); > > /* create a flat mapping using 1MiB sections */ > - create_sections(0, 0, 4096, PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | > + create_sections(0, 0, PAGE_SIZE, PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | > PMD_TYPE_SECT); > > vectors_init(); > @@ -332,7 +332,7 @@ void *dma_alloc_coherent(size_t size) > void *ret; > > size = PAGE_ALIGN(size); > - ret = xmemalign(4096, size); > + ret = xmemalign(PAGE_SIZE, size); > > dma_inv_range((unsigned long)ret, (unsigned long)ret + size); > > @@ -353,6 +353,7 @@ void *phys_to_virt(unsigned long phys) > > void dma_free_coherent(void *mem, size_t size) > { > + size = PAGE_ALIGN(size); > remap_range(mem, size, pte_flags_cached); > > free(mem); > -- > 1.7.0.4 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- 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 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox