From b25e80150e9fe11c773c86a533d681580134932a Mon Sep 17 00:00:00 2001 From: Chris Dragan Date: Tue, 19 Jul 2022 01:32:12 -0700 Subject: [PATCH] misc: mods: update from Perforce Change-Id: I50cacf7e5f16a8d0a087becf984c28a2ba516d43 Signed-off-by: Chris Dragan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2747397 Reviewed-by: Sachin Nikam GVS: Gerrit_Virtual_Submit --- drivers/misc/mods/Makefile | 1 + drivers/misc/mods/mods_config.h | 4 ---- drivers/misc/mods/mods_mem.c | 12 ++++++------ include/uapi/misc/mods.h | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/misc/mods/Makefile b/drivers/misc/mods/Makefile index 868cba72..0195ea4a 100644 --- a/drivers/misc/mods/Makefile +++ b/drivers/misc/mods/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 ccflags-y += -I$(srctree.nvidia)/include +ccflags-y += -DMODS_HAS_TEGRA ifeq ($(CONFIG_TEGRA_OOT_MODULE),m) CONFIG_MODS := m diff --git a/drivers/misc/mods/mods_config.h b/drivers/misc/mods/mods_config.h index 46a8caca..1f80911b 100644 --- a/drivers/misc/mods/mods_config.h +++ b/drivers/misc/mods/mods_config.h @@ -108,10 +108,6 @@ # define MODS_HAS_ACPI_FETCH 1 #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 # define MODS_ENABLE_BPMP_MRQ_API 1 #endif diff --git a/drivers/misc/mods/mods_mem.c b/drivers/misc/mods/mods_mem.c index f00aac88..54799a0f 100644 --- a/drivers/misc/mods/mods_mem.c +++ b/drivers/misc/mods/mods_mem.c @@ -2438,16 +2438,16 @@ static int mods_post_alloc(struct mods_client *client, cl_error("kmap failed\n"); return -ENOMEM; } -#if defined(MODS_HAS_TEGRA) && !defined(CONFIG_CPA) - clear_contiguous_cache(client, - (u64)(size_t)ptr, - phys_addr + (i << PAGE_SHIFT), - PAGE_SIZE); -#else +#ifdef CONFIG_X86 if (p_mem_info->cache_type == MODS_ALLOC_WRITECOMBINE) err = MODS_SET_MEMORY_WC((unsigned long)ptr, 1); else 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 kunmap(ptr); if (unlikely(err)) { diff --git a/include/uapi/misc/mods.h b/include/uapi/misc/mods.h index eba8f607..bd9f326b 100644 --- a/include/uapi/misc/mods.h +++ b/include/uapi/misc/mods.h @@ -25,7 +25,7 @@ /* Driver version */ #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) | \ ((MODS_DRIVER_VERSION_MINOR / 10) << 4) | \ (MODS_DRIVER_VERSION_MINOR % 10))