From 2a2c16af5f9f1ccfc93a13e820d5381e5c881e92 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 18 Apr 2018 12:59:00 -0700 Subject: gpu: nvgpu: Move Linux files away from common Move all Linux source code files to drivers/gpu/nvgpu/os/linux from drivers/gpu/nvgpu/common/linux. This changes the meaning of common to be OS independent. JIRA NVGPU-598 JIRA NVGPU-601 Change-Id: Ib7f2a43d3688bb0d0b7dcc48469a6783fd988ce9 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1747714 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/intr.c | 122 ---------------------------------- 1 file changed, 122 deletions(-) delete mode 100644 drivers/gpu/nvgpu/common/linux/intr.c (limited to 'drivers/gpu/nvgpu/common/linux/intr.c') diff --git a/drivers/gpu/nvgpu/common/linux/intr.c b/drivers/gpu/nvgpu/common/linux/intr.c deleted file mode 100644 index 7ffc7e87..00000000 --- a/drivers/gpu/nvgpu/common/linux/intr.c +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - */ - -#include -#include - -#include "gk20a/gk20a.h" -#include "gk20a/mc_gk20a.h" - -#include -#include -#include "os_linux.h" - -irqreturn_t nvgpu_intr_stall(struct gk20a *g) -{ - struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); - u32 mc_intr_0; - - trace_mc_gk20a_intr_stall(g->name); - - if (!g->power_on) - return IRQ_NONE; - - /* not from gpu when sharing irq with others */ - mc_intr_0 = g->ops.mc.intr_stall(g); - if (unlikely(!mc_intr_0)) - return IRQ_NONE; - - g->ops.mc.intr_stall_pause(g); - - atomic_inc(&l->hw_irq_stall_count); - - trace_mc_gk20a_intr_stall_done(g->name); - - return IRQ_WAKE_THREAD; -} - -irqreturn_t nvgpu_intr_thread_stall(struct gk20a *g) -{ - struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); - int hw_irq_count; - - nvgpu_log(g, gpu_dbg_intr, "interrupt thread launched"); - - trace_mc_gk20a_intr_thread_stall(g->name); - - hw_irq_count = atomic_read(&l->hw_irq_stall_count); - g->ops.mc.isr_stall(g); - g->ops.mc.intr_stall_resume(g); - /* sync handled irq counter before re-enabling interrupts */ - atomic_set(&l->sw_irq_stall_last_handled, hw_irq_count); - - nvgpu_cond_broadcast(&l->sw_irq_stall_last_handled_wq); - - trace_mc_gk20a_intr_thread_stall_done(g->name); - - return IRQ_HANDLED; -} - -irqreturn_t nvgpu_intr_nonstall(struct gk20a *g) -{ - u32 non_stall_intr_val; - u32 hw_irq_count; - int ops_old, ops_new, ops = 0; - struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); - - if (!g->power_on) - return IRQ_NONE; - - /* not from gpu when sharing irq with others */ - non_stall_intr_val = g->ops.mc.intr_nonstall(g); - if (unlikely(!non_stall_intr_val)) - return IRQ_NONE; - - g->ops.mc.intr_nonstall_pause(g); - - ops = g->ops.mc.isr_nonstall(g); - if (ops) { - do { - ops_old = atomic_read(&l->nonstall_ops); - ops_new = ops_old | ops; - } while (ops_old != atomic_cmpxchg(&l->nonstall_ops, - ops_old, ops_new)); - - queue_work(l->nonstall_work_queue, &l->nonstall_fn_work); - } - - hw_irq_count = atomic_inc_return(&l->hw_irq_nonstall_count); - - /* sync handled irq counter before re-enabling interrupts */ - atomic_set(&l->sw_irq_nonstall_last_handled, hw_irq_count); - - g->ops.mc.intr_nonstall_resume(g); - - nvgpu_cond_broadcast(&l->sw_irq_nonstall_last_handled_wq); - - return IRQ_HANDLED; -} - -void nvgpu_intr_nonstall_cb(struct work_struct *work) -{ - struct nvgpu_os_linux *l = - container_of(work, struct nvgpu_os_linux, nonstall_fn_work); - struct gk20a *g = &l->g; - - do { - u32 ops; - - ops = atomic_xchg(&l->nonstall_ops, 0); - mc_gk20a_handle_intr_nonstall(g, ops); - } while (atomic_read(&l->nonstall_ops) != 0); -} -- cgit v1.2.2