nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: create common sim reg accessors

Browse Source 
sim reg accessors is common after it moved to use os abstract layer reg
accessors.

Bug 2999617

Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Change-Id: I1c0ff7ca1724cde09dd845c077763709ea2ef915
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2517383
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Richard Zhao
2021-03-14 12:03:30 -07:00
committed by mobile promotions
parent 86cb03d2f1
commit ab6d4fa543
8 changed files with 28 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/gpu/nvgpu/os/linux/sim.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2018-2021, 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,
@@ -32,22 +32,6 @@
#include "os_linux.h"
#include "module.h"
void sim_writel(struct sim_nvgpu *sim, u32 r, u32 v)
{
struct sim_nvgpu_linux *sim_linux =
container_of(sim, struct sim_nvgpu_linux, sim);
writel(v, sim_linux->regs + r);
}
u32 sim_readl(struct sim_nvgpu *sim, u32 r)
{
struct sim_nvgpu_linux *sim_linux =
container_of(sim, struct sim_nvgpu_linux, sim);
return readl(sim_linux->regs + r);
}
void nvgpu_remove_sim_support_linux(struct gk20a *g)
{
struct sim_nvgpu_linux *sim_linux;
@@ -56,10 +40,10 @@ void nvgpu_remove_sim_support_linux(struct gk20a *g)
return;
sim_linux = container_of(g->sim, struct sim_nvgpu_linux, sim);
if (sim_linux->regs) {
if (g->sim->regs) {
sim_writel(g->sim, sim_config_r(), sim_config_mode_disabled_v());
iounmap(sim_linux->regs);
sim_linux->regs = NULL;
iounmap((void __iomem *)g->sim->regs);
g->sim->regs = 0U;
}
nvgpu_kfree(g, sim_linux);
g->sim = NULL;
@@ -69,6 +53,7 @@ int nvgpu_init_sim_support_linux(struct gk20a *g,
struct platform_device *dev)
{
struct sim_nvgpu_linux *sim_linux;
void __iomem *addr;
int err = -ENOMEM;
if (!nvgpu_platform_is_simulation(g))
@@ -79,14 +64,15 @@ int nvgpu_init_sim_support_linux(struct gk20a *g,
return err;
g->sim = &sim_linux->sim;
g->sim->g = g;
sim_linux->regs = nvgpu_devm_ioremap_resource(dev,
GK20A_SIM_IORESOURCE_MEM,
&sim_linux->reg_mem);
if (IS_ERR(sim_linux->regs)) {
addr = nvgpu_devm_ioremap_resource(dev,
GK20A_SIM_IORESOURCE_MEM,
NULL);
if (IS_ERR(addr)) {
nvgpu_err(g, "failed to remap gk20a sim regs");
err = PTR_ERR(sim_linux->regs);
err = PTR_ERR(addr);
goto fail;
}
g->sim->regs = (uintptr_t)addr;
sim_linux->remove_support_linux = nvgpu_remove_sim_support_linux;
return 0;