From b4c6c5f2a436337fb8da14fa067b6d2f0959f109 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Fri, 25 Oct 2024 01:58:26 +0000 Subject: [PATCH] tegra-pcie-dma: Disable CONFIG_PCIE_TEGRA_DMA for non-supported kernel Disable CONFIG_PCIE_TEGRA_DMA for few kernel like jammy-src, stable and rhivos-1 where PCIE_TEGRA_DMA is not supported. Bug 4911768 Change-Id: I4c3a379a2bc9facff2744ae83300f3e12587ec17 Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3237170 GVS: buildbot_gerritrpt --- configs/Makefile.config.jammy-src | 1 + configs/Makefile.config.rhivos-1 | 1 + configs/Makefile.config.stable | 1 + include/linux/tegra-pcie-dma.h | 2 ++ 4 files changed, 5 insertions(+) diff --git a/configs/Makefile.config.jammy-src b/configs/Makefile.config.jammy-src index 8e050f17..4ae92e39 100644 --- a/configs/Makefile.config.jammy-src +++ b/configs/Makefile.config.jammy-src @@ -4,3 +4,4 @@ # Kernel jammy-src specific environment variables to configure the OOT modules export NV_OOT_PCIE_T264_SOC_SKIP_BUILD=y +subdir-ccflags-y += -DNV_CONFIG_PCIE_TEGRA_DMA_DISABLE diff --git a/configs/Makefile.config.rhivos-1 b/configs/Makefile.config.rhivos-1 index a22d5bad..410b36c1 100644 --- a/configs/Makefile.config.rhivos-1 +++ b/configs/Makefile.config.rhivos-1 @@ -8,3 +8,4 @@ export NV_OOT_REALTEK_R8168_SKIP_BUILD=y export NV_OOT_REALTEK_RTL8822CE_SKIP_BUILD=y export NV_OOT_PCIE_T264_SOC_SKIP_BUILD=y export NV_OOT_REALTEK_RTL8852CE_SKIP_BUILD=y +subdir-ccflags-y += -DNV_CONFIG_PCIE_TEGRA_DMA_DISABLE diff --git a/configs/Makefile.config.stable b/configs/Makefile.config.stable index 2b88b423..e68a13a1 100644 --- a/configs/Makefile.config.stable +++ b/configs/Makefile.config.stable @@ -4,3 +4,4 @@ # Kernel stable specific environment variables to configure the OOT modules export NV_OOT_PCIE_T264_SOC_SKIP_BUILD=y +subdir-ccflags-y += -DNV_CONFIG_PCIE_TEGRA_DMA_DISABLE diff --git a/include/linux/tegra-pcie-dma.h b/include/linux/tegra-pcie-dma.h index e5d8702e..5661dec8 100644 --- a/include/linux/tegra-pcie-dma.h +++ b/include/linux/tegra-pcie-dma.h @@ -20,8 +20,10 @@ #define TEGRA264_PCIE_DMA_MSI_LOCAL_VEC 4 #define TEGRA264_PCIE_DMA_MSI_REMOTE_VEC 5 +#ifndef NV_CONFIG_PCIE_TEGRA_DMA_DISABLE /** Enable generic PCIe DMA driver */ #define CONFIG_PCIE_TEGRA_DMA 1 +#endif /** * @brief typedef to define various values for xfer status passed for dma_complete_t or