CMA for arm64
v4 cover CMA for arm64
This adds support for CMA in arm64
v4: Minor typos pointed out by Will. Changed the support for NULL devices to be a WARN on NULL device.
v3: Fix a missed line to actually set the dma_handle correctly
v2: Move the dma contiguous functions from swiotlb to arm64 directly
arch/arm64/Kconfig | 1 + arch/arm64/include/asm/dma-contiguous.h | 29 +++++++++++++++++++++++++ arch/arm64/mm/dma-mapping.c | 35 +++++++++++++++++++++++++++++- arch/arm64/mm/init.c | 3 ++ 4 files changed, 66 insertions(+), 2 deletions(-)
Thanks,
Laura
PATCH v4 1/2 arm64: Warn on NULL device structure for dma APIs
Although parts of the DMA apis may properly check for NULL devices, there may be some places that don't. Rather than fix up all the possible locations, just require a non-NULL device structure to be used for allocating/freeing.
--- arch/arm64/mm/dma-mapping.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm64/mm/dma-mapping.c +10 -0
@@ -33,6 +33,11 @@ static void *arm64_swiotlb_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags, struct dma_attrs *attrs) { + if (dev == NULL) { + WARN(1, "Use an actual device structure for DMA allocation\n"); +return NULL ; + } +if (IS_ENABLED (CONFIG_ZONE_DMA32 ) && dev->coherent_dma_mask <=DMA_BIT_MASK (32 )) flags |=GFP_DMA32 ;
@@ -43,6 +48,11 @@ static void arm64_swiotlb_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs) { + if (dev == NULL) { + WARN(1, "Use an actual device structure for DMA allocation\n"); +return ; + } +swiotlb_free_coherent (dev, size, vaddr, dma_handle); }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v4 2/2 arm64: Enable CMA
In reply to Laura Abbottarm64 bit targets need the features CMA provides. Add the appropriate hooks, header files, and Kconfig to allow this to happen.
--- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/dma-contiguous.h | 29 +++++++++++++++++++++++++++++ arch/arm64/mm/dma-mapping.c | 25 +++++++++++++++++++++++-- arch/arm64/mm/init.c | 3 +++ 4 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/include/asm/dma-contiguous.h
arch/arm64/Kconfig +1 -0
@@ -22,6 +22,7 @@ config ARM64 select HAVE_DEBUG_KMEMLEAK select HAVE_DMA_API_DEBUG select HAVE_DMA_ATTRS + select HAVE_DMA_CONTIGUOUS select HAVE_GENERIC_DMA_COHERENT select HAVE_GENERIC_HARDIRQS select HAVE_HW_BREAKPOINT if PERF_EVENTS
arch/arm64/include/asm/dma-contiguous.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* Copyright (c) 2013, The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#ifndef _ASM_DMA_CONTIGUOUS_H +#define _ASM_DMA_CONTIGUOUS_H + +#ifdef __KERNEL__ +#ifdef CONFIG_DMA_CMA + +#include <linux/types.h> +#include <asm-generic/dma-contiguous.h> + +static inline void +dma_contiguous_early_fixup (phys_addr_t base,unsigned long size) { } + +#endif +#endif + +#endif
arch/arm64/mm/dma-mapping.c +23 -2
@@ -21,6 +21,7 @@#include <linux/export.h> #include <linux/slab.h> #include <linux/dma-mapping.h> +#include <linux/dma-contiguous.h> #include <linux/vmalloc.h> #include <linux/swiotlb.h>
@@ -41,7 +42,19 @@ static void *arm64_swiotlb_alloc_coherent(struct device *dev, size_t size,if (IS_ENABLED (CONFIG_ZONE_DMA32 ) && dev->coherent_dma_mask <=DMA_BIT_MASK (32 )) flags |=GFP_DMA32 ; -return swiotlb_alloc_coherent (dev, size, dma_handle, flags); +if (IS_ENABLED (CONFIG_DMA_CMA )) { +struct page *page; + + page =dma_alloc_from_contiguous (dev, size >>PAGE_SHIFT , +get_order (size)); +if (!page) +return NULL ; + + *dma_handle =phys_to_dma (dev,page_to_phys (page)); +return page_address (page); + }else { +return swiotlb_alloc_coherent (dev, size, dma_handle, flags); + } } static void arm64_swiotlb_free_coherent(struct device *dev, size_t size,
@@ -53,7 +66,15 @@ static void arm64_swiotlb_free_coherent(struct device *dev, size_t size,return ; } -swiotlb_free_coherent (dev, size, vaddr, dma_handle); +if (IS_ENABLED (CONFIG_DMA_CMA )) { +phys_addr_t paddr =dma_to_phys (dev, dma_handle); + +dma_release_from_contiguous (dev, +phys_to_page (paddr), + size >>PAGE_SHIFT ); + }else { +swiotlb_free_coherent (dev, size, vaddr, dma_handle); + } }static struct dma_map_ops arm64_swiotlb_dma_ops = {
arch/arm64/mm/init.c +3 -0
@@ -30,6 +30,7 @@#include <linux/memblock.h> #include <linux/sort.h> #include <linux/of_fdt.h> +#include <linux/dma-contiguous.h> #include <asm/prom.h> #include <asm/sections.h>
@@ -173,6 +174,8 @@ void __init arm64_memblock_init(void)memblock_reserve (base, size); } +dma_contiguous_reserve (0 ); +memblock_allow_resize ();memblock_dump_all (); }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
v4 cover CMA for arm64
In reply to Laura AbbottQuoted 7 lines · Laura Abbott
This adds support for CMA in arm64
v4: Minor typos pointed out by Will. Changed the support for NULL devices to be a WARN on NULL device.
v3: Fix a missed line to actually set the
dma_handlecorrectly
Quoted 8 lines
v2: Move the dma contiguous functions from swiotlb to arm64 directly
arch/arm64/Kconfig | 1 + arch/arm64/include/asm/dma-contiguous.h | 29 +++++++++++++++++++++++++ arch/arm64/mm/dma-mapping.c | 35 +++++++++++++++++++++++++++++- arch/arm64/mm/init.c | 3 ++ 4 files changed, 66 insertions(+), 2 deletions(-)
Any further comments on this or is this going to be queued up somewhere?
Thanks,
Laura
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Catalin Marinas
maintainerv4 cover CMA for arm64
Quoted 10 lines · Laura Abbott
Quoted 9 lines · Laura Abbott
This adds support for CMA in arm64
v4: Minor typos pointed out by Will. Changed the support for NULL devices to be a WARN on NULL device.
v3: Fix a missed line to actually set the
dma_handlecorrectlyv2: Move the dma contiguous functions from swiotlb to arm64 directly
Quoted 7 lines
Quoted 5 lines
arch/arm64/Kconfig | 1 + arch/arm64/include/asm/dma-contiguous.h | 29 +++++++++++++++++++++++++ arch/arm64/mm/dma-mapping.c | 35 +++++++++++++++++++++++++++++- arch/arm64/mm/init.c | 3 ++ 4 files changed, 66 insertions(+), 2 deletions(-)Any further comments on this or is this going to be queued up somewhere?
I'll queue them for the next merging window. I hope to get them into linux-next by the end of the week.
Thanks.
Signature · 1 line
Catalin