cleanup the dma_pgprot handling v2
Subsystems (7)
Hi all,
this series replaces the arch_dma_mmap_pgprot hooks with the simpler pgprot_dmacoherent as used by the arm code already and cleans up various bits around that area.
Changes since v1:
- improve the new arm64 comment
- keep the special DMA_ATTR_WRITE_COMBINE handling for mips and document it
PATCH 1/6 unicore32: remove the unused pgprot_dmacoherent define
--- arch/unicore32/include/asm/pgtable.h | 2 -- 1 file changed, 2 deletions(-)
arch/unicore32/include/asm/pgtable.h +0 -2
@@ -198,8 +198,6 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } __pgprot(pgprot_val(prot) & ~PTE_CACHEABLE)#define pgprot_writecombine (prot) \ __pgprot(pgprot_val(prot) & ~PTE_CACHEABLE) -#define pgprot_dmacoherent (prot) \ - __pgprot(pgprot_val(prot) & ~PTE_CACHEABLE)#define pmd_none (pmd) (!pmd_val(pmd))#define pmd_present (pmd) (pmd_val(pmd) & PMD_PRESENT)
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 2/6 arm-nommu: remove the unused pgprot_dmacoherent define
In reply to Christoph Hellwig--- arch/arm/include/asm/pgtable-nommu.h | 1 - 1 file changed, 1 deletion(-)
arch/arm/include/asm/pgtable-nommu.h +0 -1
@@ -62,7 +62,6 @@ typedef pte_t *pte_addr_t;*/ #define pgprot_noncached (prot) (prot)#define pgprot_writecombine (prot) (prot) -#define pgprot_dmacoherent (prot) (prot)#define pgprot_device (prot) (prot)
Signature · 1 line
2.20.1
PATCH 3/6 dma-mapping: remove arch_dma_mmap_pgprot
In reply to Christoph Hellwigarch_dma_mmap_pgprot is used for two things:
1) to override the "normal" uncached page attributes for mapping memory coherent to devices that can't snoop the CPU caches
2) to provide the special DMA_ATTR_WRITE_COMBINE semantics on older arm systems and some mips platforms
Replace one with the pgprot_dmacoherent macro that is already provided by arm and much simpler to use, and lift the DMA_ATTR_WRITE_COMBINE handling to common code with an explicit arch opt-in.
--- arch/arm/Kconfig | 2 +- arch/arm/mm/dma-mapping.c | 6 ------ arch/arm64/Kconfig | 1 - arch/arm64/include/asm/pgtable.h | 4 ++++ arch/arm64/mm/dma-mapping.c | 6 ------ arch/m68k/Kconfig | 1 - arch/m68k/include/asm/pgtable_mm.h | 3 +++ arch/m68k/kernel/dma.c | 3 +-- arch/mips/Kconfig | 2 +- arch/mips/mm/dma-noncoherent.c | 8 -------- include/linux/dma-noncoherent.h | 13 +++++++++++-- kernel/dma/Kconfig | 12 +++++++++--- kernel/dma/mapping.c | 8 +++++--- 13 files changed, 35 insertions(+), 34 deletions(-)
arch/arm/Kconfig +1 -1
@@ -8,7 +8,7 @@ config ARM select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB - select ARCH_HAS_DMA_MMAP_PGPROT if SWIOTLB + select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_KEEPINITRD
arch/arm/mm/dma-mapping.c +0 -6
@@ -2402,12 +2402,6 @@ long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr,return dma_to_pfn (dev, dma_addr); } -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs) -{ -return __get_dma_pgprot (attrs, prot); -} -void *arch_dma_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle,gfp_t gfp,unsigned long attrs) {
arch/arm64/Kconfig +0 -1
@@ -13,7 +13,6 @@ config ARM64 select ARCH_HAS_DEBUG_VIRTUAL select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_DMA_COHERENT_TO_PFN - select ARCH_HAS_DMA_MMAP_PGPROT select ARCH_HAS_DMA_PREP_COHERENT select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI select ARCH_HAS_ELF_RANDOMIZE
arch/arm64/include/asm/pgtable.h +4 -0
@@ -435,6 +435,10 @@ static inline pmd_t pmd_mkdevmap(pmd_t pmd) __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)#define pgprot_device (prot) \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRE) | PTE_PXN | PTE_UXN) +#define pgprot_dmacoherent (prot) \ + __pgprot_modify(prot, PTE_ATTRINDX_MASK, \ + PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN) +#define __HAVE_PHYS_MEM_ACCESS_PROTstruct file ; extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
arch/arm64/mm/dma-mapping.c +0 -6
@@ -11,12 +11,6 @@#include <asm/cacheflush.h> -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs) -{ -return pgprot_writecombine (prot); -} -void arch_sync_dma_for_device (struct device *dev,phys_addr_t paddr,size_t size,enum dma_data_direction dir) {
arch/m68k/Kconfig +0 -1
@@ -4,7 +4,6 @@ config M68K default y select ARCH_32BIT_OFF_T select ARCH_HAS_BINFMT_FLAT - select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
arch/m68k/include/asm/pgtable_mm.h +3 -0
@@ -169,6 +169,9 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \ : (prot))) +pgprot_t pgprot_dmacoherent (pgprot_t prot); +#define pgprot_dmacoherent (prot) pgprot_dmacoherent(prot) +#endif /* CONFIG_COLDFIRE */ #include <asm-generic/pgtable.h> #endif /* !__ASSEMBLY__ */
arch/m68k/kernel/dma.c +1 -2
@@ -23,8 +23,7 @@ void arch_dma_prep_coherent(struct page *page, size_t size)cache_push (page_to_phys (page), size); } -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs) +pgprot_t pgprot_dmacoherent (pgprot_t prot) {if (CPU_IS_040_OR_060 ) {pgprot_val (prot) &= ~_PAGE_CACHE040;
arch/mips/Kconfig +1 -1
@@ -1119,7 +1119,7 @@ config DMA_PERDEV_COHERENT config DMA_NONCOHERENT bool - select ARCH_HAS_DMA_MMAP_PGPROT + select ARCH_HAS_DMA_WRITE_COMBINE select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_HAS_UNCACHED_SEGMENT select NEED_DMA_MAP_STATE
arch/mips/mm/dma-noncoherent.c +0 -8
@@ -65,14 +65,6 @@ long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr,return page_to_pfn (virt_to_page (cached_kernel_address (cpu_addr))); } -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs) -{ -if (attrs &DMA_ATTR_WRITE_COMBINE ) -return pgprot_writecombine (prot); -return pgprot_noncached (prot); -} -static inline void dma_sync_virt (void *addr,size_t size,enum dma_data_direction dir) {
include/linux/dma-noncoherent.h +11 -2
@@ -3,6 +3,7 @@#define _LINUX_DMA_NONCOHERENT_H 1#include <linux/dma-mapping.h> +#include <asm/pgtable.h> #ifdef CONFIG_ARCH_HAS_DMA_COHERENCE_H #include <asm/dma-coherence.h>
@@ -42,10 +43,18 @@ void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr, unsigned long attrs);long arch_dma_coherent_to_pfn (struct device *dev,void *cpu_addr,dma_addr_t dma_addr); -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs);#ifdef CONFIG_MMU +/* +* Page protection so that devices that can't snoop CPU caches can use the +* memory coherently. We default to pgprot_noncached which is usually used +* for ioremap as a safe bet, but architectures can override this with less +* strict semantics if possible. +*/ +#ifndef pgprot_dmacoherent +#define pgprot_dmacoherent (prot) pgprot_noncached(prot) +#endif +pgprot_t dma_pgprot (struct device *dev,pgprot_t prot,unsigned long attrs);#else static inline pgprot_t dma_pgprot(struct device *dev, pgprot_t prot,
kernel/dma/Kconfig +9 -3
@@ -20,6 +20,15 @@ config ARCH_HAS_DMA_COHERENCE_H config ARCH_HAS_DMA_SET_MASK bool +# +# Select this option if the architecture needs special handling for +# DMA_ATTR_WRITE_COMBINE. Normally the "uncached" mapping should be what +# people thing of when saying write combine, so very few platforms should +# need to enable this. +# +config ARCH_HAS_DMA_WRITE_COMBINE + bool + config DMA_DECLARE_COHERENT bool
@@ -45,9 +54,6 @@ config ARCH_HAS_DMA_PREP_COHERENT config ARCH_HAS_DMA_COHERENT_TO_PFN bool -config ARCH_HAS_DMA_MMAP_PGPROT - bool - config ARCH_HAS_FORCE_DMA_UNENCRYPTED bool
kernel/dma/mapping.c +5 -3
@@ -161,9 +161,11 @@ pgprot_t dma_pgprot(struct device *dev, pgprot_t prot, unsigned long attrs) (IS_ENABLED(CONFIG_DMA_NONCOHERENT_CACHE_SYNC) && (attrs & DMA_ATTR_NON_CONSISTENT)))return prot; -if (IS_ENABLED (CONFIG_ARCH_HAS_DMA_MMAP_PGPROT )) -return arch_dma_mmap_pgprot (dev, prot, attrs); - return pgprot_noncached(prot); +#ifdef CONFIG_ARCH_HAS_DMA_WRITE_COMBINE +if (attrs &DMA_ATTR_WRITE_COMBINE ) +return pgprot_writecombine (prot); +#endif + return pgprot_dmacoherent(prot); }#endif /* CONFIG_MMU */
Signature · 1 line
2.20.1
Re: [PATCH 3/6] dma-mapping: remove arch_dma_mmap_pgprot
Hi Christoph,
Quoted 7 lines · Christoph Hellwig
arch_dma_mmap_pgprotis used for two things:1) to override the "normal" uncached page attributes for mapping memory coherent to devices that can't snoop the CPU caches
2) to provide the specialDMA_ATTR_WRITE_COMBINEsemantics on older arm systems and some mips platforms
Quoted 6 lines
Replace one with the
pgprot_dmacoherentmacro that is already provided by arm and much simpler to use, and lift theDMA_ATTR_WRITE_COMBINEhandling to common code with an explicit arch opt-in.Signed-off-by Christoph Hellwig <[email protected]>
For the MIPS bits:
Thanks,
Paul
Quoted 247 lines
--- arch/arm/Kconfig | 2 +- arch/arm/mm/dma-mapping.c | 6 ------ arch/arm64/Kconfig | 1 - arch/arm64/include/asm/pgtable.h | 4 ++++ arch/arm64/mm/dma-mapping.c | 6 ------ arch/m68k/Kconfig | 1 - arch/m68k/include/asm/pgtable_mm.h | 3 +++ arch/m68k/kernel/dma.c | 3 +-- arch/mips/Kconfig | 2 +- arch/mips/mm/dma-noncoherent.c | 8 -------- include/linux/dma-noncoherent.h | 13 +++++++++++-- kernel/dma/Kconfig | 12 +++++++++--- kernel/dma/mapping.c | 8 +++++--- 13 files changed, 35 insertions(+), 34 deletions(-)arch/arm/Kconfig +1
-1@@ -8,7 +8,7 @@ config ARM select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB - select ARCH_HAS_DMA_MMAP_PGPROT if SWIOTLB + select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_KEEPINITRDarch/arm/mm/dma-mapping.c +0
-6@@ -2402,12 +2402,6 @@ long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr,return dma_to_pfn (dev, dma_addr); } -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs) -{ -return __get_dma_pgprot (attrs, prot); -} -void *arch_dma_alloc (struct device *dev,size_t size,dma_addr_t *dma_handle,gfp_t gfp,unsigned long attrs) {arch/arm64/Kconfig +0
-1@@ -13,7 +13,6 @@ config ARM64 select ARCH_HAS_DEBUG_VIRTUAL select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_DMA_COHERENT_TO_PFN - select ARCH_HAS_DMA_MMAP_PGPROT select ARCH_HAS_DMA_PREP_COHERENT select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI select ARCH_HAS_ELF_RANDOMIZEarch/arm64/include/asm/pgtable.h +4
-0@@ -435,6 +435,10 @@ static inline pmd_t pmd_mkdevmap(pmd_t pmd) __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)#define pgprot_device (prot) \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRE) | PTE_PXN | PTE_UXN) +#define pgprot_dmacoherent (prot) \ + __pgprot_modify(prot, PTE_ATTRINDX_MASK, \ + PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN) +#define __HAVE_PHYS_MEM_ACCESS_PROTstruct file ; extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,arch/arm64/mm/dma-mapping.c +0
-6@@ -11,12 +11,6 @@#include <asm/cacheflush.h> -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs) -{ -return pgprot_writecombine (prot); -} -void arch_sync_dma_for_device (struct device *dev,phys_addr_t paddr,size_t size,enum dma_data_direction dir) {arch/m68k/Kconfig +0
-1@@ -4,7 +4,6 @@ config M68K default y select ARCH_32BIT_OFF_T select ARCH_HAS_BINFMT_FLAT - select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA select ARCH_MIGHT_HAVE_PC_PARPORT if ISAarch/m68k/include/asm/pgtable_mm.h +3
-0@@ -169,6 +169,9 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \ : (prot))) +pgprot_t pgprot_dmacoherent (pgprot_t prot); +#define pgprot_dmacoherent (prot) pgprot_dmacoherent(prot) +#endif /* CONFIG_COLDFIRE */ #include <asm-generic/pgtable.h> #endif /* !__ASSEMBLY__ */ arch/m68k/kernel/dma.c +1
-2@@ -23,8 +23,7 @@ void arch_dma_prep_coherent(struct page *page, size_t size)cache_push (page_to_phys (page), size); } -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs) +pgprot_t pgprot_dmacoherent (pgprot_t prot) {if (CPU_IS_040_OR_060 ) {pgprot_val (prot) &= ~_PAGE_CACHE040;arch/mips/Kconfig +1
-1@@ -1119,7 +1119,7 @@ config DMA_PERDEV_COHERENT config DMA_NONCOHERENT bool - select ARCH_HAS_DMA_MMAP_PGPROT + select ARCH_HAS_DMA_WRITE_COMBINE select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_HAS_UNCACHED_SEGMENT select NEED_DMA_MAP_STATEarch/mips/mm/dma-noncoherent.c +0
-8@@ -65,14 +65,6 @@ long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr,return page_to_pfn (virt_to_page (cached_kernel_address (cpu_addr))); } -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs) -{ -if (attrs &DMA_ATTR_WRITE_COMBINE ) -return pgprot_writecombine (prot); -return pgprot_noncached (prot); -} -static inline void dma_sync_virt (void *addr,size_t size,enum dma_data_direction dir) {include/linux/dma-noncoherent.h +11
-2@@ -3,6 +3,7 @@#define _LINUX_DMA_NONCOHERENT_H 1#include <linux/dma-mapping.h> +#include <asm/pgtable.h> #ifdef CONFIG_ARCH_HAS_DMA_COHERENCE_H #include <asm/dma-coherence.h> @@ -42,10 +43,18 @@ void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr, unsigned long attrs);long arch_dma_coherent_to_pfn (struct device *dev,void *cpu_addr,dma_addr_t dma_addr); -pgprot_t arch_dma_mmap_pgprot (struct device *dev,pgprot_t prot, -unsigned long attrs);#ifdef CONFIG_MMU +/* +* Page protection so that devices that can't snoop CPU caches can use the +* memory coherently. We default to pgprot_noncached which is usually used +* for ioremap as a safe bet, but architectures can override this with less +* strict semantics if possible. +*/ +#ifndef pgprot_dmacoherent +#define pgprot_dmacoherent (prot) pgprot_noncached(prot) +#endif +pgprot_t dma_pgprot (struct device *dev,pgprot_t prot,unsigned long attrs);#else static inline pgprot_t dma_pgprot(struct device *dev, pgprot_t prot,kernel/dma/Kconfig +9
-3@@ -20,6 +20,15 @@ config ARCH_HAS_DMA_COHERENCE_H config ARCH_HAS_DMA_SET_MASK bool +# +# Select this option if the architecture needs special handling for +# DMA_ATTR_WRITE_COMBINE. Normally the "uncached" mapping should be what +# people thing of when saying write combine, so very few platforms should +# need to enable this. +# +config ARCH_HAS_DMA_WRITE_COMBINE + bool + config DMA_DECLARE_COHERENT bool@@ -45,9 +54,6 @@ config ARCH_HAS_DMA_PREP_COHERENT config ARCH_HAS_DMA_COHERENT_TO_PFN bool -config ARCH_HAS_DMA_MMAP_PGPROT - bool - config ARCH_HAS_FORCE_DMA_UNENCRYPTED boolkernel/dma/mapping.c +5
-3@@ -161,9 +161,11 @@ pgprot_t dma_pgprot(struct device *dev, pgprot_t prot, unsigned long attrs) (IS_ENABLED(CONFIG_DMA_NONCOHERENT_CACHE_SYNC) && (attrs & DMA_ATTR_NON_CONSISTENT)))return prot; -if (IS_ENABLED (CONFIG_ARCH_HAS_DMA_MMAP_PGPROT )) -return arch_dma_mmap_pgprot (dev, prot, attrs); - return pgprot_noncached(prot); +#ifdef CONFIG_ARCH_HAS_DMA_WRITE_COMBINE +if (attrs &DMA_ATTR_WRITE_COMBINE ) +return pgprot_writecombine (prot); +#endif + return pgprot_dmacoherent(prot); }#endif /* CONFIG_MMU */ Signature · 1 line
2.20.1
PATCH 4/6 dma-mapping: make dma_atomic_pool_init self-contained
In reply to Christoph HellwigThe memory allocated for the atomic pool needs to have the same mapping attributes that we use for remapping, so use pgprot_dmacoherent instead of open coding it. Also deduct a suitable zone to allocate the memory from based on the presence of the DMA zones.
--- arch/arc/mm/dma.c | 6 ------ arch/arm64/mm/dma-mapping.c | 6 ------ arch/csky/mm/dma-mapping.c | 6 ------ arch/nds32/kernel/dma.c | 6 ------ include/linux/dma-mapping.h | 1 - kernel/dma/remap.c | 17 ++++++++++++++--- 6 files changed, 14 insertions(+), 28 deletions(-)
arch/arc/mm/dma.c +0 -6
@@ -104,9 +104,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,dev_info (dev,"use %sncoherent DMA ops\n" , dev->dma_coherent ?"" :"non" ); } - -static int __init atomic_pool_init (void ) -{ -return dma_atomic_pool_init (GFP_KERNEL ,pgprot_noncached (PAGE_KERNEL )); -} -postcore_initcall (atomic_pool_init);
arch/arm64/mm/dma-mapping.c +0 -6
@@ -28,12 +28,6 @@ void arch_dma_prep_coherent(struct page *page, size_t size)__dma_flush_area (page_address (page), size); } -static int __init arm64_dma_init (void ) -{ -return dma_atomic_pool_init (GFP_DMA32 ,__pgprot (PROT_NORMAL_NC )); -} -arch_initcall (arm64_dma_init); -#ifdef CONFIG_IOMMU_DMA void arch_teardown_dma_ops (struct device *dev) {
arch/csky/mm/dma-mapping.c +0 -6
@@ -14,12 +14,6 @@#include <linux/version.h> #include <asm/cache.h> -static int __init atomic_pool_init (void ) -{ -return dma_atomic_pool_init (GFP_KERNEL ,pgprot_noncached (PAGE_KERNEL )); -} -postcore_initcall (atomic_pool_init); -void arch_dma_prep_coherent (struct page *page,size_t size) {if (PageHighMem (page)) {
arch/nds32/kernel/dma.c +0 -6
@@ -80,9 +80,3 @@ void arch_dma_prep_coherent(struct page *page, size_t size) {cache_op (page_to_phys (page), size, cpu_dma_wbinval_range); } - -static int __init atomic_pool_init (void ) -{ -return dma_atomic_pool_init (GFP_KERNEL ,pgprot_noncached (PAGE_KERNEL )); -} -postcore_initcall (atomic_pool_init);
include/linux/dma-mapping.h +0 -1
@@ -624,7 +624,6 @@ void *dma_common_pages_remap(struct page **pages, size_t size, const void *caller);void dma_common_free_remap (void *cpu_addr,size_t size,unsigned long vm_flags); -int __init dma_atomic_pool_init (gfp_t gfp,pgprot_t prot);bool dma_in_atomic_pool (void *start,size_t size);void *dma_alloc_from_pool (size_t size,struct page **ret_page,gfp_t flags);bool dma_free_from_pool (void *start,size_t size);
kernel/dma/remap.c +14 -3
@@ -105,7 +105,16 @@ static int __init early_coherent_pool(char *p) }early_param ("coherent_pool" , early_coherent_pool); -int __init dma_atomic_pool_init (gfp_t gfp,pgprot_t prot) +static gfp_t dma_atomic_pool_gfp (void ) +{ +if (IS_ENABLED (CONFIG_ZONE_DMA )) +return GFP_DMA ; +if (IS_ENABLED (CONFIG_ZONE_DMA32 )) +return GFP_DMA32 ; +return GFP_KERNEL ; +} + +static int __init dma_atomic_pool_init (void ) {unsigned int pool_size_order =get_order (atomic_pool_size);unsigned long nr_pages = atomic_pool_size >>PAGE_SHIFT ;
@@ -117,7 +126,7 @@ int __init dma_atomic_pool_init(gfp_t gfp, pgprot_t prot) page =dma_alloc_from_contiguous (NULL , nr_pages, pool_size_order, false); else - page =alloc_pages (gfp, pool_size_order); + page =alloc_pages (dma_atomic_pool_gfp (), pool_size_order);if (!page) goto out;
@@ -128,7 +137,8 @@ int __init dma_atomic_pool_init(gfp_t gfp, pgprot_t prot) goto free_page; addr =dma_common_contiguous_remap (page, atomic_pool_size,VM_USERMAP , - prot,__builtin_return_address (0 )); +pgprot_dmacoherent (PAGE_KERNEL ), +__builtin_return_address (0 ));if (!addr) goto destroy_genpool;
@@ -155,6 +165,7 @@ int __init dma_atomic_pool_init(gfp_t gfp, pgprot_t prot) atomic_pool_size / 1024);return -ENOMEM ; } +postcore_initcall (dma_atomic_pool_init);bool dma_in_atomic_pool (void *start,size_t size) {
Signature · 1 line
2.20.1
PATCH 5/6 arm64: document the choice of page attributes for pgprot_dmacoherent
In reply to Christoph HellwigBased on an email from Will Deacon.
--- arch/arm64/include/asm/pgtable.h | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/include/asm/pgtable.h +8 -0
@@ -435,6 +435,14 @@ static inline pmd_t pmd_mkdevmap(pmd_t pmd) __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)#define pgprot_device (prot) \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRE) | PTE_PXN | PTE_UXN) +/* +* DMA allocations for non-coherent devices use what the Arm architecture calls +* "Normal non-cacheable" memory, which permits speculation, unaligned accesses +* and merging of writes. This is different from "Device-nGnR[nE]" memory which +* is intended for MMIO and thus forbids speculation, preserves access size, +* requires strict alignment and can also force write responses to come from the +* endpoint. +*/ #define pgprot_dmacoherent (prot) \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, \ PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)
Signature · 1 line
2.20.1
PATCH 6/6 MIPS: document mixing "slightly different CCAs"
In reply to Christoph HellwigBased on an email from Paul Burton, quoting section 4.8 "Cacheability and Coherency Attributes and Access Types" of "MIPS Architecture Volume 1:
Introduction to the MIPS32 Architecture" (MD00080, revision 6.01).
--- arch/mips/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+)
arch/mips/Kconfig +7 -0
@@ -1119,6 +1119,13 @@ config DMA_PERDEV_COHERENT config DMA_NONCOHERENT bool + # + # MIPS allows mixing "slightly different" Cacheability and Coherency + # Attribute bits. It is believed that the uncached access through + # KSEG1 and the implementation specific "uncached accelerated" used + # by pgprot_writcombine can be mixed, and the latter sometimes provides + # significant advantages. + # select ARCH_HAS_DMA_WRITE_COMBINE select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_HAS_UNCACHED_SEGMENT
Signature · 1 line
2.20.1
Re: [PATCH 6/6] MIPS: document mixing "slightly different CCAs"
Hi Christoph,
Quoted 5 lines · Christoph Hellwig
Based on an email from Paul Burton, quoting section 4.8 "Cacheability and Coherency Attributes and Access Types" of "MIPS Architecture Volume 1:
Introduction to the MIPS32 Architecture" (MD00080, revision 6.01).Signed-off-by Christoph Hellwig <[email protected]>
Thanks,
Paul
Quoted 25 lines
--- arch/mips/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+)arch/mips/Kconfig +7
-0@@ -1119,6 +1119,13 @@ config DMA_PERDEV_COHERENT config DMA_NONCOHERENT bool + # + # MIPS allows mixing "slightly different" Cacheability and Coherency + # Attribute bits. It is believed that the uncached access through + # KSEG1 and the implementation specific "uncached accelerated" used + # by pgprot_writcombine can be mixed, and the latter sometimes provides + # significant advantages. + # select ARCH_HAS_DMA_WRITE_COMBINE select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_HAS_UNCACHED_SEGMENTSignature · 1 line
2.20.1
I've pulled this into the dma-mapping for-next tree now.