nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-23 01:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: mods: update from Perforce

Browse Source 
Change-Id: I50cacf7e5f16a8d0a087becf984c28a2ba516d43
Signed-off-by: Chris Dragan <kdragan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2747397
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Chris Dragan
2022-07-19 01:32:12 -07:00
committed by Laxman Dewangan
parent aa01c9a907
commit b25e80150e
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/misc/mods/Makefile
View File

@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
ccflags-y += -I$(srctree.nvidia)/include ccflags-y += -I$(srctree.nvidia)/include
ccflags-y += -DMODS_HAS_TEGRA
ifeq ($(CONFIG_TEGRA_OOT_MODULE),m) ifeq ($(CONFIG_TEGRA_OOT_MODULE),m)
CONFIG_MODS := m CONFIG_MODS := m

4
drivers/misc/mods/mods_config.h
View File

@@ -108,10 +108,6 @@
# define MODS_HAS_ACPI_FETCH 1 # define MODS_HAS_ACPI_FETCH 1
#endif #endif
#if defined(CONFIG_ARCH_TEGRA)
# define MODS_HAS_TEGRA 1
#endif
#if defined(MODS_HAS_TEGRA) && KERNEL_VERSION(5, 1, 0) <= MODS_KERNEL_VERSION #if defined(MODS_HAS_TEGRA) && KERNEL_VERSION(5, 1, 0) <= MODS_KERNEL_VERSION
# define MODS_ENABLE_BPMP_MRQ_API 1 # define MODS_ENABLE_BPMP_MRQ_API 1
#endif #endif

12
drivers/misc/mods/mods_mem.c
View File

@@ -2438,16 +2438,16 @@ static int mods_post_alloc(struct mods_client *client,
cl_error("kmap failed\n"); cl_error("kmap failed\n");
return -ENOMEM; return -ENOMEM;
} }
#if defined(MODS_HAS_TEGRA) && !defined(CONFIG_CPA) #ifdef CONFIG_X86
clear_contiguous_cache(client,
(u64)(size_t)ptr,
phys_addr + (i << PAGE_SHIFT),
PAGE_SIZE);
#else
if (p_mem_info->cache_type == MODS_ALLOC_WRITECOMBINE) if (p_mem_info->cache_type == MODS_ALLOC_WRITECOMBINE)
err = MODS_SET_MEMORY_WC((unsigned long)ptr, 1); err = MODS_SET_MEMORY_WC((unsigned long)ptr, 1);
else else
err = MODS_SET_MEMORY_UC((unsigned long)ptr, 1); err = MODS_SET_MEMORY_UC((unsigned long)ptr, 1);
#else
clear_contiguous_cache(client,
(u64)(size_t)ptr,
phys_addr + (i << PAGE_SHIFT),
PAGE_SIZE);
#endif #endif
kunmap(ptr); kunmap(ptr);
if (unlikely(err)) { if (unlikely(err)) {

2
include/uapi/misc/mods.h
View File

@@ -25,7 +25,7 @@
/* Driver version */ /* Driver version */
#define MODS_DRIVER_VERSION_MAJOR 4 #define MODS_DRIVER_VERSION_MAJOR 4
#define MODS_DRIVER_VERSION_MINOR 9 #define MODS_DRIVER_VERSION_MINOR 10
#define MODS_DRIVER_VERSION ((MODS_DRIVER_VERSION_MAJOR << 8) | \ #define MODS_DRIVER_VERSION ((MODS_DRIVER_VERSION_MAJOR << 8) | \
((MODS_DRIVER_VERSION_MINOR / 10) << 4) | \ ((MODS_DRIVER_VERSION_MINOR / 10) << 4) | \
(MODS_DRIVER_VERSION_MINOR % 10)) (MODS_DRIVER_VERSION_MINOR % 10))