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: Fix leaf and top interrupt disabling logic

Browse Source 
There are 2 issues here:
1. top_en register is being masked for each leaf level
interrupt disable operation. top_en bit should be disabled
as part of top level stall operation only.
2. Wrong mask is being calculated to disable the leaf_en bits
for a unit which inturn affects the entire subtree.
Subtree_mask_restore for a subtree stores the last state
of interrupts that are enabled. As part of disable operation,
we only need to update subtree_mask_restore and not reupdate
subtree_mask for that subtree. Same logic applies to enable
operation.

Renamed the apis to better reflect their operation. The
interrupt disabling is done at unit level and not subtree level.

Bug 3712884

Change-Id: Id840c77f612021a303cfe0e8dca69386bc570273
Signed-off-by: Kishan <kpalankar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2752541
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2758138
Reviewed-by: Tejal Kudav <tkudav@nvidia.com>
Reviewed-by: Vaibhav Kachore <vkachore@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Kishan
2022-07-28 12:17:44 +00:00
committed by mobile promotions
parent eb5d644536
commit cc1081e223
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/nvgpu/hal/mc/mc_intr_ga10b_fusa.c
View File

@@ -111,21 +111,22 @@ static void ga10b_intr_subtree_clear(struct gk20a *g, u32 subtree,
subtree, subtree_mask); subtree, subtree_mask);
} }
static void ga10b_intr_subtree_enable(struct gk20a *g, u32 subtree, static void ga10b_intr_unit_enable(struct gk20a *g, u32 subtree,
u64 subtree_mask) u64 subtree_mask)
{ {
/** /**
* Enable interrupts in Top and Leaf registers for the subtree. * Enable interrupts in Top & Leaf registers for the subtree.
* top bit 0 -> subtree 0 -> leaf0, leaf1 -> leaf 0, 1 * top bit 0 -> subtree 0 -> leaf0, leaf1 -> leaf 0, 1
* top bit 1 -> subtree 1 -> leaf0, leaf1 -> leaf 2, 3 * top bit 1 -> subtree 1 -> leaf0, leaf1 -> leaf 2, 3
* top bit 2 -> subtree 2 -> leaf0, leaf1 -> leaf 4, 5 * top bit 2 -> subtree 2 -> leaf0, leaf1 -> leaf 4, 5
* top bit 3 -> subtree 3 -> leaf0, leaf1 -> leaf 6, 7 * top bit 3 -> subtree 3 -> leaf0, leaf1 -> leaf 6, 7
*/ */
//TODO top_en manipulation needs to be decoupled from leaf_en enablement
//process.
nvgpu_func_writel(g, nvgpu_func_writel(g,
func_priv_cpu_intr_top_en_set_r( func_priv_cpu_intr_top_en_set_r(
HOST2SOC_SUBTREE_TO_TOP_IDX(subtree)), HOST2SOC_SUBTREE_TO_TOP_IDX(subtree)),
BIT32(HOST2SOC_SUBTREE_TO_TOP_BIT(subtree))); BIT32(HOST2SOC_SUBTREE_TO_TOP_BIT(subtree)));
nvgpu_func_writel(g, nvgpu_func_writel(g,
func_priv_cpu_intr_leaf_en_set_r( func_priv_cpu_intr_leaf_en_set_r(
HOST2SOC_SUBTREE_TO_LEAF0(subtree)), HOST2SOC_SUBTREE_TO_LEAF0(subtree)),
@@ -139,21 +140,16 @@ static void ga10b_intr_subtree_enable(struct gk20a *g, u32 subtree,
subtree, subtree_mask); subtree, subtree_mask);
} }
static void ga10b_intr_subtree_disable(struct gk20a *g, u32 subtree, static void ga10b_intr_unit_disable(struct gk20a *g, u32 subtree,
u64 subtree_mask) u64 subtree_mask)
{ {
/** /**
* Disable interrupts in Top and Leaf registers for the subtree. * Disable unit specific Leaf interrupt registers for the subtree.
* top bit 0 -> subtree 0 -> leaf0, leaf1 -> leaf 0, 1 * top bit 0 -> subtree 0 -> leaf0, leaf1 -> leaf 0, 1
* top bit 1 -> subtree 1 -> leaf0, leaf1 -> leaf 2, 3 * top bit 1 -> subtree 1 -> leaf0, leaf1 -> leaf 2, 3
* top bit 2 -> subtree 2 -> leaf0, leaf1 -> leaf 4, 5 * top bit 2 -> subtree 2 -> leaf0, leaf1 -> leaf 4, 5
* top bit 3 -> subtree 3 -> leaf0, leaf1 -> leaf 6, 7 * top bit 3 -> subtree 3 -> leaf0, leaf1 -> leaf 6, 7
*/ */
nvgpu_func_writel(g,
func_priv_cpu_intr_top_en_clear_r(
HOST2SOC_SUBTREE_TO_TOP_IDX(subtree)),
BIT32(HOST2SOC_SUBTREE_TO_TOP_BIT(subtree)));
nvgpu_func_writel(g, nvgpu_func_writel(g,
func_priv_cpu_intr_leaf_en_clear_r( func_priv_cpu_intr_leaf_en_clear_r(
HOST2SOC_SUBTREE_TO_LEAF0(subtree)), HOST2SOC_SUBTREE_TO_LEAF0(subtree)),
@@ -173,15 +169,11 @@ static void ga10b_intr_config(struct gk20a *g, bool enable, u32 subtree,
if (enable) { if (enable) {
g->mc.subtree_mask_restore[subtree] |= g->mc.subtree_mask_restore[subtree] |=
subtree_mask; subtree_mask;
subtree_mask = g->mc.subtree_mask_restore[subtree]; ga10b_intr_unit_enable(g, subtree, subtree_mask);
ga10b_intr_subtree_enable(g, subtree, subtree_mask);
} else { } else {
g->mc.subtree_mask_restore[subtree] &= g->mc.subtree_mask_restore[subtree] &=
~(subtree_mask); ~(subtree_mask);
subtree_mask = g->mc.subtree_mask_restore[subtree]; ga10b_intr_unit_disable(g, subtree, subtree_mask);
ga10b_intr_subtree_disable(g, subtree, subtree_mask);
} }
} }