From 2dbf961365822e38ac6b7266388fcfa503f6e52f Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 6 Apr 2018 14:16:10 -0700 Subject: gpu: nvgpu: Move bus HAL to common Move implementation of bus HAL to common/bus. Change-Id: Ia89350f9d94f3ccfd5500a340e6a677cd7d4cfaa Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1726337 GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gm20b/bus_gm20b.c | 67 ------------------------------------- drivers/gpu/nvgpu/gm20b/bus_gm20b.h | 33 ------------------ drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 4 +-- 3 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 drivers/gpu/nvgpu/gm20b/bus_gm20b.c delete mode 100644 drivers/gpu/nvgpu/gm20b/bus_gm20b.h (limited to 'drivers/gpu/nvgpu/gm20b') diff --git a/drivers/gpu/nvgpu/gm20b/bus_gm20b.c b/drivers/gpu/nvgpu/gm20b/bus_gm20b.c deleted file mode 100644 index ca2a40bf..00000000 --- a/drivers/gpu/nvgpu/gm20b/bus_gm20b.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * GM20B MMU - * - * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include -#include -#include -#include - -#include "bus_gm20b.h" -#include "gk20a/gk20a.h" -#include "gk20a/bus_gk20a.h" - -#include - -int gm20b_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst) -{ - struct nvgpu_timeout timeout; - int err = 0; - u64 iova = nvgpu_inst_block_addr(g, bar1_inst); - u32 ptr_v = (u32)(iova >> bus_bar1_block_ptr_shift_v()); - - nvgpu_log_info(g, "bar1 inst block ptr: 0x%08x", ptr_v); - - gk20a_writel(g, bus_bar1_block_r(), - nvgpu_aperture_mask(g, bar1_inst, - bus_bar1_block_target_sys_mem_ncoh_f(), - bus_bar1_block_target_sys_mem_coh_f(), - bus_bar1_block_target_vid_mem_f()) | - bus_bar1_block_mode_virtual_f() | - bus_bar1_block_ptr_f(ptr_v)); - nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); - do { - u32 val = gk20a_readl(g, bus_bind_status_r()); - u32 pending = bus_bind_status_bar1_pending_v(val); - u32 outstanding = bus_bind_status_bar1_outstanding_v(val); - if (!pending && !outstanding) - break; - - nvgpu_udelay(5); - } while (!nvgpu_timeout_expired(&timeout)); - - if (nvgpu_timeout_peek_expired(&timeout)) - err = -EINVAL; - - return err; -} diff --git a/drivers/gpu/nvgpu/gm20b/bus_gm20b.h b/drivers/gpu/nvgpu/gm20b/bus_gm20b.h deleted file mode 100644 index 961b906a..00000000 --- a/drivers/gpu/nvgpu/gm20b/bus_gm20b.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * GM20B BUS - * - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef _NVGPU_GM20B_BUS -#define _NVGPU_GM20B_BUS - -struct gk20a; -struct nvgpu_mem; - -int gm20b_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst); - -#endif diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index f96c576b..ccceab03 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -23,6 +23,8 @@ */ #include "common/clock_gating/gm20b_gating_reglist.h" +#include "common/bus/bus_gm20b.h" +#include "common/bus/bus_gk20a.h" #include "gk20a/gk20a.h" #include "gk20a/ce2_gk20a.h" @@ -33,7 +35,6 @@ #include "gk20a/mm_gk20a.h" #include "gk20a/css_gr_gk20a.h" #include "gk20a/mc_gk20a.h" -#include "gk20a/bus_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/priv_ring_gk20a.h" #include "gk20a/regops_gk20a.h" @@ -52,7 +53,6 @@ #include "clk_gm20b.h" #include "regops_gm20b.h" #include "therm_gm20b.h" -#include "bus_gm20b.h" #include "hal_gm20b.h" #include "acr_gm20b.h" #include "fuse_gm20b.h" -- cgit v1.2.2