github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 19:47:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "android: abi_gki_aarch64_qcom: Add mem_section to whitelist"

Browse Source
This commit is contained in:
qctecmdr 2022-06-29 20:32:01 -07:00 committed by Gerrit - the friendly Code Review server
commit 3070733372
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/abi_gki_aarch64_qcom
View File

@ -947,6 +947,7 @@
memory_read_from_buffer
memparse
memremap
mem_section
memset
memset64
__memset_io

2
arch/arm64/configs/vendor/pineapple_GKI.config vendored
View File

@ -22,6 +22,8 @@ CONFIG_PINCTRL_PINEAPPLE=m
CONFIG_QCOM_COMMAND_DB=m
CONFIG_QCOM_GDSC_REGULATOR=m
CONFIG_QCOM_IOMMU_UTIL=m
CONFIG_QCOM_MEM_BUF=m
CONFIG_QCOM_MEM_BUF_DEV=m
# CONFIG_QCOM_MINIDUMP is not set
CONFIG_QCOM_PDC=m
# CONFIG_QCOM_Q6V5_ADSP is not set

11
drivers/dma-buf/heaps/qcom_sg_ops.c
View File

@ -14,6 +14,7 @@
* https://lore.kernel.org/lkml/20201017013255.43568-2-john.stultz@linaro.org/
*
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/dma-buf.h>
@ -456,7 +457,7 @@ static void *qcom_sg_do_vmap(struct qcom_sg_buffer *buffer)
return vaddr;
}
static int qcom_sg_vmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
static int qcom_sg_vmap(struct dma_buf *dmabuf, struct iosys_map *map)
{
struct qcom_sg_buffer *buffer = dmabuf->priv;
void *vaddr;
@ -471,7 +472,7 @@ static int qcom_sg_vmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
mutex_lock(&buffer->lock);
if (buffer->vmap_cnt) {
buffer->vmap_cnt++;
dma_buf_map_set_vaddr(map, buffer->vaddr);
iosys_map_set_vaddr(map, buffer->vaddr);
goto out;
}
@ -484,14 +485,14 @@ static int qcom_sg_vmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
buffer->vaddr = vaddr;
buffer->vmap_cnt++;
dma_buf_map_set_vaddr(map, buffer->vaddr);
iosys_map_set_vaddr(map, buffer->vaddr);
out:
mutex_unlock(&buffer->lock);
return ret;
}
static void qcom_sg_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
static void qcom_sg_vunmap(struct dma_buf *dmabuf, struct iosys_map *map)
{
struct qcom_sg_buffer *buffer = dmabuf->priv;
@ -502,7 +503,7 @@ static void qcom_sg_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
}
mem_buf_vmperm_unpin(buffer->vmperm);
mutex_unlock(&buffer->lock);
dma_buf_map_clear(map);
iosys_map_clear(map);
}
static void qcom_sg_release(struct dma_buf *dmabuf)

3
modules.list.msm.pineapple
View File

@ -4,6 +4,9 @@ qcom-pdc.ko
qcom_iommu_util.ko
arm_smmu.ko
secure_buffer.ko
mem_buf_dev.ko
mem_buf_msgq.ko
mem_buf.ko
qcom-scm.ko
pinctrl-msm.ko
pinctrl-pineapple.ko