mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-29 13:00:35 +00:00
787314c35f
A few new features this merge-window. The most important one is probably, that dma-debug now warns if a dma-handle is not checked with dma_mapping_error by the device driver. This requires minor changes to some architectures which make use of dma-debug. Most of these changes have the respective Acks by the Arch-Maintainers. Besides that there are updates to the AMD IOMMU driver for refactor the IOMMU-Groups support and to make sure it does not trigger a hardware erratum. The OMAP changes (for which I pulled in a branch from Tony Lindgren's tree) have a conflict in linux-next with the arm-soc tree. The conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is deleted in the arm-soc tree. It is safe to delete the file too so solve the conflict. Similar changes are done in the arm-soc tree in the common clock framework migration. A missing hunk from the patch in the IOMMU tree will be submitted as a seperate patch when the merge-window is closed. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQzbQQAAoJECvwRC2XARrjXCIP/2RxBzbVOiaPOorl+ZWbsZ41 lzWiXsCHJkh4BK4/qGsVeKhiNd9LcbQUlhywnBbhWxym3spzmjGtvU2Hcg8QiO/M R83r9S4e8Z6DnF9Gcats1Ns9BufgpyhLXg3XoXPxtyHOgRS59fvYi6xXOxyX30Dy uhbj+WL6UD0zvOMNztEnM1p6UhX+XlpvzKDTR5+G5xKdVPkcgeiaKSwqz739caTn QE2NpqIh+8Mwuu1nIapk8h07xhUYU5eGMXa38u1LvDwSHsrsCMLC+lXIjtInn7Gw Bv+XcCHgtOaoPQwwk/xd2HVwJQxO9HNb5YX51EIjwP0C5S/3yW9Ji1RgqFb6Ewqq jIkF6ckwUheLWsBGkw5UknI/f7RX3MDiTWkziYLIniYKKewm+ymGfgIqPt2TzLIO tMZZiIssKvy7wOXQ5JjpYJg5Xmrau6opNwdEguC8pWkJT7qsn+3SeLjMt0Lh9IoY +37DOgOLb3O3/vnZJ3i0KMRZBfVeaRj5HaGmlxFCYUZCNQymIPTih9Jtqm+WuVcu YaGQCTtynsQ0JVh8YEekLzSfgd3OODP68fyCg1CQNixEgvUi2hd/toX2/Z1wkkSA JC9bZarcoPkSWqaTAA2HvmaaxvRR+0UbhFPopFTQarVV0MVLZWBxoyuKy/nMrmMd UgTzrDYy74UKdrSTwIXg =pPHZ -----END PGP SIGNATURE----- Merge tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu Pull IOMMU updates from Joerg Roedel: "A few new features this merge-window. The most important one is probably, that dma-debug now warns if a dma-handle is not checked with dma_mapping_error by the device driver. This requires minor changes to some architectures which make use of dma-debug. Most of these changes have the respective Acks by the Arch-Maintainers. Besides that there are updates to the AMD IOMMU driver for refactor the IOMMU-Groups support and to make sure it does not trigger a hardware erratum. The OMAP changes (for which I pulled in a branch from Tony Lindgren's tree) have a conflict in linux-next with the arm-soc tree. The conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is deleted in the arm-soc tree. It is safe to delete the file too so solve the conflict. Similar changes are done in the arm-soc tree in the common clock framework migration. A missing hunk from the patch in the IOMMU tree will be submitted as a seperate patch when the merge-window is closed." * tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (29 commits) ARM: dma-mapping: support debug_dma_mapping_error ARM: OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf clocks iommu/omap: Adapt to runtime pm iommu/omap: Migrate to hwmod framework iommu/omap: Keep mmu enabled when requested iommu/omap: Remove redundant clock handling on ISR iommu/amd: Remove obsolete comment iommu/amd: Don't use 512GB pages iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch iommu/tegra: gart: Move bus_set_iommu after probe for multi arch iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all tile: dma_debug: add debug_dma_mapping_error support sh: dma_debug: add debug_dma_mapping_error support powerpc: dma_debug: add debug_dma_mapping_error support mips: dma_debug: add debug_dma_mapping_error support microblaze: dma-mapping: support debug_dma_mapping_error ia64: dma_debug: add debug_dma_mapping_error support c6x: dma_debug: add debug_dma_mapping_error support ARM64: dma_debug: add debug_dma_mapping_error support intel-iommu: Prevent devices with RMRRs from being placed into SI Domain ...
274 lines
8.5 KiB
C
274 lines
8.5 KiB
C
#ifndef ASMARM_DMA_MAPPING_H
|
|
#define ASMARM_DMA_MAPPING_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/mm_types.h>
|
|
#include <linux/scatterlist.h>
|
|
#include <linux/dma-attrs.h>
|
|
#include <linux/dma-debug.h>
|
|
|
|
#include <asm-generic/dma-coherent.h>
|
|
#include <asm/memory.h>
|
|
|
|
#define DMA_ERROR_CODE (~0)
|
|
extern struct dma_map_ops arm_dma_ops;
|
|
extern struct dma_map_ops arm_coherent_dma_ops;
|
|
|
|
static inline struct dma_map_ops *get_dma_ops(struct device *dev)
|
|
{
|
|
if (dev && dev->archdata.dma_ops)
|
|
return dev->archdata.dma_ops;
|
|
return &arm_dma_ops;
|
|
}
|
|
|
|
static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
|
|
{
|
|
BUG_ON(!dev);
|
|
dev->archdata.dma_ops = ops;
|
|
}
|
|
|
|
#include <asm-generic/dma-mapping-common.h>
|
|
|
|
static inline int dma_set_mask(struct device *dev, u64 mask)
|
|
{
|
|
return get_dma_ops(dev)->set_dma_mask(dev, mask);
|
|
}
|
|
|
|
#ifdef __arch_page_to_dma
|
|
#error Please update to __arch_pfn_to_dma
|
|
#endif
|
|
|
|
/*
|
|
* dma_to_pfn/pfn_to_dma/dma_to_virt/virt_to_dma are architecture private
|
|
* functions used internally by the DMA-mapping API to provide DMA
|
|
* addresses. They must not be used by drivers.
|
|
*/
|
|
#ifndef __arch_pfn_to_dma
|
|
static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)
|
|
{
|
|
return (dma_addr_t)__pfn_to_bus(pfn);
|
|
}
|
|
|
|
static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)
|
|
{
|
|
return __bus_to_pfn(addr);
|
|
}
|
|
|
|
static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)
|
|
{
|
|
return (void *)__bus_to_virt((unsigned long)addr);
|
|
}
|
|
|
|
static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)
|
|
{
|
|
return (dma_addr_t)__virt_to_bus((unsigned long)(addr));
|
|
}
|
|
#else
|
|
static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)
|
|
{
|
|
return __arch_pfn_to_dma(dev, pfn);
|
|
}
|
|
|
|
static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)
|
|
{
|
|
return __arch_dma_to_pfn(dev, addr);
|
|
}
|
|
|
|
static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)
|
|
{
|
|
return __arch_dma_to_virt(dev, addr);
|
|
}
|
|
|
|
static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)
|
|
{
|
|
return __arch_virt_to_dma(dev, addr);
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* DMA errors are defined by all-bits-set in the DMA address.
|
|
*/
|
|
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
|
|
{
|
|
debug_dma_mapping_error(dev, dma_addr);
|
|
return dma_addr == DMA_ERROR_CODE;
|
|
}
|
|
|
|
/*
|
|
* Dummy noncoherent implementation. We don't provide a dma_cache_sync
|
|
* function so drivers using this API are highlighted with build warnings.
|
|
*/
|
|
static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
|
dma_addr_t *handle, gfp_t gfp)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline void dma_free_noncoherent(struct device *dev, size_t size,
|
|
void *cpu_addr, dma_addr_t handle)
|
|
{
|
|
}
|
|
|
|
extern int dma_supported(struct device *dev, u64 mask);
|
|
|
|
extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
|
|
|
|
/**
|
|
* arm_dma_alloc - allocate consistent memory for DMA
|
|
* @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
|
|
* @size: required memory size
|
|
* @handle: bus-specific DMA address
|
|
* @attrs: optinal attributes that specific mapping properties
|
|
*
|
|
* Allocate some memory for a device for performing DMA. This function
|
|
* allocates pages, and will return the CPU-viewed address, and sets @handle
|
|
* to be the device-viewed address.
|
|
*/
|
|
extern void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
|
|
gfp_t gfp, struct dma_attrs *attrs);
|
|
|
|
#define dma_alloc_coherent(d, s, h, f) dma_alloc_attrs(d, s, h, f, NULL)
|
|
|
|
static inline void *dma_alloc_attrs(struct device *dev, size_t size,
|
|
dma_addr_t *dma_handle, gfp_t flag,
|
|
struct dma_attrs *attrs)
|
|
{
|
|
struct dma_map_ops *ops = get_dma_ops(dev);
|
|
void *cpu_addr;
|
|
BUG_ON(!ops);
|
|
|
|
cpu_addr = ops->alloc(dev, size, dma_handle, flag, attrs);
|
|
debug_dma_alloc_coherent(dev, size, *dma_handle, cpu_addr);
|
|
return cpu_addr;
|
|
}
|
|
|
|
/**
|
|
* arm_dma_free - free memory allocated by arm_dma_alloc
|
|
* @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
|
|
* @size: size of memory originally requested in dma_alloc_coherent
|
|
* @cpu_addr: CPU-view address returned from dma_alloc_coherent
|
|
* @handle: device-view address returned from dma_alloc_coherent
|
|
* @attrs: optinal attributes that specific mapping properties
|
|
*
|
|
* Free (and unmap) a DMA buffer previously allocated by
|
|
* arm_dma_alloc().
|
|
*
|
|
* References to memory and mappings associated with cpu_addr/handle
|
|
* during and after this call executing are illegal.
|
|
*/
|
|
extern void arm_dma_free(struct device *dev, size_t size, void *cpu_addr,
|
|
dma_addr_t handle, struct dma_attrs *attrs);
|
|
|
|
#define dma_free_coherent(d, s, c, h) dma_free_attrs(d, s, c, h, NULL)
|
|
|
|
static inline void dma_free_attrs(struct device *dev, size_t size,
|
|
void *cpu_addr, dma_addr_t dma_handle,
|
|
struct dma_attrs *attrs)
|
|
{
|
|
struct dma_map_ops *ops = get_dma_ops(dev);
|
|
BUG_ON(!ops);
|
|
|
|
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
|
|
ops->free(dev, size, cpu_addr, dma_handle, attrs);
|
|
}
|
|
|
|
/**
|
|
* arm_dma_mmap - map a coherent DMA allocation into user space
|
|
* @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
|
|
* @vma: vm_area_struct describing requested user mapping
|
|
* @cpu_addr: kernel CPU-view address returned from dma_alloc_coherent
|
|
* @handle: device-view address returned from dma_alloc_coherent
|
|
* @size: size of memory originally requested in dma_alloc_coherent
|
|
* @attrs: optinal attributes that specific mapping properties
|
|
*
|
|
* Map a coherent DMA buffer previously allocated by dma_alloc_coherent
|
|
* into user space. The coherent DMA buffer must not be freed by the
|
|
* driver until the user space mapping has been released.
|
|
*/
|
|
extern int arm_dma_mmap(struct device *dev, struct vm_area_struct *vma,
|
|
void *cpu_addr, dma_addr_t dma_addr, size_t size,
|
|
struct dma_attrs *attrs);
|
|
|
|
static inline void *dma_alloc_writecombine(struct device *dev, size_t size,
|
|
dma_addr_t *dma_handle, gfp_t flag)
|
|
{
|
|
DEFINE_DMA_ATTRS(attrs);
|
|
dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
|
|
return dma_alloc_attrs(dev, size, dma_handle, flag, &attrs);
|
|
}
|
|
|
|
static inline void dma_free_writecombine(struct device *dev, size_t size,
|
|
void *cpu_addr, dma_addr_t dma_handle)
|
|
{
|
|
DEFINE_DMA_ATTRS(attrs);
|
|
dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs);
|
|
return dma_free_attrs(dev, size, cpu_addr, dma_handle, &attrs);
|
|
}
|
|
|
|
/*
|
|
* This can be called during early boot to increase the size of the atomic
|
|
* coherent DMA pool above the default value of 256KiB. It must be called
|
|
* before postcore_initcall.
|
|
*/
|
|
extern void __init init_dma_coherent_pool_size(unsigned long size);
|
|
|
|
/*
|
|
* For SA-1111, IXP425, and ADI systems the dma-mapping functions are "magic"
|
|
* and utilize bounce buffers as needed to work around limited DMA windows.
|
|
*
|
|
* On the SA-1111, a bug limits DMA to only certain regions of RAM.
|
|
* On the IXP425, the PCI inbound window is 64MB (256MB total RAM)
|
|
* On some ADI engineering systems, PCI inbound window is 32MB (12MB total RAM)
|
|
*
|
|
* The following are helper functions used by the dmabounce subystem
|
|
*
|
|
*/
|
|
|
|
/**
|
|
* dmabounce_register_dev
|
|
*
|
|
* @dev: valid struct device pointer
|
|
* @small_buf_size: size of buffers to use with small buffer pool
|
|
* @large_buf_size: size of buffers to use with large buffer pool (can be 0)
|
|
* @needs_bounce_fn: called to determine whether buffer needs bouncing
|
|
*
|
|
* This function should be called by low-level platform code to register
|
|
* a device as requireing DMA buffer bouncing. The function will allocate
|
|
* appropriate DMA pools for the device.
|
|
*/
|
|
extern int dmabounce_register_dev(struct device *, unsigned long,
|
|
unsigned long, int (*)(struct device *, dma_addr_t, size_t));
|
|
|
|
/**
|
|
* dmabounce_unregister_dev
|
|
*
|
|
* @dev: valid struct device pointer
|
|
*
|
|
* This function should be called by low-level platform code when device
|
|
* that was previously registered with dmabounce_register_dev is removed
|
|
* from the system.
|
|
*
|
|
*/
|
|
extern void dmabounce_unregister_dev(struct device *);
|
|
|
|
|
|
|
|
/*
|
|
* The scatter list versions of the above methods.
|
|
*/
|
|
extern int arm_dma_map_sg(struct device *, struct scatterlist *, int,
|
|
enum dma_data_direction, struct dma_attrs *attrs);
|
|
extern void arm_dma_unmap_sg(struct device *, struct scatterlist *, int,
|
|
enum dma_data_direction, struct dma_attrs *attrs);
|
|
extern void arm_dma_sync_sg_for_cpu(struct device *, struct scatterlist *, int,
|
|
enum dma_data_direction);
|
|
extern void arm_dma_sync_sg_for_device(struct device *, struct scatterlist *, int,
|
|
enum dma_data_direction);
|
|
extern int arm_dma_get_sgtable(struct device *dev, struct sg_table *sgt,
|
|
void *cpu_addr, dma_addr_t dma_addr, size_t size,
|
|
struct dma_attrs *attrs);
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif
|