183 lines
7.1 KiB
Diff
183 lines
7.1 KiB
Diff
From 623e04e1f1fb18b817e73cdb116b1eea5d145dc4 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <623e04e1f1fb18b817e73cdb116b1eea5d145dc4.1507237259.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <2a9fb6a58e40e8604d97223603111e869bb774b1.1507237258.git.Jim.Somerville@windriver.com>
|
|
References: <2a9fb6a58e40e8604d97223603111e869bb774b1.1507237258.git.Jim.Somerville@windriver.com>
|
|
From: Akinobu Mita <akinobu.mita@gmail.com>
|
|
Date: Wed, 4 Jun 2014 16:06:50 -0700
|
|
Subject: [PATCH 11/24] x86: enable DMA CMA with swiotlb
|
|
|
|
commit 9c5a3621427da68afe6a078cadf807d2c8cc1d12 upstream.
|
|
Ported-by: Nam Ninh <nam.ninh@windriver.com>
|
|
|
|
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>
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
arch/x86/Kconfig | 2 +-
|
|
arch/x86/include/asm/swiotlb.h | 7 +++++++
|
|
arch/x86/kernel/amd_gart_64.c | 2 +-
|
|
arch/x86/kernel/pci-swiotlb.c | 9 ++++++---
|
|
arch/x86/pci/sta2x11-fixup.c | 6 ++----
|
|
include/linux/swiotlb.h | 2 ++
|
|
lib/swiotlb.c | 2 +-
|
|
7 files changed, 20 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
|
index c83b7a9..f943f01 100644
|
|
--- a/arch/x86/Kconfig
|
|
+++ b/arch/x86/Kconfig
|
|
@@ -43,7 +43,7 @@ config X86
|
|
select ARCH_WANT_OPTIONAL_GPIOLIB
|
|
select ARCH_WANT_FRAME_POINTERS
|
|
select HAVE_DMA_ATTRS
|
|
- select HAVE_DMA_CONTIGUOUS if !SWIOTLB
|
|
+ select HAVE_DMA_CONTIGUOUS
|
|
select HAVE_KRETPROBES
|
|
select HAVE_OPTPROBES
|
|
select HAVE_KPROBES_ON_FTRACE
|
|
diff --git a/arch/x86/include/asm/swiotlb.h b/arch/x86/include/asm/swiotlb.h
|
|
index 977f176..ab05d73 100644
|
|
--- a/arch/x86/include/asm/swiotlb.h
|
|
+++ b/arch/x86/include/asm/swiotlb.h
|
|
@@ -29,4 +29,11 @@ static inline void pci_swiotlb_late_init(void)
|
|
|
|
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 */
|
|
diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
|
|
index b574b29..8e3842f 100644
|
|
--- a/arch/x86/kernel/amd_gart_64.c
|
|
+++ b/arch/x86/kernel/amd_gart_64.c
|
|
@@ -512,7 +512,7 @@ gart_free_coherent(struct device *dev, size_t size, void *vaddr,
|
|
dma_addr_t dma_addr, struct dma_attrs *attrs)
|
|
{
|
|
gart_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL, NULL);
|
|
- free_pages((unsigned long)vaddr, get_order(size));
|
|
+ dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
|
|
}
|
|
|
|
static int gart_mapping_error(struct device *dev, dma_addr_t dma_addr)
|
|
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
|
|
index 48f9755..23a71b6 100644
|
|
--- a/arch/x86/kernel/pci-swiotlb.c
|
|
+++ b/arch/x86/kernel/pci-swiotlb.c
|
|
@@ -14,7 +14,7 @@
|
|
#include <asm/iommu_table.h>
|
|
int swiotlb __read_mostly;
|
|
|
|
-static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
|
+void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
|
dma_addr_t *dma_handle, gfp_t flags,
|
|
struct dma_attrs *attrs)
|
|
{
|
|
@@ -28,11 +28,14 @@ static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
|
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
|
|
}
|
|
|
|
-static void x86_swiotlb_free_coherent(struct device *dev, size_t size,
|
|
+void x86_swiotlb_free_coherent(struct device *dev, size_t size,
|
|
void *vaddr, dma_addr_t dma_addr,
|
|
struct dma_attrs *attrs)
|
|
{
|
|
- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
|
|
+ if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
|
|
+ swiotlb_free_coherent(dev, size, vaddr, dma_addr);
|
|
+ else
|
|
+ dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
|
|
}
|
|
|
|
static struct dma_map_ops swiotlb_dma_ops = {
|
|
diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
|
|
index 9d8a509..5ceda85 100644
|
|
--- a/arch/x86/pci/sta2x11-fixup.c
|
|
+++ b/arch/x86/pci/sta2x11-fixup.c
|
|
@@ -173,9 +173,7 @@ static void *sta2x11_swiotlb_alloc_coherent(struct device *dev,
|
|
{
|
|
void *vaddr;
|
|
|
|
- vaddr = dma_generic_alloc_coherent(dev, size, dma_handle, flags, attrs);
|
|
- if (!vaddr)
|
|
- vaddr = swiotlb_alloc_coherent(dev, size, dma_handle, flags);
|
|
+ vaddr = x86_swiotlb_alloc_coherent(dev, size, dma_handle, flags, attrs);
|
|
*dma_handle = p2a(*dma_handle, to_pci_dev(dev));
|
|
return vaddr;
|
|
}
|
|
@@ -183,7 +181,7 @@ static void *sta2x11_swiotlb_alloc_coherent(struct device *dev,
|
|
/* We have our own dma_ops: the same as swiotlb but from alloc (above) */
|
|
static struct dma_map_ops sta2x11_dma_ops = {
|
|
.alloc = sta2x11_swiotlb_alloc_coherent,
|
|
- .free = swiotlb_free_coherent,
|
|
+ .free = x86_swiotlb_free_coherent,
|
|
.map_page = swiotlb_map_page,
|
|
.unmap_page = swiotlb_unmap_page,
|
|
.map_sg = swiotlb_map_sg_attrs,
|
|
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
|
|
index a5ffd32..e7a018e 100644
|
|
--- a/include/linux/swiotlb.h
|
|
+++ b/include/linux/swiotlb.h
|
|
@@ -116,4 +116,6 @@ static inline void swiotlb_free(void) { }
|
|
#endif
|
|
|
|
extern void swiotlb_print_info(void);
|
|
+extern int is_swiotlb_buffer(phys_addr_t paddr);
|
|
+
|
|
#endif /* __LINUX_SWIOTLB_H */
|
|
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
|
|
index d23762e..eba74ec 100644
|
|
--- a/lib/swiotlb.c
|
|
+++ b/lib/swiotlb.c
|
|
@@ -366,7 +366,7 @@ void __init swiotlb_free(void)
|
|
io_tlb_nslabs = 0;
|
|
}
|
|
|
|
-static int is_swiotlb_buffer(phys_addr_t paddr)
|
|
+int is_swiotlb_buffer(phys_addr_t paddr)
|
|
{
|
|
return paddr >= io_tlb_start && paddr < io_tlb_end;
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|