shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "arm64/dma-mapping: __generic_dma_ops always call swiotlb_dma_ops"

Browse Source 
This reverts commit 3e89f7de9a.

Change-Id: I4cf45807f91ab3021b6593f171c1f2573e1ea7f2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
This commit is contained in:
Jianqun Xu
2016-12-28 08:32:18 +08:00
parent 96d9f37fa5
commit f2c399320e
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm64/include/asm/dma-mapping.h
View File

@@ -27,19 +27,12 @@
#define DMA_ERROR_CODE (~(dma_addr_t)0)
extern struct dma_map_ops dummy_dma_ops;
extern struct dma_map_ops swiotlb_dma_ops;
static inline struct dma_map_ops *__generic_dma_ops(struct device *dev)
{
if (dev && dev->archdata.dma_ops)
return dev->archdata.dma_ops;
/*
* For ion APIs, they have no devices, we force it to call swiotlb_dma_ops
* to sync device.
* Revert me if ion has fixed this issue.
*/
return &swiotlb_dma_ops;
/*
* We expect no ISA devices, and all other DMA masters are expected to
* have someone call arch_setup_dma_ops at device creation time.

3
arch/arm64/mm/dma-mapping.c
View File

@@ -334,7 +334,7 @@ static int __swiotlb_get_sgtable(struct device *dev, struct sg_table *sgt,
return ret;
}
struct dma_map_ops swiotlb_dma_ops = {
static struct dma_map_ops swiotlb_dma_ops = {
.alloc = __dma_alloc,
.free = __dma_free,
.mmap = __swiotlb_mmap,
@@ -350,7 +350,6 @@ struct dma_map_ops swiotlb_dma_ops = {
.dma_supported = swiotlb_dma_supported,
.mapping_error = swiotlb_dma_mapping_error,
};
EXPORT_SYMBOL(swiotlb_dma_ops);
static int __init atomic_pool_init(void)
{