Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fcd2b30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 dma mapping updates from Ingo Molnar:
 "This tree, by Christoph Hellwig, switches over the x86 architecture to
  the generic dma-direct and swiotlb code, and also unifies more of the
  dma-direct code between architectures. The now unused x86-only
  primitives are removed"

* 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  dma-mapping: Don't clear GFP_ZERO in dma_alloc_attrs
  swiotlb: Make swiotlb_{alloc,free}_buffer depend on CONFIG_DMA_DIRECT_OPS
  dma/swiotlb: Remove swiotlb_{alloc,free}_coherent()
  dma/direct: Handle force decryption for DMA coherent buffers in common code
  dma/direct: Handle the memory encryption bit in common code
  dma/swiotlb: Remove swiotlb_set_mem_attributes()
  set_memory.h: Provide set_memory_{en,de}crypted() stubs
  x86/dma: Remove dma_alloc_coherent_gfp_flags()
  iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()
  iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()
  x86/dma/amd_gart: Use dma_direct_{alloc,free}()
  x86/dma/amd_gart: Look at dev->coherent_dma_mask instead of GFP_DMA
  x86/dma: Use generic swiotlb_ops
  x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y)
  x86/dma: Remove dma_alloc_coherent_mask()
parents ce6eba3d e89f5b37

arch/arm/include/asm/dma-direct.h

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 
#ifndef ASM_ARM_DMA_DIRECT_H

#define ASM_ARM_DMA_DIRECT_H 1



static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)

static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)

{

	unsigned int offset = paddr & ~PAGE_MASK;

	return pfn_to_dma(dev, __phys_to_pfn(paddr)) + offset;

}



static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr)

static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr)

{

	unsigned int offset = dev_addr & ~PAGE_MASK;

	return __pfn_to_phys(dma_to_pfn(dev, dev_addr)) + offset;

arch/mips/cavium-octeon/dma-octeon.c

+5 −5
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * IP32 changes by Ilya.

 * Copyright (C) 2010 Cavium Networks, Inc.

 */

#include <linux/dma-mapping.h>

#include <linux/dma-direct.h>

#include <linux/scatterlist.h>

#include <linux/bootmem.h>

#include <linux/export.h>
@@ -182,7 +182,7 @@ struct octeon_dma_map_ops { 
	phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);

};



dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)

dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)

{

	struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev),

						      struct octeon_dma_map_ops,
@@ -190,9 +190,9 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) 


	return ops->phys_to_dma(dev, paddr);

}

EXPORT_SYMBOL(phys_to_dma);

EXPORT_SYMBOL(__phys_to_dma);



phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)

phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr)

{

	struct octeon_dma_map_ops *ops = container_of(get_dma_ops(dev),

						      struct octeon_dma_map_ops,
@@ -200,7 +200,7 @@ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr) 


	return ops->dma_to_phys(dev, daddr);

}

EXPORT_SYMBOL(dma_to_phys);

EXPORT_SYMBOL(__dma_to_phys);



static struct octeon_dma_map_ops octeon_linear_dma_map_ops = {

	.dma_map_ops = {

arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) 
	return addr + size - 1 <= *dev->dma_mask;

}



dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);

phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);

dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr);

phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr);



struct dma_map_ops;

extern const struct dma_map_ops *octeon_pci_dma_map_ops;

arch/mips/include/asm/mach-loongson64/dma-coherence.h

+5 −5
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) 
	return addr + size - 1 <= *dev->dma_mask;

}



extern dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);

extern phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);

extern dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr);

extern phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr);

static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr,

					  size_t size)

{

#ifdef CONFIG_CPU_LOONGSON3

	return phys_to_dma(dev, virt_to_phys(addr));

	return __phys_to_dma(dev, virt_to_phys(addr));

#else

	return virt_to_phys(addr) | 0x80000000;

#endif
@@ -41,7 +41,7 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, 
					       struct page *page)

{

#ifdef CONFIG_CPU_LOONGSON3

	return phys_to_dma(dev, page_to_phys(page));

	return __phys_to_dma(dev, page_to_phys(page));

#else

	return page_to_phys(page) | 0x80000000;

#endif
@@ -51,7 +51,7 @@ static inline unsigned long plat_dma_addr_to_phys(struct device *dev, 
	dma_addr_t dma_addr)

{

#if defined(CONFIG_CPU_LOONGSON3) && defined(CONFIG_64BIT)

	return dma_to_phys(dev, dma_addr);

	return __dma_to_phys(dev, dma_addr);

#elif defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)

	return (dma_addr > 0x8fffffff) ? dma_addr : (dma_addr & 0x0fffffff);

#else

arch/mips/loongson64/common/dma-swiotlb.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int loongson_dma_supported(struct device *dev, u64 mask) 
	return swiotlb_dma_supported(dev, mask);

}



dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)

dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)

{

	long nid;

#ifdef CONFIG_PHYS48_TO_HT40
@@ -75,7 +75,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) 
	return paddr;

}



phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)

phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr)

{

	long nid;

#ifdef CONFIG_PHYS48_TO_HT40