From fe3e6a00b55bc6aaa10df4f881317325482cbb42 Mon Sep 17 00:00:00 2001 From: Prateek sethi Date: Thu, 26 Nov 2020 14:57:21 +0530 Subject: [PATCH] gpu: nvgpu: compile out NON FUSA IO APIs Patch removes declarations for IO NON FUSA APIs. Jira NVGPU-6238 Change-Id: Iea52d6c0a54b65bebe92b6abfeb8e585963631d0 Signed-off-by: Prateek sethi Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2451361 (cherry picked from commit 66446f0ce2d9b65e48201400ca09eaa625026384) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2460379 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: Rajesh Devaraj Reviewed-by: Vaibhav Kachore Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/io.h | 4 ++++ drivers/gpu/nvgpu/os/posix/posix-io.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/nvgpu/include/nvgpu/io.h b/drivers/gpu/nvgpu/include/nvgpu/io.h index 822443c7c..c5cef7c07 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/io.h +++ b/drivers/gpu/nvgpu/include/nvgpu/io.h @@ -55,6 +55,7 @@ struct gk20a; */ void nvgpu_writel(struct gk20a *g, u32 r, u32 v); +#ifdef CONFIG_NVGPU_DGPU /** * @brief Write a value to GPU register without an ordering constraint. * @@ -69,6 +70,7 @@ void nvgpu_writel(struct gk20a *g, u32 r, u32 v); * @return None. */ void nvgpu_writel_relaxed(struct gk20a *g, u32 r, u32 v); +#endif /** * @brief Read a value from a GPU register. @@ -112,6 +114,7 @@ u32 nvgpu_readl_impl(struct gk20a *g, u32 r); */ void nvgpu_writel_check(struct gk20a *g, u32 r, u32 v); +#ifdef CONFIG_NVGPU_NON_FUSA /** * @brief Ensure write to a GPU register. * @@ -125,6 +128,7 @@ void nvgpu_writel_check(struct gk20a *g, u32 r, u32 v); * @return None. */ void nvgpu_writel_loop(struct gk20a *g, u32 r, u32 v); +#endif /** * @brief Write a value to an already mapped bar1 io-region. diff --git a/drivers/gpu/nvgpu/os/posix/posix-io.c b/drivers/gpu/nvgpu/os/posix/posix-io.c index ce05b9e7b..202193acc 100644 --- a/drivers/gpu/nvgpu/os/posix/posix-io.c +++ b/drivers/gpu/nvgpu/os/posix/posix-io.c @@ -76,10 +76,12 @@ void nvgpu_writel(struct gk20a *g, u32 r, u32 v) callbacks->writel(g, &access); } +#ifdef CONFIG_NVGPU_DGPU void nvgpu_writel_relaxed(struct gk20a *g, u32 r, u32 v) { nvgpu_writel(g, r, v); } +#endif u32 nvgpu_readl(struct gk20a *g, u32 r) { @@ -107,10 +109,12 @@ u32 nvgpu_readl(struct gk20a *g, u32 r) return access.value; } +#ifdef CONFIG_NVGPU_NON_FUSA void nvgpu_writel_loop(struct gk20a *g, u32 r, u32 v) { BUG(); } +#endif u32 nvgpu_readl_impl(struct gk20a *g, u32 r) {