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: mm: fix MISRA 17.2 violation

Browse Source 
MISRA Rule 17.2 prohibits recursion. Update the function
nvgpu_locate_pte() to remove recursion.

JIRA NVGPU-3340

Change-Id: I027887f45f334a5f9819cf2e620693f10ab4fa0b
Signed-off-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2110597
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Philip Elcan
2019-05-02 15:45:32 -04:00
committed by mobile promotions
parent 4222052a53
commit b96ac290c8
1 changed files with 62 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
drivers/gpu/nvgpu/common/mm/gmmu/page_table.c
View File

@@ -934,66 +934,74 @@ static int nvgpu_locate_pte(struct gk20a *g, struct vm_gk20a *vm,
struct nvgpu_gmmu_pd **pd_out, u32 *pd_idx_out,
u32 *pd_offs_out)
{
const struct gk20a_mmu_level *l = &vm->mmu_levels[lvl];
const struct gk20a_mmu_level *next_l = &vm->mmu_levels[lvl + 1];
u32 pd_idx = pd_index(l, vaddr, attrs);
const struct gk20a_mmu_level *l;
const struct gk20a_mmu_level *next_l;
u32 pd_idx;
u32 pte_base;
u32 pte_size;
u32 i;
bool done = false;
/*
* If this isn't the final level (i.e there's a valid next level)
* then find the next level PD and recurse.
*/
if (next_l->update_entry != NULL) {
struct nvgpu_gmmu_pd *pd_next = pd->entries + pd_idx;
do {
l = &vm->mmu_levels[lvl];
next_l = &vm->mmu_levels[lvl + 1];
pd_idx = pd_index(l, vaddr, attrs);
/*
* If this isn't the final level (i.e there's a valid next level)
* then find the next level PD and recurse.
*/
if (next_l->update_entry != NULL) {
struct nvgpu_gmmu_pd *pd_next = pd->entries + pd_idx;
/* Invalid entry! */
if (pd_next->mem == NULL) {
return -EINVAL;
/* Invalid entry! */
if (pd_next->mem == NULL) {
return -EINVAL;
}
attrs->pgsz = l->get_pgsz(g, l, pd, pd_idx);
if (attrs->pgsz >= GMMU_NR_PAGE_SIZES) {
return -EINVAL;
}
pd = pd_next;
lvl++;
} else {
if (pd->mem == NULL) {
return -EINVAL;
}
/*
* Take into account the real offset into the nvgpu_mem
* since the PD may be located at an offset other than 0
* (due to PD packing).
*/
pte_base = (u32)(pd->mem_offs / sizeof(u32)) +
nvgpu_pd_offset_from_index(l, pd_idx);
pte_size = (u32)(l->entry_size / sizeof(u32));
if (data != NULL) {
for (i = 0; i < pte_size; i++) {
data[i] = nvgpu_mem_rd32(g, pd->mem,
pte_base + i);
}
}
if (pd_out != NULL) {
*pd_out = pd;
}
if (pd_idx_out != NULL) {
*pd_idx_out = pd_idx;
}
if (pd_offs_out != NULL) {
*pd_offs_out = nvgpu_pd_offset_from_index(l,
pd_idx);
}
done = true;
}
attrs->pgsz = l->get_pgsz(g, l, pd, pd_idx);
if (attrs->pgsz >= GMMU_NR_PAGE_SIZES) {
return -EINVAL;
}
return nvgpu_locate_pte(g, vm, pd_next,
vaddr, lvl + 1, attrs,
data, pd_out, pd_idx_out,
pd_offs_out);
}
if (pd->mem == NULL) {
return -EINVAL;
}
/*
* Take into account the real offset into the nvgpu_mem since the PD
* may be located at an offset other than 0 (due to PD packing).
*/
pte_base = (u32)(pd->mem_offs / sizeof(u32)) +
nvgpu_pd_offset_from_index(l, pd_idx);
pte_size = (u32)(l->entry_size / sizeof(u32));
if (data != NULL) {
for (i = 0; i < pte_size; i++) {
data[i] = nvgpu_mem_rd32(g, pd->mem, pte_base + i);
}
}
if (pd_out != NULL) {
*pd_out = pd;
}
if (pd_idx_out != NULL) {
*pd_idx_out = pd_idx;
}
if (pd_offs_out != NULL) {
*pd_offs_out = nvgpu_pd_offset_from_index(l, pd_idx);
}
} while (!done);
return 0;
}