From 719d3fa0248e567c0ac68346e65f39737f19a0cb Mon Sep 17 00:00:00 2001 From: Jian-Min Liu Date: Wed, 23 Aug 2023 13:06:31 +0000 Subject: [PATCH] nvidia-oot: use TEGRA_SYSTEM_TYPE_ACK as ack macro Use config TEGRA_SYSTEM_TYPE_ACK to control kernel builds only base on the system type which also aliged to Makefile use. Bug 4223187 Change-Id: I276208d180d1b3459eccb80d8fdb818f4507d3df Signed-off-by: Jian-Min Liu Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2966713 Reviewed-by: Laxman Dewangan GVS: Gerrit_Virtual_Submit --- Makefile | 2 +- drivers/gpu/drm/tegra/gem.c | 4 ++-- drivers/misc/nvscic2c-pcie/endpoint.c | 2 +- drivers/misc/nvscic2c-pcie/stream-extensions.c | 4 ++-- drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c | 2 +- drivers/net/wireless/realtek/rtl8822ce/os_dep/osdep_service.c | 2 +- drivers/video/tegra/nvmap/nvmap_dmabuf.c | 2 +- drivers/video/tegra/nvmap/nvmap_ioctl.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 4947798f..3a4090fc 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ subdir-ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION endif ifeq ($(CONFIG_TEGRA_SYSTEM_TYPE_ACK),y) -subdir-ccflags-y += -DNV_BUILD_KERNEL_ACK +subdir-ccflags-y += -DCONFIG_TEGRA_SYSTEM_TYPE_ACK subdir-ccflags-y += -Wno-sometimes-uninitialized subdir-ccflags-y += -Wno-parentheses-equality subdir-ccflags-y += -Wno-enum-conversion diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 13eaa62f..d960aff9 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -585,7 +585,7 @@ int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma) * to 0 as we want to map the whole buffer. */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) \ - || (defined(NV_BUILD_KERNEL_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))) + || (defined(CONFIG_TEGRA_SYSTEM_TYPE_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))) vm_flags_clear(vma, VM_PFNMAP); #else vma->vm_flags &= ~VM_PFNMAP; @@ -604,7 +604,7 @@ int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma) pgprot_t prot = vm_get_page_prot(vma->vm_flags); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) \ - || (defined(NV_BUILD_KERNEL_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))) + || (defined(CONFIG_TEGRA_SYSTEM_TYPE_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))) vm_flags_set(vma, VM_MIXEDMAP); vm_flags_clear(vma, VM_PFNMAP); #else diff --git a/drivers/misc/nvscic2c-pcie/endpoint.c b/drivers/misc/nvscic2c-pcie/endpoint.c index 134b361a..5e5d61ac 100644 --- a/drivers/misc/nvscic2c-pcie/endpoint.c +++ b/drivers/misc/nvscic2c-pcie/endpoint.c @@ -343,7 +343,7 @@ endpoint_fops_mmap(struct file *filp, struct vm_area_struct *vma) } vma->vm_pgoff = 0; -#if defined(NV_BUILD_KERNEL_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) +#if defined(CONFIG_TEGRA_SYSTEM_TYPE_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) vm_flags_set(vma, VM_DONTCOPY); #else vma->vm_flags |= (VM_DONTCOPY); // fork() not supported. diff --git a/drivers/misc/nvscic2c-pcie/stream-extensions.c b/drivers/misc/nvscic2c-pcie/stream-extensions.c index a9011ff0..cad14962 100644 --- a/drivers/misc/nvscic2c-pcie/stream-extensions.c +++ b/drivers/misc/nvscic2c-pcie/stream-extensions.c @@ -27,7 +27,7 @@ #include "stream-extensions.h" #include "vmap.h" -#ifdef NV_BUILD_KERNEL_ACK +#if defined(CONFIG_TEGRA_SYSTEM_TYPE_ACK) MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); #endif @@ -294,7 +294,7 @@ fops_mmap(struct file *filep, struct vm_area_struct *vma) memaddr = stream_obj->aper; vma->vm_pgoff = 0; -#if defined(NV_BUILD_KERNEL_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) +#if defined(CONFIG_TEGRA_SYSTEM_TYPE_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) vm_flags_set(vma, VM_DONTCOPY); #else vma->vm_flags |= (VM_DONTCOPY); diff --git a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c index 78fc87e0..40389258 100755 --- a/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c +++ b/drivers/net/wireless/realtek/rtl8822ce/core/rtw_wlan_util.c @@ -26,7 +26,7 @@ #define IPv6_PROTOCOL_OFFSET 20 #endif -#ifdef NV_BUILD_KERNEL_ACK +#if defined(CONFIG_TEGRA_SYSTEM_TYPE_ACK) MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); #endif diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/osdep_service.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/osdep_service.c index ceb6ed8c..659d1940 100644 --- a/drivers/net/wireless/realtek/rtl8822ce/os_dep/osdep_service.c +++ b/drivers/net/wireless/realtek/rtl8822ce/os_dep/osdep_service.c @@ -27,7 +27,7 @@ atomic_t _malloc_size = ATOMIC_INIT(0); #endif #endif /* DBG_MEMORY_LEAK */ -#ifdef NV_BUILD_KERNEL_ACK +#if defined(CONFIG_TEGRA_SYSTEM_TYPE_ACK) MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); #endif diff --git a/drivers/video/tegra/nvmap/nvmap_dmabuf.c b/drivers/video/tegra/nvmap/nvmap_dmabuf.c index 4eb9423e..fd2d2b83 100644 --- a/drivers/video/tegra/nvmap/nvmap_dmabuf.c +++ b/drivers/video/tegra/nvmap/nvmap_dmabuf.c @@ -451,7 +451,7 @@ int __nvmap_map(struct nvmap_handle *h, struct vm_area_struct *vma) priv->handle = h; #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) \ - || (defined(NV_BUILD_KERNEL_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))) + || (defined(CONFIG_TEGRA_SYSTEM_TYPE_ACK) && (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))) vm_flags_set(vma, VM_SHARED | VM_DONTEXPAND | VM_DONTDUMP | VM_DONTCOPY | (h->heap_pgalloc ? 0 : VM_PFNMAP)); diff --git a/drivers/video/tegra/nvmap/nvmap_ioctl.c b/drivers/video/tegra/nvmap/nvmap_ioctl.c index fd8d9248..c3d34102 100644 --- a/drivers/video/tegra/nvmap/nvmap_ioctl.c +++ b/drivers/video/tegra/nvmap/nvmap_ioctl.c @@ -44,7 +44,7 @@ #endif /* !NVMAP_LOADABLE_MODULE */ #endif -#ifdef NV_BUILD_KERNEL_ACK +#if defined(CONFIG_TEGRA_SYSTEM_TYPE_ACK) MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); #endif