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: add check for valid engine id

Browse Source 
-Check validity of engine-id when iterating through all engines and
passing the engine-id as an argument to other function(s).
-Skip test test_gv100_dump_engine_status which fails due to this change.

Bug 200660469

Change-Id: I64ebb1a0297f605dd3cba7ef73954ff5594828bc
Signed-off-by: Shashank Singh <shashsingh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2424655
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Shashank Singh
2020-10-05 15:23:12 +00:00
committed by Alex Waterman
parent 260365bfe1
commit 3aec79d242
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/nvgpu/hal/fifo/engine_status_gm20b.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2019-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"),
@@ -42,6 +42,11 @@ void gm20b_dump_engine_status(struct gk20a *g, struct nvgpu_debug_context *o)
gk20a_debug_output(o, "--------------------------");
for (i = 0; i < host_num_engines; i++) {
if (!nvgpu_engine_check_valid_id(g, i)) {
/* Skip invalid engines */
continue;
}
g->ops.engine_status.read_engine_status_info(g, i, &engine_status);
gk20a_debug_output(o,

8
drivers/gpu/nvgpu/hal/fifo/engine_status_gv100_fusa.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2019-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"),
@@ -24,6 +24,7 @@
#include <nvgpu/debug.h>
#include <nvgpu/gk20a.h>
#include <nvgpu/engine_status.h>
#include <nvgpu/engines.h>
#include <nvgpu/hw/gv100/hw_fifo_gv100.h>
@@ -52,6 +53,11 @@ void gv100_dump_engine_status(struct gk20a *g, struct nvgpu_debug_context *o)
host_num_engines = nvgpu_get_litter_value(g, GPU_LIT_HOST_NUM_ENGINES);
for (i = 0; i < host_num_engines; i++) {
if (!nvgpu_engine_check_valid_id(g, i)) {
/* Skip invalid engines */
continue;
}
g->ops.engine_status.read_engine_status_info(g, i, &engine_status);
gk20a_debug_output(o, "%s eng %d: ", g->name, i);

1
userspace/required_tests.ini
View File

@@ -565,7 +565,6 @@ test_gp10b_engine_init_ce_info.engine_init_ce_info=2
[nvgpu_engine_gv100]
test_fifo_init_support.init_support=0
test_fifo_remove_support.remove_support=0
test_gv100_dump_engine_status.dump_engine_status_info=0
test_gv100_read_engine_status_info.read_engine_status_info=0
[nvgpu_engine_gv11b]

2
userspace/units/fifo/engine/gv100/nvgpu-engine-gv100.c
View File

@@ -170,7 +170,7 @@ done:
struct unit_module_test nvgpu_engine_gv100_tests[] = {
UNIT_TEST(init_support, test_fifo_init_support, NULL, 0),
UNIT_TEST(read_engine_status_info, test_gv100_read_engine_status_info, NULL, 0),
UNIT_TEST(dump_engine_status_info, test_gv100_dump_engine_status, NULL, 0),
UNIT_TEST(dump_engine_status_info, test_gv100_dump_engine_status, NULL, 1),
UNIT_TEST(remove_support, test_fifo_remove_support, NULL, 0),
};