core/iommu for v2.6.32
Subsystems (6)
Linus,
Please pull the core-iommu-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-iommu-for-linus
Highlights:
- SPARC dma-debug support
- AMD IOMMU updates / improved hw support
- cleanups
Thanks,
Ingo
------------------>
Arnd Bergmann (1):
dma-ops: Remove flush_write_buffers() in dma-mapping-common.h
Casey Dahlin (1):
lib/swiotlb.c: Fix strange panic message selection logic when swiotlb fills up
FUJITA Tomonori (22):
swiotlb: remove unused swiotlb_alloc_boot()
swiotlb: remove unused swiotlb_alloc()
swiotlb: remove swiotlb_arch_range_needs_mapping
swiotlb: remove unnecessary swiotlb_bus_to_virt
x86: add dma_capable() to replace is_buffer_dma_capable()
x86: replace is_buffer_dma_capable() with dma_capable
ia64: add dma_capable() to replace is_buffer_dma_capable()
powerpc: add dma_capable() to replace is_buffer_dma_capable()
swiotlb: use dma_capable()
powerpc: remove unncesary swiotlb_arch_address_needs_mapping
remove is_buffer_dma_capable()
x86, IA64, powerpc: add phys_to_dma() and dma_to_phys()
swiotlb: use phys_to_dma and dma_to_phys
powerpc: remove unused swiotlb_phys_to_bus() and swiotlb_bus_to_phys()
x86: remove unused swiotlb_phys_to_bus() and swiotlb_bus_to_phys()
IA64: Remove NULL flush_write_buffers
sparc: Use dma_map_ops struct
sparc: Use asm-generic/dma-mapping-common.h
sparc: Remove no-op dma_4v_sync_single_for_cpu and dma_4v_sync_sg_for_cpu
sparc: Replace sbus_map_single and sbus_unmap_single with sbus_map_page and sbus_unmap_page
sparc: Use asm-generic/pci-dma-compat
sparc: Add CONFIG_DMA_API_DEBUG support
Joerg Roedel (34):
x86/amd-iommu: Dump fault entry on DTE error x86/amd-iommu: Dump illegal command on ILLEGAL_COMMAND_ERROR x86/amd-iommu: Introduce function for iommu-local domain flush x86/amd-iommu: Remove some merge helper code x86/amd-iommu: replace "AMD IOMMU" by "AMD-Vi" x86/amd-iommu: Remove redundant 'IOMMU' string x86/amd-iommu: fix broken check in amd_iommu_flush_all_devices x86/amd-iommu: Add function to flush all DTEs on one IOMMU x86/amd-iommu: Add reset function for command buffers x86/amd-iommu: Reset command buffer on ILLEGAL_COMMAND_ERROR x86/amd-iommu: Panic if IOMMU command buffer reset fails x86/amd-iommu: Reset command buffer if wait loop fails x86/amd-iommu: Make fetch_pte aware of dynamic mapping levels x86/amd-iommu: Use fetch_pte in iommu_unmap_page x86/amd-iommu: Use fetch_pte in amd_iommu_iova_to_phys x86/amd-iommu: Add a gneric version of amd_iommu_flush_all_devices x86/amd-iommu: Introduce set_dte_entry function x86/amd-iommu: Flush domains if address space size was increased x86/amd-iommu: Introduce increase_address_space function x86/amd-iommu: Change alloc_pte to support 64 bit address space x86/amd-iommu: Remove last usages of IOMMU_PTE_L0_INDEX x86/amd-iommu: Remove bus_addr check in iommu_map_page x86/amd-iommu: Use 2-level page tables for dma_ops domains x86/amd-iommu: Remove old page table handling macros x86/amd-iommu: Support higher level PTEs in iommu_page_unmap x86/amd-iommu: Change iommu_map_page to support multiple page sizes x86/dma: Mark iommu_pass_through as __read_mostly x86/amd-iommu: Add core functions for pd allocation/freeing x86/amd-iommu: Add passthrough mode initialization functions x86/amd-iommu: Fix device table write order x86/amd-iommu: Align locking between attach_device and detach_device x86/amd-iommu: Make sure a device is assigned in passthrough mode x86/amd-iommu: Don't detach device from pt domain on driver unbind x86/amd-iommu: Initialize passthrough mode when requested
Pavel Vasilyev (1):
x86/gart: Do not select AGP for GART_IOMMU
arch/ia64/include/asm/dma-mapping.h | 19 ++- arch/powerpc/include/asm/dma-mapping.h | 23 ++ arch/powerpc/kernel/dma-swiotlb.c | 48 +--- arch/sparc/Kconfig | 2 + arch/sparc/include/asm/dma-mapping.h | 145 ++-------- arch/sparc/include/asm/pci.h | 3 + arch/sparc/include/asm/pci_32.h | 105 ------- arch/sparc/include/asm/pci_64.h | 88 ------ arch/sparc/kernel/Makefile | 2 +- arch/sparc/kernel/dma.c | 175 +----------- arch/sparc/kernel/dma.h | 14 - arch/sparc/kernel/iommu.c | 20 +- arch/sparc/kernel/ioport.c | 190 +++++++----- arch/sparc/kernel/pci.c | 2 +- arch/sparc/kernel/pci_sun4v.c | 30 +-- arch/x86/Kconfig | 1 - arch/x86/include/asm/amd_iommu.h | 1 + arch/x86/include/asm/amd_iommu_types.h | 50 ++-- arch/x86/include/asm/dma-mapping.h | 18 ++ arch/x86/kernel/amd_iommu.c | 489 ++++++++++++++++++++++-------- arch/x86/kernel/amd_iommu_init.c | 42 ++- arch/x86/kernel/pci-dma.c | 11 +- arch/x86/kernel/pci-gart_64.c | 5 +- arch/x86/kernel/pci-nommu.c | 29 ++- arch/x86/kernel/pci-swiotlb.c | 25 -- include/asm-generic/dma-mapping-common.h | 6 - include/linux/dma-mapping.h | 5 - include/linux/swiotlb.h | 11 - lib/swiotlb.c | 124 +++----- 29 files changed, 720 insertions(+), 963 deletions(-) delete mode 100644 arch/sparc/kernel/dma.h
arch/ia64/include/asm/dma-mapping.h +18 -1
@@ -44,7 +44,6 @@ static inline void dma_free_coherent(struct device *dev, size_t size,#define dma_free_noncoherent (d, s, v, h) dma_free_coherent(d, s, v, h)#define get_dma_ops (dev) platform_dma_get_ops(dev) -#define flush_write_buffers ()#include <asm-generic/dma-mapping-common.h>
@@ -69,6 +68,24 @@ dma_set_mask (struct device *dev, u64 mask)return 0 ; } +static inline bool dma_capable (struct device *dev,dma_addr_t addr,size_t size) +{ +if (!dev->dma_mask) +return 0 ; + +return addr + size <= *dev->dma_mask; +} + +static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +{ +return paddr; +} + +static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +{ +return daddr; +} +extern int dma_get_cache_alignment (void ); static inline void
arch/powerpc/include/asm/dma-mapping.h +23 -0
@@ -424,6 +424,29 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)#endif } +static inline bool dma_capable (struct device *dev,dma_addr_t addr,size_t size) +{ +struct dma_mapping_ops *ops =get_dma_ops (dev); + +if (ops->addr_needs_map && ops->addr_needs_map (dev, addr, size)) +return 0 ; + +if (!dev->dma_mask) +return 0 ; + +return addr + size <= *dev->dma_mask; +} + +static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +{ +return paddr +get_dma_direct_offset (dev); +} + +static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +{ +return daddr -get_dma_direct_offset (dev); +} +#define dma_alloc_noncoherent (d, s, h, f) dma_alloc_coherent(d, s, h, f)#define dma_free_noncoherent (d, s, v, h) dma_free_coherent(d, s, v, h)#ifdef CONFIG_NOT_COHERENT_CACHE
arch/powerpc/kernel/dma-swiotlb.c +1 -47
74 lines not on this page · raw message
arch/sparc/Kconfig +2 -0
@@ -25,6 +25,8 @@ config SPARC select ARCH_WANT_OPTIONAL_GPIOLIB select RTC_CLASS select RTC_DRV_M48T59 + select HAVE_DMA_ATTRS + select HAVE_DMA_API_DEBUG config SPARC32 def_bool !64BIT
arch/sparc/include/asm/dma-mapping.h +22 -123
170 lines not on this page · raw message
arch/sparc/include/asm/pci.h +3 -0
@@ -5,4 +5,7 @@#else #include <asm/pci_32.h> #endif + +#include <asm-generic/pci-dma-compat.h> +#endif
arch/sparc/include/asm/pci_32.h +0 -105
125 lines not on this page · raw message
arch/sparc/include/asm/pci_64.h +0 -88
106 lines not on this page · raw message
arch/sparc/kernel/Makefile +1 -1
@@ -61,7 +61,7 @@ obj-$(CONFIG_SPARC64_SMP) += cpumap.o obj-$(CONFIG_SPARC32) += devres.o devres-y := ../../../kernel/irq/devres.o -obj-$(CONFIG_SPARC32) += dma.o +obj-y += dma.o obj-$(CONFIG_SPARC32_PCI) += pcic.o
arch/sparc/kernel/dma.c +5 -170
183 lines not on this page · raw message
arch/sparc/kernel/dma.h deleted +0 -14
@@ -1,14 +0,0 @@ -void *sbus_alloc_consistent (struct device *dev,long len,u32 *dma_addrp); -void sbus_free_consistent (struct device *dev,long n,void *p,u32 ba); -dma_addr_t sbus_map_single (struct device *dev,void *va, -size_t len,int direction); -void sbus_unmap_single (struct device *dev,dma_addr_t ba, -size_t n,int direction); -int sbus_map_sg (struct device *dev,struct scatterlist *sg, -int n,int direction); -void sbus_unmap_sg (struct device *dev,struct scatterlist *sg, -int n,int direction); -void sbus_dma_sync_single_for_cpu (struct device *dev,dma_addr_t ba, -size_t size,int direction); -void sbus_dma_sync_single_for_device (struct device *dev,dma_addr_t ba, -size_t size,int direction);
arch/sparc/kernel/iommu.c +13 -7
@@ -353,7 +353,8 @@ static void dma_4u_free_coherent(struct device *dev, size_t size,static dma_addr_t dma_4u_map_page (struct device *dev,struct page *page,unsigned long offset,size_t sz, -enum dma_data_direction direction) +enum dma_data_direction direction, +struct dma_attrs *attrs) {struct iommu *iommu;struct strbuf *strbuf;
@@ -474,7 +475,8 @@ do_flush_sync: }static void dma_4u_unmap_page (struct device *dev,dma_addr_t bus_addr, -size_t sz,enum dma_data_direction direction) +size_t sz,enum dma_data_direction direction, +struct dma_attrs *attrs) {struct iommu *iommu;struct strbuf *strbuf;
@@ -520,7 +522,8 @@ static void dma_4u_unmap_page(struct device *dev, dma_addr_t bus_addr, }static int dma_4u_map_sg (struct device *dev,struct scatterlist *sglist, -int nelems,enum dma_data_direction direction) +int nelems,enum dma_data_direction direction, +struct dma_attrs *attrs) {struct scatterlist *s, *outs, *segstart;unsigned long flags, handle, prot, ctx;
@@ -691,7 +694,8 @@ static unsigned long fetch_sg_ctx(struct iommu *iommu, struct scatterlist *sg) }static void dma_4u_unmap_sg (struct device *dev,struct scatterlist *sglist, -int nelems,enum dma_data_direction direction) +int nelems,enum dma_data_direction direction, +struct dma_attrs *attrs) {unsigned long flags, ctx;struct scatterlist *sg;
@@ -822,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,spin_unlock_irqrestore (&iommu->lock, flags); } -static const struct dma_ops sun4u_dma_ops = { +static struct dma_map_ops sun4u_dma_ops = { .alloc_coherent = dma_4u_alloc_coherent, .free_coherent = dma_4u_free_coherent, .map_page = dma_4u_map_page,
@@ -833,9 +837,11 @@ static const struct dma_ops sun4u_dma_ops = { .sync_sg_for_cpu = dma_4u_sync_sg_for_cpu, }; -const struct dma_ops *dma_ops = &sun4u_dma_ops; +struct dma_map_ops *dma_ops = &sun4u_dma_ops;EXPORT_SYMBOL (dma_ops); +extern int pci64_dma_supported (struct pci_dev *pdev,u64 device_mask); +int dma_supported (struct device *dev,u64 device_mask) {struct iommu *iommu = dev->archdata.iommu;
@@ -849,7 +855,7 @@ int dma_supported(struct device *dev, u64 device_mask)#ifdef CONFIG_PCI if (dev->bus == &pci_bus_type) -return pci_dma_supported (to_pci_dev (dev), device_mask); +return pci64_dma_supported (to_pci_dev (dev), device_mask);#endif return 0 ;
arch/sparc/kernel/ioport.c +105 -85
356 lines not on this page · raw message
arch/sparc/kernel/pci.c +1 -1
@@ -1039,7 +1039,7 @@ static void ali_sound_dma_hack(struct pci_dev *pdev, int set_bit)pci_dev_put (ali_isa_bridge); } -int pci_dma_supported (struct pci_dev *pdev,u64 device_mask) +int pci64_dma_supported (struct pci_dev *pdev,u64 device_mask) {u64 dma_addr_mask;
arch/sparc/kernel/pci_sun4v.c +9 -21
@@ -232,7 +232,8 @@ static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu,static dma_addr_t dma_4v_map_page (struct device *dev,struct page *page,unsigned long offset,size_t sz, -enum dma_data_direction direction) +enum dma_data_direction direction, +struct dma_attrs *attrs) {struct iommu *iommu;unsigned long flags, npages, oaddr;
@@ -296,7 +297,8 @@ iommu_map_fail: }static void dma_4v_unmap_page (struct device *dev,dma_addr_t bus_addr, -size_t sz,enum dma_data_direction direction) +size_t sz,enum dma_data_direction direction, +struct dma_attrs *attrs) {struct pci_pbm_info *pbm;struct iommu *iommu;
@@ -336,7 +338,8 @@ static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr, }static int dma_4v_map_sg (struct device *dev,struct scatterlist *sglist, -int nelems,enum dma_data_direction direction) +int nelems,enum dma_data_direction direction, +struct dma_attrs *attrs) {struct scatterlist *s, *outs, *segstart;unsigned long flags, handle, prot;
@@ -478,7 +481,8 @@ iommu_map_failed: }static void dma_4v_unmap_sg (struct device *dev,struct scatterlist *sglist, -int nelems,enum dma_data_direction direction) +int nelems,enum dma_data_direction direction, +struct dma_attrs *attrs) {struct pci_pbm_info *pbm;struct scatterlist *sg;
@@ -521,29 +525,13 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,spin_unlock_irqrestore (&iommu->lock, flags); } -static void dma_4v_sync_single_for_cpu (struct device *dev, -dma_addr_t bus_addr,size_t sz, -enum dma_data_direction direction) -{ -/* Nothing to do... */ -} - -static void dma_4v_sync_sg_for_cpu (struct device *dev, -struct scatterlist *sglist,int nelems, -enum dma_data_direction direction) -{ -/* Nothing to do... */ -} - -static const struct dma_ops sun4v_dma_ops = { +static struct dma_map_ops sun4v_dma_ops = { .alloc_coherent = dma_4v_alloc_coherent, .free_coherent = dma_4v_free_coherent, .map_page = dma_4v_map_page, .unmap_page = dma_4v_unmap_page, .map_sg = dma_4v_map_sg, .unmap_sg = dma_4v_unmap_sg, - .sync_single_for_cpu = dma_4v_sync_single_for_cpu, - .sync_sg_for_cpu = dma_4v_sync_sg_for_cpu, }; static void __devinit pci_sun4v_scan_bus(struct pci_pbm_info *pbm,
arch/x86/Kconfig +0 -1
@@ -586,7 +586,6 @@ config GART_IOMMU bool "GART IOMMU support" if EMBEDDED default y select SWIOTLB - select AGP depends on X86_64 && PCI ---help--- Support for full DMA access of devices with 32bit memory access only
arch/x86/include/asm/amd_iommu.h +1 -0
@@ -25,6 +25,7 @@#ifdef CONFIG_AMD_IOMMU extern int amd_iommu_init (void );extern int amd_iommu_init_dma_ops (void ); +extern int amd_iommu_init_passthrough (void );extern void amd_iommu_detect (void );extern irqreturn_t amd_iommu_int_handler (int irq,void *data);extern void amd_iommu_flush_all_domains (void );
arch/x86/include/asm/amd_iommu_types.h +31 -19
91 lines not on this page · raw message
arch/x86/include/asm/dma-mapping.h +18 -0
@@ -55,6 +55,24 @@ extern int dma_set_mask(struct device *dev, u64 mask);extern void *dma_generic_alloc_coherent (struct device *dev,size_t size,dma_addr_t *dma_addr,gfp_t flag); +static inline bool dma_capable (struct device *dev,dma_addr_t addr,size_t size) +{ +if (!dev->dma_mask) +return 0 ; + +return addr + size <= *dev->dma_mask; +} + +static inline dma_addr_t phys_to_dma (struct device *dev,phys_addr_t paddr) +{ +return paddr; +} + +static inline phys_addr_t dma_to_phys (struct device *dev,dma_addr_t daddr) +{ +return daddr; +} +static inline void dma_cache_sync (struct device *dev,void *vaddr,size_t size,enum dma_data_direction dir)
arch/x86/kernel/amd_iommu.c +360 -129
752 lines not on this page · raw message
arch/x86/kernel/amd_iommu_init.c +29 -13
96 lines not on this page · raw message
arch/x86/kernel/pci-dma.c +9 -2
@@ -32,7 +32,14 @@ int no_iommu __read_mostly;/* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected__read_mostly =0 ; -int iommu_pass_through; +/* +* This variable becomes 1 if iommu=pt is passed on the kernel command line. +* If this variable is 1, IOMMU implementations do no DMA ranslation for +* devices and allow every device to access to whole physical memory. This is +* useful if a user want to use an IOMMU only for KVM device assignment to +* guests and not for driver dma translation. +*/ +int iommu_pass_through__read_mostly ;dma_addr_t bad_dma_address__read_mostly =0 ;EXPORT_SYMBOL (bad_dma_address);
@@ -147,7 +154,7 @@ again:return NULL ; addr =page_to_phys (page); -if (!is_buffer_dma_capable (dma_mask, addr, size)) { +if (addr + size > dma_mask) {__free_pages (page,get_order (size));if (dma_mask <DMA_BIT_MASK (32 ) && !(flag &GFP_DMA )) {
arch/x86/kernel/pci-gart_64.c +2 -3
@@ -190,14 +190,13 @@ static void iommu_full(struct device *dev, size_t size, int dir)static inline int need_iommu (struct device *dev,unsigned long addr,size_t size) { -return force_iommu || - !is_buffer_dma_capable (*dev->dma_mask, addr, size); +return force_iommu || !dma_capable (dev, addr, size); }static inline int nonforced_iommu (struct device *dev,unsigned long addr,size_t size) { -return !is_buffer_dma_capable (*dev->dma_mask, addr, size); +return !dma_capable (dev, addr, size); }/* Map a single continuous physical area into the IOMMU.
arch/x86/kernel/pci-nommu.c +23 -6
@@ -14,7 +14,7 @@static int check_addr (char *name,struct device *hwdev,dma_addr_t bus,size_t size) { -if (hwdev && !is_buffer_dma_capable (*hwdev->dma_mask, bus, size)) { +if (hwdev && !dma_capable (hwdev, bus, size)) {if (*hwdev->dma_mask >=DMA_BIT_MASK (32 )) printk(KERN_ERR "nommu_%s: overflow %Lx+%zu of device mask %Lx\n",
@@ -79,12 +79,29 @@ static void nommu_free_coherent(struct device *dev, size_t size, void *vaddr,free_pages ((unsigned long )vaddr,get_order (size)); } +static void nommu_sync_single_for_device (struct device *dev, +dma_addr_t addr,size_t size, +enum dma_data_direction dir) +{ +flush_write_buffers (); +} + + +static void nommu_sync_sg_for_device (struct device *dev, +struct scatterlist *sg,int nelems, +enum dma_data_direction dir) +{ +flush_write_buffers (); +} +struct dma_map_ops nommu_dma_ops = { - .alloc_coherent = dma_generic_alloc_coherent, - .free_coherent = nommu_free_coherent, - .map_sg = nommu_map_sg, - .map_page = nommu_map_page, - .is_phys =1 , + .alloc_coherent = dma_generic_alloc_coherent, + .free_coherent = nommu_free_coherent, + .map_sg = nommu_map_sg, + .map_page = nommu_map_page, + .sync_single_for_device = nommu_sync_single_for_device, + .sync_sg_for_device = nommu_sync_sg_for_device, + .is_phys =1 , };void __init no_iommu_init (void )
arch/x86/kernel/pci-swiotlb.c +0 -25
@@ -13,31 +13,6 @@int swiotlb__read_mostly ; -void *__init swiotlb_alloc_boot (size_t size,unsigned long nslabs) -{ -return alloc_bootmem_low_pages (size); -} - -void *swiotlb_alloc (unsigned order,unsigned long nslabs) -{ -return (void *)__get_free_pages (GFP_DMA | __GFP_NOWARN, order); -} - -dma_addr_t swiotlb_phys_to_bus (struct device *hwdev,phys_addr_t paddr) -{ -return paddr; -} - -phys_addr_t swiotlb_bus_to_phys (struct device *hwdev,dma_addr_t baddr) -{ -return baddr; -} - -int __weak swiotlb_arch_range_needs_mapping (phys_addr_t paddr,size_t size) -{ -return 0 ; -} -static void *x86_swiotlb_alloc_coherent (struct device *hwdev,size_t size,dma_addr_t *dma_handle,gfp_t flags) {
include/asm-generic/dma-mapping-common.h +0 -6
@@ -103,7 +103,6 @@ static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,if (ops->sync_single_for_cpu) ops->sync_single_for_cpu (dev, addr, size, dir);debug_dma_sync_single_for_cpu (dev, addr, size, dir); -flush_write_buffers (); } static inline void dma_sync_single_for_device(struct device *dev,
@@ -116,7 +115,6 @@ static inline void dma_sync_single_for_device(struct device *dev,if (ops->sync_single_for_device) ops->sync_single_for_device (dev, addr, size, dir);debug_dma_sync_single_for_device (dev, addr, size, dir); -flush_write_buffers (); } static inline void dma_sync_single_range_for_cpu(struct device *dev,
@@ -132,7 +130,6 @@ static inline void dma_sync_single_range_for_cpu(struct device *dev, ops->sync_single_range_for_cpu (dev, addr, offset, size, dir);debug_dma_sync_single_range_for_cpu (dev, addr, offset, size, dir); -flush_write_buffers (); }else dma_sync_single_for_cpu (dev, addr, size, dir); }
@@ -150,7 +147,6 @@ static inline void dma_sync_single_range_for_device(struct device *dev, ops->sync_single_range_for_device (dev, addr, offset, size, dir);debug_dma_sync_single_range_for_device (dev, addr, offset, size, dir); -flush_write_buffers (); }else dma_sync_single_for_device (dev, addr, size, dir); }
@@ -165,7 +161,6 @@ dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,if (ops->sync_sg_for_cpu) ops->sync_sg_for_cpu (dev, sg, nelems, dir);debug_dma_sync_sg_for_cpu (dev, sg, nelems, dir); -flush_write_buffers (); } static inline void
@@ -179,7 +174,6 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, ops->sync_sg_for_device (dev, sg, nelems, dir);debug_dma_sync_sg_for_device (dev, sg, nelems, dir); -flush_write_buffers (); }#define dma_map_single (d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL)
include/linux/dma-mapping.h +0 -5
@@ -98,11 +98,6 @@ static inline int is_device_dma_capable(struct device *dev)return dev->dma_mask !=NULL && *dev->dma_mask !=DMA_MASK_NONE ; } -static inline int is_buffer_dma_capable (u64 mask,dma_addr_t addr,size_t size) -{ -return addr + size <= mask; -} -#ifdef CONFIG_HAS_DMA #include <asm/dma-mapping.h> #else
include/linux/swiotlb.h +0 -11
@@ -14,7 +14,6 @@ struct scatterlist;*/ #define IO_TLB_SEGSIZE 128 -/* * log of the size of each IO TLB slab. The number of slabs is command line * controllable.
@@ -24,16 +23,6 @@ struct scatterlist;extern void swiotlb_init (void ); -extern void *swiotlb_alloc_boot (size_t bytes,unsigned long nslabs); -extern void *swiotlb_alloc (unsigned order,unsigned long nslabs); - -extern dma_addr_t swiotlb_phys_to_bus (struct device *hwdev, -phys_addr_t address); -extern phys_addr_t swiotlb_bus_to_phys (struct device *hwdev, -dma_addr_t address); - -extern int swiotlb_arch_range_needs_mapping (phys_addr_t paddr,size_t size); -extern void *swiotlb_alloc_coherent (struct device *hwdev,size_t size,dma_addr_t *dma_handle,gfp_t flags);
lib/swiotlb.c +44 -80
233 lines not on this page · raw message