nv-tegra-mirror/linux-hwpm
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-hwpm.git synced 2025-12-22 09:12:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

tegra: hwpm: update dma vmap for kernel > 5.10

Browse Source 
Kernel version beyond 5.10 introduces dma_buf_map structure (called
iosys_map in later versions). Kernel virtual address corresponding to a
dma_buf is stored in the dma_buf_map structure.
- This patch updates memory management function to use correct mem bytes
buffer kernel virtual address stored in the corresponding dma_buf_map
structure.
- Use dma_buf_map structure pointer to unmap kernel virtual address.
- During release, poll mem bytes buffer with finite timeout value.
- Add description for use of dma_set_mask_and_coherent.

Bug 3893741

Change-Id: I42ace2fe70b36d7d5d1a4c5fee21786826f24a07
Signed-off-by: Vedashree Vidwans <vvidwans@nvidia.com>
(cherry picked from commit ce852be6b39ef39affccdee41ad436fc70bf86b5)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-hwpm/+/2847007
Reviewed-by: Seema Khowala <seemaj@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Vedashree Vidwans
2022-12-15 21:14:47 -08:00
committed by mobile promotions
parent 7a89f70da6
commit f010cf5956
3 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/tegra/hwpm/os/linux/driver.c
View File

@@ -141,6 +141,7 @@ static int tegra_hwpm_probe(struct platform_device *pdev)
goto device_create;
}
/* This will limit IOVA buffer mapping to 39 bit addresses */
(void) dma_set_mask_and_coherent(hwpm_linux->dev, DMA_BIT_MASK(39));
ret = tegra_hwpm_get_chip_info(hwpm_linux);

44
drivers/tegra/hwpm/os/linux/mem_mgmt_utils.c
View File

@@ -19,7 +19,6 @@
#include <linux/string.h>
#include <linux/of_address.h>
#include <linux/dma-buf.h>
#include <linux/version.h>
#include <uapi/linux/tegra-soc-hwpm-uapi.h>
#include <tegra_hwpm_kmem.h>
@@ -59,12 +58,14 @@ static int tegra_hwpm_dma_map_stream_buffer(struct tegra_soc_hwpm *hwpm,
tegra_hwpm_err(hwpm, "Unable to get stream dma_buf");
return PTR_ERR(hwpm->mem_mgmt->stream_dma_buf);
}
hwpm->mem_mgmt->stream_attach =
dma_buf_attach(hwpm->mem_mgmt->stream_dma_buf, hwpm_linux->dev);
if (IS_ERR(hwpm->mem_mgmt->stream_attach)) {
tegra_hwpm_err(hwpm, "Unable to attach stream dma_buf");
return PTR_ERR(hwpm->mem_mgmt->stream_attach);
}
hwpm->mem_mgmt->stream_sgt = dma_buf_map_attachment(
hwpm->mem_mgmt->stream_attach, DMA_FROM_DEVICE);
if (IS_ERR(hwpm->mem_mgmt->stream_sgt)) {
@@ -79,6 +80,7 @@ static int tegra_hwpm_dma_map_stream_buffer(struct tegra_soc_hwpm *hwpm,
tegra_hwpm_err(hwpm, "Invalid stream buffer SMMU IOVA");
return -ENXIO;
}
tegra_hwpm_dbg(hwpm, hwpm_dbg_alloc_pma_stream,
"stream_buf_pma_va = 0x%llx",
alloc_pma_stream->stream_buf_pma_va);
@@ -128,26 +130,31 @@ static int tegra_hwpm_dma_map_mem_bytes_buffer(struct tegra_soc_hwpm *hwpm,
sg_dma_address(hwpm->mem_mgmt->mem_bytes_sgt->sgl);
#if defined(CONFIG_TEGRA_HWPM_OOT)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
hwpm->mem_mgmt->mem_bytes_kernel =
(struct iosys_map *) &hwpm->mem_mgmt->mem_bytes_map;
#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 10, 0)
/*
* Kernel version beyond 5.10 introduces
* dma_buf_map structure (called iosys_map in later versions).
* The kernel Virtual address generated from dma_buf_vmap API
* is stored in mem_bytes_map, which is a dma_buf_map structure
*/
err = dma_buf_vmap(hwpm->mem_mgmt->mem_bytes_dma_buf,
(struct iosys_map *)hwpm->mem_mgmt->mem_bytes_kernel);
&hwpm->mem_mgmt->mem_bytes_map);
if (err != 0) {
tegra_hwpm_err(hwpm,
"Unable to map mem_bytes buffer into kernel VA space");
return -ENOMEM;
}
hwpm->mem_mgmt->mem_bytes_kernel = hwpm->mem_mgmt->mem_bytes_map.vaddr;
#else
hwpm->mem_mgmt->mem_bytes_kernel =
(struct dma_buf_map *) &hwpm->mem_mgmt->mem_bytes_map;
err = dma_buf_vmap(hwpm->mem_mgmt->mem_bytes_dma_buf,
(struct dma_buf_map *)hwpm->mem_mgmt->mem_bytes_kernel);
#endif
#else /* !CONFIG_TEGRA_HWPM_OOT */
hwpm->mem_mgmt->mem_bytes_kernel =
dma_buf_vmap(hwpm->mem_mgmt->mem_bytes_dma_buf);
#endif
if (!hwpm->mem_mgmt->mem_bytes_kernel) {
tegra_hwpm_err(hwpm,
"Unable to map mem_bytes buffer into kernel VA space");
return -ENOMEM;
}
#endif
#endif
memset(hwpm->mem_mgmt->mem_bytes_kernel, 0, 32);
@@ -181,8 +188,15 @@ static int tegra_hwpm_reset_stream_buf(struct tegra_soc_hwpm *hwpm)
hwpm->mem_mgmt->stream_dma_buf = NULL;
if (hwpm->mem_mgmt->mem_bytes_kernel) {
#if defined(CONFIG_TEGRA_HWPM_OOT)
#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 10, 0)
dma_buf_vunmap(hwpm->mem_mgmt->mem_bytes_dma_buf,
&hwpm->mem_mgmt->mem_bytes_map);
#else
dma_buf_vunmap(hwpm->mem_mgmt->mem_bytes_dma_buf,
hwpm->mem_mgmt->mem_bytes_kernel);
#endif
#endif
hwpm->mem_mgmt->mem_bytes_kernel = NULL;
}
@@ -297,7 +311,11 @@ int tegra_hwpm_clear_mem_pipeline(struct tegra_soc_hwpm *hwpm)
u32 sleep_msecs = 100;
struct tegra_hwpm_timeout timeout = {0};
*mem_bytes_kernel_u32 = TEGRA_HWPM_MEM_BYTES_INVALID;
ret = tegra_hwpm_timeout_init(hwpm, &timeout, 10U);
if (ret != 0) {
tegra_hwpm_err(hwpm, "hwpm timeout init failed");
return ret;
}
do {
ret = hwpm->active_chip->stream_mem_bytes(hwpm);

2
drivers/tegra/hwpm/os/linux/mem_mgmt_utils.h
View File

@@ -42,9 +42,9 @@ struct tegra_hwpm_mem_mgmt {
struct dma_buf_attachment *stream_attach;
u64 stream_buf_size;
u64 stream_buf_va;
u64 mem_bytes_buf_va;
struct dma_buf *mem_bytes_dma_buf;
struct dma_buf_attachment *mem_bytes_attach;
u64 mem_bytes_buf_va;
void *mem_bytes_kernel;
#if defined(CONFIG_TEGRA_HWPM_OOT)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)