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

nvmap: Fix build for Linux v6.13

Browse Source 
In Linux v6.13, commit b129125e1f96 ("arm64: asm-offsets: remove
DMA_{TO,FROM}_DEVICE") removes the definitions DMA_TO/FROM_DEVICE from
the assembly header file 'asm-offsets.h' which is used by the functions
__dma_map_area() and __dma_unmap_area() in nvmap_cache_maint.S.

From reviewing the NVMAP code, the function __dma_unmap_area() is never
used and so we can simply remove this. Split the __dma_map_area() into
two functions __dma_map_area_to_device() and
__dma_map_area_from_device() to avoid having to pass the direction.

Bug 4991895

Change-Id: I4a0f658401beff5c5e5457de72050b21acf820fa
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3261710
(cherry picked from commit de3a6ce1cbff438cba468c5cf817e3fe297d47a0)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3499753
Tested-by: Brad Griffis <bgriffis@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2024-12-03 14:11:16 +00:00
committed by mobile promotions
parent 5c780b2c63
commit d9b938131d
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/tegra/nvmap/nvmap_cache.c
View File

@@ -63,9 +63,9 @@ void inner_cache_maint(unsigned int op, void *vaddr, size_t size)
__dma_flush_area(vaddr, size); __dma_flush_area(vaddr, size);
#endif #endif
else if (op == NVMAP_CACHE_OP_INV) else if (op == NVMAP_CACHE_OP_INV)
__dma_map_area(vaddr, size, DMA_FROM_DEVICE); __dma_map_area_from_device(vaddr, size);
else else
__dma_map_area(vaddr, size, DMA_TO_DEVICE); __dma_map_area_to_device(vaddr, size);
} }
static void heap_page_cache_maint( static void heap_page_cache_maint(

21
drivers/video/tegra/nvmap/nvmap_cache_maint.S
View File

@@ -185,25 +185,20 @@ SYM_FUNC_START(__dma_flush_area)
SYM_FUNC_END(__dma_flush_area) SYM_FUNC_END(__dma_flush_area)
/* /*
* __dma_map_area(start, size, dir) * __dma_map_area_from_device(start, size)
* - start - kernel virtual start address * - start - kernel virtual start address
* - size - size of region * - size - size of region
* - dir - DMA direction
*/ */
SYM_FUNC_START(__dma_map_area) SYM_FUNC_START(__dma_map_area_from_device)
cmp w2, #DMA_FROM_DEVICE b __dma_inv_area
b.eq __dma_inv_area
b __dma_clean_area b __dma_clean_area
SYM_FUNC_END(__dma_map_area) SYM_FUNC_END(__dma_map_area_from_device)
/* /*
* __dma_unmap_area(start, size, dir) * __dma_map_area_to_device(start, size)
* - start - kernel virtual start address * - start - kernel virtual start address
* - size - size of region * - size - size of region
* - dir - DMA direction
*/ */
SYM_FUNC_START(__dma_unmap_area) SYM_FUNC_START(__dma_map_area_to_device)
cmp w2, #DMA_TO_DEVICE b __dma_clean_area
b.ne __dma_inv_area SYM_FUNC_END(__dma_map_area_to_device)
ret
SYM_FUNC_END(__dma_unmap_area)

3
drivers/video/tegra/nvmap/nvmap_priv.h
View File

@@ -949,7 +949,8 @@ void nvmap_dma_mark_declared_memory_unoccupied(struct device *dev,
dma_addr_t device_addr, size_t size); dma_addr_t device_addr, size_t size);
extern void __dma_flush_area(const void *cpu_va, size_t size); extern void __dma_flush_area(const void *cpu_va, size_t size);
extern void __dma_map_area(const void *cpu_va, size_t size, int dir); void __dma_map_area_from_device(const void *cpu_va, size_t size);
void __dma_map_area_to_device(const void *cpu_va, size_t size);
int nvmap_assign_pages_to_handle(struct nvmap_client *client, int nvmap_assign_pages_to_handle(struct nvmap_client *client,
struct nvmap_handle **hs, struct nvmap_handle *h, struct nvmap_handle **hs, struct nvmap_handle *h,