mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 05:04:00 +08:00
9c5a362142
The DMA Contiguous Memory Allocator support on x86 is disabled when swiotlb config option is enabled. So DMA CMA is always disabled on x86_64 because swiotlb is always enabled. This attempts to support for DMA CMA with enabling swiotlb config option. The contiguous memory allocator on x86 is integrated in the function dma_generic_alloc_coherent() which is .alloc callback in nommu_dma_ops for dma_alloc_coherent(). x86_swiotlb_alloc_coherent() which is .alloc callback in swiotlb_dma_ops tries to allocate with dma_generic_alloc_coherent() firstly and then swiotlb_alloc_coherent() is called as a fallback. The main part of supporting DMA CMA with swiotlb is that changing x86_swiotlb_free_coherent() which is .free callback in swiotlb_dma_ops for dma_free_coherent() so that it can distinguish memory allocated by dma_generic_alloc_coherent() from one allocated by swiotlb_alloc_coherent() and release it with dma_generic_free_coherent() which can handle contiguous memory. This change requires making is_swiotlb_buffer() global function. This also needs to change .free callback in the dma_map_ops for amd_gart and sta2x11, because these dma_ops are also using dma_generic_alloc_coherent(). Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Don Dutile <ddutile@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
40 lines
960 B
C
40 lines
960 B
C
#ifndef _ASM_X86_SWIOTLB_H
|
|
#define _ASM_X86_SWIOTLB_H
|
|
|
|
#include <linux/swiotlb.h>
|
|
|
|
#ifdef CONFIG_SWIOTLB
|
|
extern int swiotlb;
|
|
extern int __init pci_swiotlb_detect_override(void);
|
|
extern int __init pci_swiotlb_detect_4gb(void);
|
|
extern void __init pci_swiotlb_init(void);
|
|
extern void __init pci_swiotlb_late_init(void);
|
|
#else
|
|
#define swiotlb 0
|
|
static inline int pci_swiotlb_detect_override(void)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline int pci_swiotlb_detect_4gb(void)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void pci_swiotlb_init(void)
|
|
{
|
|
}
|
|
static inline void pci_swiotlb_late_init(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
static inline void dma_mark_clean(void *addr, size_t size) {}
|
|
|
|
extern void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
|
dma_addr_t *dma_handle, gfp_t flags,
|
|
struct dma_attrs *attrs);
|
|
extern void x86_swiotlb_free_coherent(struct device *dev, size_t size,
|
|
void *vaddr, dma_addr_t dma_addr,
|
|
struct dma_attrs *attrs);
|
|
|
|
#endif /* _ASM_X86_SWIOTLB_H */
|