From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754528AbcGZHgJ (ORCPT ); Tue, 26 Jul 2016 03:36:09 -0400 Received: from exvmail3.skhynix.com ([166.125.252.90]:47397 "EHLO invmail3.skhynix.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754192AbcGZHgF (ORCPT ); Tue, 26 Jul 2016 03:36:05 -0400 X-AuditID: a67dfc59-f790b6d000004b07-16-579712e054a3 From: Kwangwoo Lee To: Russell King - ARM Linux , Catalin Marinas , Will Deacon , Mark Rutland , linux-arm-kernel@lists.infradead.org Cc: Kwangwoo Lee , Woosuk Chung , Hyunchul Kim , linux-kernel@vger.kernel.org Subject: [PATCH v2] arm64: mm: convert __dma_* routines to use start, size Date: Tue, 26 Jul 2016 16:34:56 +0900 Message-Id: <1469518496-8177-1-git-send-email-kwangwoo.lee@sk.com> X-Mailer: git-send-email 2.5.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJJMWRmVeSWpSXmKPExsXCNUdUSfeh0PRwgztXmSzeL+thtNj0+Bqr xeVdc9gsDk3dy2ix9PpFJouXH0+wOLB5rJm3htHj8rWLzB6bl9R7fN4kF8ASxWWTkpqTWZZa pG+XwJWxap5kwSvDiotvTBsYZ2p0MXJySAiYSGxvOc0IYYtJXLi3ng0mPu/UERYQm01AQ+LU hvtANheHiMBVRokly46zgzjMApMZJeZ+ucoEUiUs4CWx9OE5MJtFQFViS9N+sG5eASeJ/j1N QBs4gKbKSSy4kA6x4CWrRPPyEghbUuLgihssExh5FjAyrGIUycwry03MzDHWK87OqMzLrNBL zs/dxAgMkGW1fyJ3MPa06h9iFOBgVOLhneA6LVyINbGsuDL3EKMEB7OSCO8c3unhQrwpiZVV qUX58UWlOanFhxilOViUxHm//e8LFxJITyxJzU5NLUgtgskycXBKNTDe4RC7vf5dYJvjxtP3 0teZtRudWLv4qHq7nr3/vAWnt19bsUV00b+/D987hq59bxQvVuk5zVd1bfJB+4XZqg6TneX9 t2Tzhv3h99JOi3e9fFbq2rcPVb1+9+pKt0u7Xypy8ma/drlsWXzvDfmj5ht6Zf6bqa7meP4s Ze1EuWPKMT+k/mZzBrIpsRRnJBpqMRcVJwIAA+TYeQwCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBJMWRmVeSWpSXmKPExsXCFdOSpvtAaHq4wZ1Pphbvl/UwWkxd1cJk Me/zKXaLTY+vsVpc3jWHzeLQ1L2MFkuvX2SyePnxBIvFvOVrWRw4PdbMW8PocfnaRWaPzUvq Pb7d9vD4vEkugDWKyyYlNSezLLVI3y6BK2PVPMmCV4YVF9+YNjDO1Ohi5OSQEDCRmHfqCAuE LSZx4d56NhCbTUBD4tSG+0BxLg4RgauMEkuWHWcHcZgFJjNKzP1ylQmkSljAS2Lpw3NgNouA qsSWpv1gk3gFnCT69zQxdjFyAE2Vk1hwIX0CI+cCRoZVjCKZeWW5iZk5ZnrF2RmVeZkVesn5 uZsYgf5fVvtn0g7Gb5fdDzEKcDAq8fDO8JkWLsSaWFZcmXuIUYKDWUmEVxQYPEK8KYmVValF +fFFpTmpxYcYpTlYlMR5j39UChcSSE8sSc1OTS1ILYLJMnFwSjUwLr2+P0/tzExJr9tTF0e9 9O74ZfnKru31lMTJ+9/tXDqD/4zohk2xZx2O/eyuvfF938zbGVE1b6y72EzZriSnJy3hr9Ap WjW1w/vsp5UV/x2mTTtlcltXSj0jt0/4ZM/WiomT5xaU/nu7y+xEuJ7P/oM5sYVlO58rn996 duMmk/Vb1vIV31FPfqvEUpyRaKjFXFScCACjkf5k+wEAAA== X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org v2) change __dma_* routine names using the terminoloy guidance: area: takes a start and size range: takes a start and end use __dma_flush_area() instead of __dma_flush_range() in dma-mapping.c v1) __dma_* routines have been converted to use start and size instread of start and end addresses. The patch was origianlly for adding __clean_dcache_area_poc() which will be used in pmem driver to clean dcache to the PoC(Point of Coherency) in arch_wb_cache_pmem(). The functionality of __clean_dcache_area_poc() was equivalent to __dma_clean_range(). The difference was __dma_clean_range() uses the end address, but __clean_dcache_area_poc() uses the size to clean. Thus, __clean_dcache_area_poc() has been revised with a fall through function of __dma_clean_range() after the change that __dma_* routines use start and size instead of using start and end. Signed-off-by: Kwangwoo Lee --- arch/arm64/include/asm/cacheflush.h | 3 +- arch/arm64/mm/cache.S | 71 +++++++++++++++++++------------------ arch/arm64/mm/dma-mapping.c | 6 ++-- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h index c64268d..2e5fb97 100644 --- a/arch/arm64/include/asm/cacheflush.h +++ b/arch/arm64/include/asm/cacheflush.h @@ -68,6 +68,7 @@ extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end); extern void flush_icache_range(unsigned long start, unsigned long end); extern void __flush_dcache_area(void *addr, size_t len); +extern void __clean_dcache_area_poc(void *addr, size_t len); extern void __clean_dcache_area_pou(void *addr, size_t len); extern long __flush_cache_user_range(unsigned long start, unsigned long end); @@ -85,7 +86,7 @@ static inline void flush_cache_page(struct vm_area_struct *vma, */ extern void __dma_map_area(const void *, size_t, int); extern void __dma_unmap_area(const void *, size_t, int); -extern void __dma_flush_range(const void *, const void *); +extern void __dma_flush_area(const void *, size_t); /* * Copy user data from/to a page which is mapped into a different diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 50ff9ba..4415c1b 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -110,14 +110,16 @@ ENDPROC(__clean_dcache_area_pou) * - end - end address of region */ ENTRY(__inval_cache_range) + sub x1, x1, x0 /* FALLTHROUGH */ /* - * __dma_inv_range(start, end) + * __dma_inv_area(start, size) * - start - virtual start address of region - * - end - virtual end address of region + * - size - size in question */ -__dma_inv_range: +__dma_inv_area: + add x1, x1, x0 dcache_line_size x2, x3 sub x3, x2, #1 tst x1, x3 // end cache line aligned? @@ -136,46 +138,47 @@ __dma_inv_range: dsb sy ret ENDPIPROC(__inval_cache_range) -ENDPROC(__dma_inv_range) +ENDPROC(__dma_inv_area) + +/* + * __clean_dcache_area_poc(kaddr, size) + * + * Ensure that any D-cache lines for the interval [kaddr, kaddr+size) + * are cleaned to the PoC. + * + * - kaddr - kernel address + * - size - size in question + */ +ENTRY(__clean_dcache_area_poc) + /* FALLTHROUGH */ /* - * __dma_clean_range(start, end) + * __dma_clean_area(start, size) * - start - virtual start address of region - * - end - virtual end address of region + * - size - size in question */ -__dma_clean_range: - dcache_line_size x2, x3 - sub x3, x2, #1 - bic x0, x0, x3 -1: +__dma_clean_area: alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE - dc cvac, x0 + dcache_by_line_op cvac, sy, x0, x1, x2, x3 alternative_else - dc civac, x0 + dcache_by_line_op civac, sy, x0, x1, x2, x3 alternative_endif - add x0, x0, x2 - cmp x0, x1 - b.lo 1b - dsb sy ret -ENDPROC(__dma_clean_range) +ENDPIPROC(__clean_dcache_area_poc) +ENDPROC(__dma_clean_area) /* - * __dma_flush_range(start, end) + * __dma_flush_area(start, size) + * + * clean & invalidate D / U line + * * - start - virtual start address of region - * - end - virtual end address of region + * - size - size in question */ -ENTRY(__dma_flush_range) - dcache_line_size x2, x3 - sub x3, x2, #1 - bic x0, x0, x3 -1: dc civac, x0 // clean & invalidate D / U line - add x0, x0, x2 - cmp x0, x1 - b.lo 1b - dsb sy +ENTRY(__dma_flush_area) + dcache_by_line_op civac, sy, x0, x1, x2, x3 ret -ENDPIPROC(__dma_flush_range) +ENDPIPROC(__dma_flush_area) /* * __dma_map_area(start, size, dir) @@ -184,10 +187,9 @@ ENDPIPROC(__dma_flush_range) * - dir - DMA direction */ ENTRY(__dma_map_area) - add x1, x1, x0 cmp w2, #DMA_FROM_DEVICE - b.eq __dma_inv_range - b __dma_clean_range + b.eq __dma_inv_area + b __dma_clean_area ENDPIPROC(__dma_map_area) /* @@ -197,8 +199,7 @@ ENDPIPROC(__dma_map_area) * - dir - DMA direction */ ENTRY(__dma_unmap_area) - add x1, x1, x0 cmp w2, #DMA_TO_DEVICE - b.ne __dma_inv_range + b.ne __dma_inv_area ret ENDPIPROC(__dma_unmap_area) diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index c566ec8..e0b0712 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -165,7 +165,7 @@ static void *__dma_alloc(struct device *dev, size_t size, return ptr; /* remove any dirty cache lines on the kernel alias */ - __dma_flush_range(ptr, ptr + size); + __dma_flush_area(ptr, size); /* create a coherent mapping */ page = virt_to_page(ptr); @@ -377,7 +377,7 @@ static int __init atomic_pool_init(void) void *page_addr = page_address(page); memset(page_addr, 0, atomic_pool_size); - __dma_flush_range(page_addr, page_addr + atomic_pool_size); + __dma_flush_area(page_addr, atomic_pool_size); atomic_pool = gen_pool_create(PAGE_SHIFT, -1); if (!atomic_pool) @@ -535,7 +535,7 @@ fs_initcall(dma_debug_do_init); /* Thankfully, all cache ops are by VA so we can ignore phys here */ static void flush_page(struct device *dev, const void *virt, phys_addr_t phys) { - __dma_flush_range(virt, virt + PAGE_SIZE); + __dma_flush_area(virt, PAGE_SIZE); } static void *__iommu_alloc_attrs(struct device *dev, size_t size, -- 2.5.0