android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: mm: Fix compilation error when IOMMU is disabled

Browse Source 
Fix compilation when DMA uses IOMMU with the config flag
CONFIG_ARM_DMA_USE_IOMMU.

Change-Id: I6f20dbca6f3090a7d0d5d720800a12feed5d0dc2
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
This commit is contained in:
Jeevan Shriram 2020-06-02 10:12:49 -07:00
parent cab5940348
commit 4f9c80079f
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/arm/mm/dma-mapping.c
View File

@ -122,19 +122,6 @@ static pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot,
return prot;
}
static bool is_dma_coherent(struct device *dev, unsigned long attrs,
bool is_coherent)
{
if (attrs & DMA_ATTR_FORCE_COHERENT)
is_coherent = true;
else if (attrs & DMA_ATTR_FORCE_NON_COHERENT)
is_coherent = false;
else if (dev->archdata.dma_coherent)
is_coherent = true;
return is_coherent;
}
/**
* arm_dma_map_page - map a portion of a page for streaming DMA
* @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
@ -1146,6 +1133,19 @@ static const struct dma_map_ops *arm_get_dma_map_ops(bool coherent)
#ifdef CONFIG_ARM_DMA_USE_IOMMU
static bool is_dma_coherent(struct device *dev, unsigned long attrs,
bool is_coherent)
{
if (attrs & DMA_ATTR_FORCE_COHERENT)
is_coherent = true;
else if (attrs & DMA_ATTR_FORCE_NON_COHERENT)
is_coherent = false;
else if (dev->archdata.dma_coherent)
is_coherent = true;
return is_coherent;
}
static int __dma_info_to_prot(enum dma_data_direction dir, unsigned long attrs)
{
int prot = 0;