CMA for arm64
v2 cover CMA for arm64
Hello,
This is v2 of adding CMA for arm64. I dropped integration into swiotlb and put the calls directly into mm/dma-mapping.c
arch/arm64/Kconfig | 1 + arch/arm64/include/asm/dma-contiguous.h | 29 +++++++++++++++++++++++++++++ arch/arm64/mm/dma-mapping.c | 26 +++++++++++++++++++++++--- arch/arm64/mm/init.c | 3 +++ 4 files changed, 56 insertions(+), 3 deletions(-)
Thanks,
Laura
PATCH v2 1/2 arm64: Check for NULL device before getting the coherent_dma_mask
The device passed in to dma_alloc may be NULL. Check for this before trying to get the coherent_dma_mask.
--- arch/arm64/mm/dma-mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm64/mm/dma-mapping.c +1 -1
@@ -33,7 +33,7 @@ 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 (IS_ENABLED(CONFIG_ZONE_DMA32) && + if (dev && 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);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 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 | 24 ++++++++++++++++++++++-- arch/arm64/mm/init.c | 3 +++ 4 files changed, 55 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 ASMARM64_DMA_CONTIGUOUS_H +#define ASMARM64_DMA_CONTIGUOUS_H + +#ifdef __KERNEL__ +#ifdef CONFIG_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 +22 -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>
@@ -36,14 +37,33 @@ static void *arm64_swiotlb_alloc_coherent(struct device *dev, size_t size,if (dev &&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 ; + +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,void *vaddr,dma_addr_t dma_handle,struct dma_attrs *attrs) { -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
PATCH v2 2/2 arm64: Enable CMA
Quoted 9 lines · Laura Abbott
arch/arm64/mm/dma-mapping.c +3
-1@@ -36,14 +37,33 @@ static void *arm64_swiotlb_alloc_coherent(struct device *dev, size_t size,if (dev &&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; +
arch/arm64/mm/dma-mapping.c static void *arm64_swiotlb_alloc_coherent(struct device *dev, size_t size, · line 52
Quoted 10 lines
arch/arm64/mm/dma-mapping.c +9
-0+ page =dma_alloc_from_contiguous (dev, size >>PAGE_SHIFT , +get_order (size)); +if (!page) +return NULL ; + +return page_address (page); + }else { +return swiotlb_alloc_coherent (dev, size, dma_handle, flags); + } }
Whoops I manged to send out the incorrect version here where I never set the dma_handle. Let me resend again...
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation