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

qcom-iommu-util: Remove dependency on CONFIG_DMA_REMAP

Browse Source 
Commit f5ff79fddf ("dma-mapping: remove CONFIG_DMA_REMAP") removes
CONFIG_DMA_REMAP and makes its underlying features as built-in by
default for kernels with CONFIG_MMU set. We must therefore remove the
config option ourselves in our code as well to remain functionally
correct during incoming mmap() calls.

Change-Id: I5dc5e314ec90f27f8aa926b546ffa583571e8337
Signed-off-by: Chris Goldsworthy <quic_cgoldswo@quicinc.com>
This commit is contained in:
Chris Goldsworthy 2023-01-17 16:43:02 -08:00
parent 92edb0ce6a
commit 3c82a17b49
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/iommu/qcom-dma-iommu-generic.c
View File

@ -7,6 +7,7 @@
* Marek Szyprowski <m.szyprowski@samsung.com>
* Michal Nazarewicz <mina86@mina86.com>
* Copyright (C) 2012, 2014-2015 ARM Ltd.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
@ -691,7 +692,7 @@ int qcom_iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma,
if (off >= nr_pages || vma_pages(vma) > nr_pages - off)
return -ENXIO;
if (IS_ENABLED(CONFIG_DMA_REMAP) && is_vmalloc_addr(cpu_addr)) {
if (is_vmalloc_addr(cpu_addr)) {
struct page **pages = qcom_dma_common_find_pages(cpu_addr);
if (pages)
@ -713,7 +714,7 @@ int qcom_iommu_dma_get_sgtable(struct device *dev, struct sg_table *sgt,
struct page *page;
int ret;
if (IS_ENABLED(CONFIG_DMA_REMAP) && is_vmalloc_addr(cpu_addr)) {
if (is_vmalloc_addr(cpu_addr)) {
struct page **pages = qcom_dma_common_find_pages(cpu_addr);
if (pages) {