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

gpu: nvgpu: add support for ACB SLCG on gv11b

Browse Source 
Register list for ACB SLCG is auto generated with scripts.
Add HAL operations to enable/disable ACB clock gating.

Cherry-pick/manually port from dev-main

Bug 200647909

Change-Id: I4be4c14cc072fcccd91031a5a40321f5ff11f549
Signed-off-by: Prateek sethi <prsethi@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2420355
(cherry picked from commit c7c04d3a28c2eb0edc8e015dd0130fa50d3496c7)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2434464
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Rajesh Devaraj <rdevaraj@nvidia.com>
Reviewed-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-by: Phoenix Jung <pjung@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
prsethi
2020-10-18 19:16:00 +00:00
committed by mobile promotions
parent 5a948ccca9
commit 8cb168632b
5 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2014-2020, 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"),
@@ -162,6 +162,11 @@ static const struct gating_desc gv11b_slcg_hshub[] = {
{.addr = 0x001fbbf4U, .prod = 0x00000000U, .disable = 0xfffffffeU},
};
/* slcg Acb */
static const struct gating_desc gv11b_slcg_acb[] = {
{.addr = 0x0010e48cU, .prod = 0x00000038U, .disable = 0x0000003eU},
};
/* blcg bus */
static const struct gating_desc gv11b_blcg_bus[] = {
{.addr = 0x00001c00U, .prod = 0x00000042U, .disable = 0x00000000U},
@@ -513,6 +518,22 @@ void gv11b_slcg_hshub_load_gating_prod(struct gk20a *g,
}
}
void gv11b_slcg_acb_load_gating_prod(struct gk20a *g,
bool prod)
{
u32 i;
u32 size = (u32)(sizeof(gv11b_slcg_acb) / GATING_DESC_SIZE);
if (nvgpu_is_enabled(g, NVGPU_GPU_CAN_SLCG)) {
for (i = 0; i < size; i++) {
u32 reg = gv11b_slcg_acb[i].addr;
u32 val = prod ? gv11b_slcg_acb[i].prod :
gv11b_slcg_acb[i].disable;
gk20a_writel(g, reg, val);
}
}
}
void gv11b_blcg_bus_load_gating_prod(struct gk20a *g,
bool prod)
{

5
drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2019, NVIDIA Corporation. All rights reserved.
* Copyright (c) 2016-2020, 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"),
@@ -72,6 +72,9 @@ void gv11b_slcg_xbar_load_gating_prod(struct gk20a *g,
void gv11b_slcg_hshub_load_gating_prod(struct gk20a *g,
bool prod);
void gv11b_slcg_acb_load_gating_prod(struct gk20a *g,
bool prod);
void gv11b_blcg_bus_load_gating_prod(struct gk20a *g,
bool prod);

6
drivers/gpu/nvgpu/gk20a/gk20a.c
View File

@@ -1,7 +1,7 @@
/*
* GK20A Graphics
*
* Copyright (c) 2011-2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2011-2020, 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"),
@@ -145,6 +145,10 @@ int gk20a_finalize_poweron(struct gk20a *g)
g->gpu_reset_done = true;
}
if (g->ops.clock_gating.slcg_acb_load_gating_prod != NULL) {
g->ops.clock_gating.slcg_acb_load_gating_prod(g, true);
}
/*
* Do this early so any early VMs that get made are capable of mapping
* buffers.

2
drivers/gpu/nvgpu/gv11b/hal_gv11b.c
View File

@@ -533,6 +533,8 @@ static const struct gpu_ops gv11b_ops = {
gv11b_slcg_xbar_load_gating_prod,
.slcg_hshub_load_gating_prod =
gv11b_slcg_hshub_load_gating_prod,
.slcg_acb_load_gating_prod =
gv11b_slcg_acb_load_gating_prod,
.blcg_bus_load_gating_prod =
gv11b_blcg_bus_load_gating_prod,
.blcg_ce_load_gating_prod =

1
drivers/gpu/nvgpu/include/nvgpu/gk20a.h
View File

@@ -623,6 +623,7 @@ struct gpu_ops {
void (*slcg_therm_load_gating_prod)(struct gk20a *g, bool prod);
void (*slcg_xbar_load_gating_prod)(struct gk20a *g, bool prod);
void (*slcg_hshub_load_gating_prod)(struct gk20a *g, bool prod);
void (*slcg_acb_load_gating_prod)(struct gk20a *g, bool prod);
void (*blcg_bus_load_gating_prod)(struct gk20a *g, bool prod);
void (*blcg_ce_load_gating_prod)(struct gk20a *g, bool prod);
void (*blcg_ctxsw_firmware_load_gating_prod)(struct gk20a *g, bool prod);