misc: mods: fix compilation with k5.4

Clean up configuration in mods_config.h and make mods_config.h identical
to the official copy in Perforce.

Bug 200587200

Change-Id: I035119eb44025f45d8272729ebc5a918dd8da6fe
Signed-off-by: Chris Dragan <kdragan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2302436
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Chris Dragan
2020-02-26 04:17:32 -08:00
committed by Laxman Dewangan
parent b5b2def304
commit a85680cbc5
17 changed files with 104 additions and 74 deletions

View File

@@ -1,7 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* mods_config.h - This file is part of NVIDIA MODS kernel driver.
*
* Copyright (c) 2008-2018, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2008-2020, NVIDIA CORPORATION. All rights reserved.
*
* NVIDIA MODS kernel driver is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License,
@@ -20,45 +21,66 @@
#ifndef _MODS_CONFIG_H_
#define _MODS_CONFIG_H_
#define MODS_KERNEL_VERSION KERNEL_VERSION(4, 4, 0)
#define MODS_KERNEL_VERSION LINUX_VERSION_CODE
#define MODS_IRQ_HANDLE_NO_REGS 1
#define MODS_HAS_SET_MEMORY 1
#define MODS_ACPI_DEVID_64 1
#define MODS_HAS_WC 1
#define MODS_HAS_DEV_TO_NUMA_NODE 1
#define MODS_HAS_NEW_ACPI_WALK 1
#ifdef CONFIG_DEBUG_FS
#define MODS_HAS_DEBUGFS 1
#if KERNEL_VERSION(2, 6, 30) <= MODS_KERNEL_VERSION
# define MODS_HAS_DMA_OPS 1
#else
# define MODS_HASNT_PCI_RESCAN_BUS 1
#endif
#if defined(CONFIG_TEGRA_KFUSE)
#define MODS_HAS_KFUSE 1
#if KERNEL_VERSION(2, 6, 31) <= MODS_KERNEL_VERSION
# define MODS_HAS_IORESOURCE_MEM_64 1
#endif
#ifdef CONFIG_DMA_SHARED_BUFFER
#define MODS_HAS_DMABUF 1
#if KERNEL_VERSION(2, 6, 33) <= MODS_KERNEL_VERSION
# define MODS_HAS_NEW_ACPI_WALK 1
#else
# define MODS_HASNT_NUMA_NO_NODE 1
#endif
#define MODS_MULTI_INSTANCE_DEFAULT_VALUE 1
#define MODS_HAS_IORESOURCE_MEM_64 1
#undef MODS_HAS_NEW_ACPI_HANDLE /* new in 3.13 */
#if defined(CONFIG_ARCH_TEGRA)
#define MODS_TEGRA 1
#if KERNEL_VERSION(2, 6, 38) <= MODS_KERNEL_VERSION
# if defined(CONFIG_X86)
# define MODS_HAS_CONSOLE_LOCK 1
# endif
#endif
#if defined(CONFIG_COMMON_CLK) && defined(CONFIG_OF_RESOLVE) && \
defined(CONFIG_OF_DYNAMIC)
#define MODS_HAS_CLOCK 1
#if KERNEL_VERSION(3, 4, 0) > MODS_KERNEL_VERSION
# define MODS_HASNT_PCI_BUS_REMOVE_DEV 1
#endif
#ifdef CONFIG_NET
#define MODS_HAS_NET 1
#if KERNEL_VERSION(3, 8, 0) <= MODS_KERNEL_VERSION
# define MODS_HAS_NEW_ACPI_HANDLE 1
# define MODS_HAS_SRIOV 1
#endif
#ifdef CONFIG_ZONE_DMA32
#define MODS_HAS_DMA32 1
#if KERNEL_VERSION(3, 14, 0) <= MODS_KERNEL_VERSION
# define MODS_HAS_MSIX_RANGE 1
#else
# define MODS_HASNT_PCI_LOCK_RESCAN_REMOVE 1
#endif
#ifdef CONFIG_PCI
#define MODS_CAN_REGISTER_PCI_DEV 1
#if defined(CONFIG_ARM64) && \
KERNEL_VERSION(3, 15, 0) <= MODS_KERNEL_VERSION && \
KERNEL_VERSION(4, 14, 0) > MODS_KERNEL_VERSION
# define MODS_HAS_NONCOH_DMA_OPS 1
#endif
#if KERNEL_VERSION(3, 16, 0) <= MODS_KERNEL_VERSION && \
defined(CONFIG_VT_HW_CONSOLE_BINDING)
# define MODS_HAS_CONSOLE_BINDING 1
#endif
#if defined(CONFIG_PPC64) && KERNEL_VERSION(4, 5, 0) <= MODS_KERNEL_VERSION
# define MODS_HAS_PNV_PCI_GET_NPU_DEV 1
#endif
#if KERNEL_VERSION(4, 12, 0) <= MODS_KERNEL_VERSION && !defined(CONFIG_PPC64)
# define MODS_HAS_SET_MEMORY_HEADER 1
#endif
#if KERNEL_VERSION(4, 16, 0) > MODS_KERNEL_VERSION && defined(CONFIG_X86)
# define MODS_HAS_MAP_SG_ATTRS
#endif
#define MODS_HAS_MSIX_RANGE 1
#define MODS_HAS_SRIOV 1
#endif /* _MODS_CONFIG_H_ */
/* vim: set ts=8 sw=8 noet: */