From 7ac0b046a538daa1a3532d3d5ae7cba1ef3295ba Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 30 Aug 2018 14:05:16 -0700 Subject: gpu: nvgpu: Move MC HAL to common Move implementation of MC HAL to common/mc. Also bump gk20a implementation to gm20b. gk20a_mc_boot_0 was used via a HAL, but we have only one possible implementation. It also has to be anyway called directly to detect which HALs to assign, so make it a true common function. mc_gk20a_handle_intr_nonstall was also used only in os/linux/intr.c so move it there. JIRA NVGPU-954 Change-Id: I79aedc9158f90d578db0edc17b714617b52690ac Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1813519 Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: Konsta Holtta Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/mc_gk20a.h | 48 -------------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 drivers/gpu/nvgpu/gk20a/mc_gk20a.h (limited to 'drivers/gpu/nvgpu/gk20a/mc_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.h b/drivers/gpu/nvgpu/gk20a/mc_gk20a.h deleted file mode 100644 index 0dfdf906..00000000 --- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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. - */ - -#ifndef MC_GK20A_H -#define MC_GK20A_H -struct gk20a; - -void mc_gk20a_intr_mask(struct gk20a *g); -void mc_gk20a_intr_enable(struct gk20a *g); -void mc_gk20a_intr_unit_config(struct gk20a *g, bool enable, - bool is_stalling, u32 mask); -void mc_gk20a_isr_stall(struct gk20a *g); -u32 mc_gk20a_intr_stall(struct gk20a *g); -void mc_gk20a_intr_stall_pause(struct gk20a *g); -void mc_gk20a_intr_stall_resume(struct gk20a *g); -u32 mc_gk20a_intr_nonstall(struct gk20a *g); -u32 mc_gk20a_isr_nonstall(struct gk20a *g); -void mc_gk20a_intr_nonstall_pause(struct gk20a *g); -void mc_gk20a_intr_nonstall_resume(struct gk20a *g); -void gk20a_mc_enable(struct gk20a *g, u32 units); -void gk20a_mc_disable(struct gk20a *g, u32 units); -void gk20a_mc_reset(struct gk20a *g, u32 units); -u32 gk20a_mc_boot_0(struct gk20a *g, u32 *arch, u32 *impl, u32 *rev); -bool mc_gk20a_is_intr1_pending(struct gk20a *g, - enum nvgpu_unit unit, u32 mc_intr_1); -void mc_gk20a_log_pending_intrs(struct gk20a *g); -void mc_gk20a_handle_intr_nonstall(struct gk20a *g, u32 ops); - -#endif /* MC_GK20A_H */ -- cgit v1.2.2