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: fixing MISRA violations

Browse Source 
- MISRA Directive 4.7
  Calling function "nvgpu_tsg_unbind_channel(tsg, ch, true)" which returns
  error information without testing the error information.

- MISRA Rule 10.3
  Implicit conversion from essential type "unsigned 64-bit int" to different
  or narrower essential type "unsigned 32-bit int"

- MISRA Rule 5.7
  A tag name shall be a unique identifier

JIRA NVGPU-5955

Change-Id: I109e0c01848c76a0947848e91cc6bb17d4cf7d24
Signed-off-by: srajum <srajum@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2572776
(cherry picked from commit 073daafe8a11e86806be966711271be51d99c18e)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2678681
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
srajum
2021-08-08 23:08:34 +05:30
committed by mobile promotions
parent 069fe05dca
commit 8381647662
15 changed files with 30 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/nvgpu/common/fifo/channel.c
View File

@@ -796,7 +796,7 @@ static void channel_free_invoke_unbind(struct nvgpu_channel *ch)
* have an open channel fd anymore to use for the unbind * have an open channel fd anymore to use for the unbind
* ioctl. * ioctl.
*/ */
err = nvgpu_tsg_force_unbind_channel(tsg, ch); err = nvgpu_tsg_unbind_channel(tsg, ch, true);
if (err != 0) { if (err != 0) {
nvgpu_err(g, nvgpu_err(g,
"failed to unbind channel %d from TSG", "failed to unbind channel %d from TSG",
@@ -956,7 +956,7 @@ static void channel_free(struct nvgpu_channel *ch, bool force)
/* /*
* OS channel close may require that syncpoint should be set to some * OS channel close may require that syncpoint should be set to some
* safe value before it is called. nvgpu_tsg_force_unbind_channel(above) * safe value before it is called. nvgpu_tsg_unbind_channel(above)
* is internally doing that by calling nvgpu_nvhost_syncpt_set_safe_- * is internally doing that by calling nvgpu_nvhost_syncpt_set_safe_-
* state deep down in the stack. Otherwise os_channel close may block if * state deep down in the stack. Otherwise os_channel close may block if
* the app is killed abruptly (which was going to do the syncpoint * the app is killed abruptly (which was going to do the syncpoint

6
drivers/gpu/nvgpu/common/fifo/tsg.c
View File

@@ -396,12 +396,6 @@ fail:
} }
int nvgpu_tsg_force_unbind_channel(struct nvgpu_tsg *tsg,
struct nvgpu_channel *ch)
{
return nvgpu_tsg_unbind_channel(tsg, ch, true);
}
int nvgpu_tsg_unbind_channel_check_hw_state(struct nvgpu_tsg *tsg, int nvgpu_tsg_unbind_channel_check_hw_state(struct nvgpu_tsg *tsg,
struct nvgpu_channel *ch) struct nvgpu_channel *ch)
{ {

2
drivers/gpu/nvgpu/common/pmu/pmu.c
View File

@@ -27,7 +27,9 @@
#include <nvgpu/utils.h> #include <nvgpu/utils.h>
#include <nvgpu/power_features/cg.h> #include <nvgpu/power_features/cg.h>
#include <nvgpu/nvgpu_err.h> #include <nvgpu/nvgpu_err.h>
#ifdef CONFIG_NVGPU_DGPU
#include <nvgpu/boardobjgrp.h> #include <nvgpu/boardobjgrp.h>
#endif
#include <nvgpu/pmu.h> #include <nvgpu/pmu.h>
/* PMU H/W error functions */ /* PMU H/W error functions */

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

@@ -168,7 +168,9 @@ enum nvgpu_profiler_pm_reservation_scope;
#include <nvgpu/gpu_ops.h> #include <nvgpu/gpu_ops.h>
#ifdef CONFIG_NVGPU_NON_FUSA
#include "hal/clk/clk_gk20a.h" #include "hal/clk/clk_gk20a.h"
#endif
/** /**
* @addtogroup unit-common-nvgpu * @addtogroup unit-common-nvgpu

15
drivers/gpu/nvgpu/include/nvgpu/tsg.h
View File

@@ -467,21 +467,6 @@ struct nvgpu_tsg *nvgpu_tsg_check_and_get_from_id(struct gk20a *g, u32 tsgid);
int nvgpu_tsg_unbind_channel(struct nvgpu_tsg *tsg, struct nvgpu_channel *ch, int nvgpu_tsg_unbind_channel(struct nvgpu_tsg *tsg, struct nvgpu_channel *ch,
bool force); bool force);
/**
* @brief Unbind a channel from the TSG it is bound to.
*
* @param tsg [in] Pointer to TSG struct.
* @param ch [in] Pointer to Channel struct.
*
* Call #nvgpu_tsg_unbind_channel with argument force set. Thus, if the
* channel has work, it still gets unbound.
*
* @return return value by #nvgpu_tsg_unbind_channel
*/
int nvgpu_tsg_force_unbind_channel(struct nvgpu_tsg *tsg,
struct nvgpu_channel *ch);
/** /**
* @brief Check h/w channel status before unbinding Channel. * @brief Check h/w channel status before unbinding Channel.
* *

2
libs/dgpu/libnvgpu-drv-dgpu_safe.export
View File

@@ -700,7 +700,7 @@ nvgpu_tsg_reset_faulted_eng_pbdma
nvgpu_tsg_set_ctx_mmu_error nvgpu_tsg_set_ctx_mmu_error
nvgpu_tsg_set_error_notifier nvgpu_tsg_set_error_notifier
nvgpu_tsg_setup_sw nvgpu_tsg_setup_sw
nvgpu_tsg_force_unbind_channel nvgpu_tsg_unbind_channel
nvgpu_tsg_unbind_channel_check_hw_state nvgpu_tsg_unbind_channel_check_hw_state
nvgpu_tsg_unbind_channel_check_ctx_reload nvgpu_tsg_unbind_channel_check_ctx_reload
nvgpu_set_bit nvgpu_set_bit

2
libs/igpu/libnvgpu-drv-igpu_safe.export
View File

@@ -719,7 +719,7 @@ nvgpu_tsg_reset_faulted_eng_pbdma
nvgpu_tsg_set_ctx_mmu_error nvgpu_tsg_set_ctx_mmu_error
nvgpu_tsg_set_error_notifier nvgpu_tsg_set_error_notifier
nvgpu_tsg_setup_sw nvgpu_tsg_setup_sw
nvgpu_tsg_force_unbind_channel nvgpu_tsg_unbind_channel
nvgpu_tsg_unbind_channel_check_hw_state nvgpu_tsg_unbind_channel_check_hw_state
nvgpu_tsg_unbind_channel_check_ctx_reload nvgpu_tsg_unbind_channel_check_ctx_reload
nvgpu_set_bit nvgpu_set_bit

11
userspace/units/fifo/channel/nvgpu-channel.c
View File

@@ -439,8 +439,6 @@ done:
#define F_CHANNEL_CLOSE_AS_BOUND BIT(14) #define F_CHANNEL_CLOSE_AS_BOUND BIT(14)
#define F_CHANNEL_CLOSE_LAST BIT(15) #define F_CHANNEL_CLOSE_LAST BIT(15)
/* nvgpu_tsg_force_unbind_channel always return 0 */
static const char *f_channel_close[] = { static const char *f_channel_close[] = {
"already_freed", "already_freed",
"force", "force",
@@ -485,7 +483,6 @@ static bool channel_close_pruned(u32 branches, u32 final)
return true; return true;
} }
/* TODO: nvgpu_tsg_force_unbind_channel always returns 0 */
branches &= ~F_CHANNEL_CLOSE_TSG_UNBIND_FAIL; branches &= ~F_CHANNEL_CLOSE_TSG_UNBIND_FAIL;
@@ -1227,7 +1224,7 @@ int test_channel_enable_disable_tsg(struct unit_module *m,
subtest_setup(branches); subtest_setup(branches);
err = nvgpu_tsg_force_unbind_channel(tsg, ch); err = nvgpu_tsg_unbind_channel(tsg, ch, true);
unit_assert(err == 0, goto done); unit_assert(err == 0, goto done);
err = nvgpu_channel_enable_tsg(g, ch); err = nvgpu_channel_enable_tsg(g, ch);
@@ -1648,7 +1645,7 @@ done:
f_channel_suspend_resume)); f_channel_suspend_resume));
} }
if (ch != NULL) { if (ch != NULL) {
nvgpu_tsg_force_unbind_channel(tsg, ch); nvgpu_tsg_unbind_channel(tsg, ch, true);
nvgpu_channel_close(ch); nvgpu_channel_close(ch);
} }
if (tsg != NULL) { if (tsg != NULL) {
@@ -1747,7 +1744,7 @@ done:
branches_str(branches, f_channel_debug_dump)); branches_str(branches, f_channel_debug_dump));
} }
if (ch != NULL) { if (ch != NULL) {
nvgpu_tsg_force_unbind_channel(tsg, ch); nvgpu_tsg_unbind_channel(tsg, ch, true);
nvgpu_channel_close(ch); nvgpu_channel_close(ch);
} }
if (tsg != NULL) { if (tsg != NULL) {
@@ -2091,7 +2088,7 @@ int test_channel_abort_cleanup(struct unit_module *m, struct gk20a *g,
err = nvgpu_tsg_bind_channel(tsg, ch); err = nvgpu_tsg_bind_channel(tsg, ch);
unit_assert(err == 0, goto done); unit_assert(err == 0, goto done);
err = nvgpu_tsg_force_unbind_channel(tsg, ch); err = nvgpu_tsg_unbind_channel(tsg, ch, true);
unit_assert(err == 0, goto done); unit_assert(err == 0, goto done);
nvgpu_channel_close(ch); nvgpu_channel_close(ch);

6
userspace/units/fifo/preempt/gv11b/nvgpu-preempt-gv11b.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -296,7 +296,7 @@ done:
} }
g->ops.fifo.is_preempt_pending = g->ops.fifo.is_preempt_pending =
stub_fifo_is_preempt_pending_pass; stub_fifo_is_preempt_pending_pass;
err = nvgpu_tsg_force_unbind_channel(tsg, ch); err = nvgpu_tsg_unbind_channel(tsg, ch, true);
if (err != 0) { if (err != 0) {
unit_err(m, "Cannot unbind channel\n"); unit_err(m, "Cannot unbind channel\n");
} }
@@ -495,7 +495,7 @@ done:
} }
g->ops.fifo.is_preempt_pending = g->ops.fifo.is_preempt_pending =
stub_fifo_is_preempt_pending_pass; stub_fifo_is_preempt_pending_pass;
err = nvgpu_tsg_force_unbind_channel(tsg, ch); err = nvgpu_tsg_unbind_channel(tsg, ch, true);
if (err != 0) { if (err != 0) {
unit_err(m, "Cannot unbind channel\n"); unit_err(m, "Cannot unbind channel\n");
} }

10
userspace/units/fifo/tsg/nvgpu-tsg.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2018-2022, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -379,7 +379,7 @@ int test_tsg_bind_channel(struct unit_module *m,
goto done); goto done);
unit_assert(nvgpu_tsg_from_ch(ch) == tsg, goto done); unit_assert(nvgpu_tsg_from_ch(ch) == tsg, goto done);
err = nvgpu_tsg_force_unbind_channel(tsg, ch); err = nvgpu_tsg_unbind_channel(tsg, ch, true);
unit_assert(err == 0, goto done); unit_assert(err == 0, goto done);
unit_assert(ch->tsgid == NVGPU_INVALID_TSG_ID, unit_assert(ch->tsgid == NVGPU_INVALID_TSG_ID,
goto done); goto done);
@@ -564,7 +564,7 @@ int test_tsg_unbind_channel(struct unit_module *m,
branches & F_TSG_UNBIND_CHANNEL_ABORT_CLEAN_UP_NULL ? branches & F_TSG_UNBIND_CHANNEL_ABORT_CLEAN_UP_NULL ?
NULL : gops.channel.abort_clean_up; NULL : gops.channel.abort_clean_up;
err = nvgpu_tsg_force_unbind_channel(tsg, chA); err = nvgpu_tsg_unbind_channel(tsg, chA, true);
if (branches & fail) { if (branches & fail) {
/* check that TSG has been torn down */ /* check that TSG has been torn down */
@@ -986,7 +986,7 @@ done:
} }
if (ch != NULL) { if (ch != NULL) {
nvgpu_tsg_force_unbind_channel(tsg, ch); nvgpu_tsg_unbind_channel(tsg, ch, true);
nvgpu_channel_close(ch); nvgpu_channel_close(ch);
} }
if (tsg != NULL) { if (tsg != NULL) {
@@ -1059,7 +1059,7 @@ int test_tsg_unbind_channel_check_ctx_reload(struct unit_module *m,
if ((branches & F_UNBIND_CHANNEL_CHECK_CTX_RELOAD_SET) && if ((branches & F_UNBIND_CHANNEL_CHECK_CTX_RELOAD_SET) &&
(branches & F_UNBIND_CHANNEL_CHECK_CTX_RELOAD_CHID_MATCH)) { (branches & F_UNBIND_CHANNEL_CHECK_CTX_RELOAD_CHID_MATCH)) {
nvgpu_tsg_force_unbind_channel(tsg, chB); nvgpu_tsg_unbind_channel(tsg, chB, true);
unit_assert(stub[0].chid == chB->chid, goto done); unit_assert(stub[0].chid == chB->chid, goto done);
} }
} }

6
userspace/units/fifo/tsg/nvgpu-tsg.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -91,7 +91,7 @@ int test_tsg_open(struct unit_module *m,
* - Allocate channel with nvgpu_channel_open_new. * - Allocate channel with nvgpu_channel_open_new.
* - Check that nvgpu_tsg_bind_channel returns 0. * - Check that nvgpu_tsg_bind_channel returns 0.
* - Check that TSG's list of channel is not empty. * - Check that TSG's list of channel is not empty.
* - Unbind channel with nvgpu_tsg_force_unbind_channel. * - Unbind channel with nvgpu_tsg_unbind_channel.
* - Check that ch->tsgid is now invalid. * - Check that ch->tsgid is now invalid.
* - Check that tsg can be retrieved from ch using nvgpu_tsg_from_ch. * - Check that tsg can be retrieved from ch using nvgpu_tsg_from_ch.
* - Check TSG bind failure cases: * - Check TSG bind failure cases:
@@ -121,7 +121,7 @@ int test_tsg_bind_channel(struct unit_module *m,
* *
* Test Type: Feature * Test Type: Feature
* *
* Targets: nvgpu_tsg_force_unbind_channel * Targets: nvgpu_tsg_unbind_channel
* *
* Input: test_fifo_init_support() run for this GPU * Input: test_fifo_init_support() run for this GPU
* *

4
userspace/units/gr/intr/nvgpu-gr-intr.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -337,7 +337,7 @@ static int gr_test_intr_allocate_ch_tsg(struct unit_module *m,
ch->notifier_wq.initialized = notify_init; ch->notifier_wq.initialized = notify_init;
tsg_unbind: tsg_unbind:
err = nvgpu_tsg_force_unbind_channel(tsg, ch); err = nvgpu_tsg_unbind_channel(tsg, ch, true);
if (err != 0) { if (err != 0) {
unit_err(m, "failed tsg channel unbind\n"); unit_err(m, "failed tsg channel unbind\n");
} }

2
userspace/units/gr/setup/nvgpu-gr-setup.c
View File

@@ -154,7 +154,7 @@ static int gr_test_setup_unbind_tsg(struct unit_module *m, struct gk20a *g)
goto unbind_tsg; goto unbind_tsg;
} }
err = nvgpu_tsg_force_unbind_channel(gr_setup_tsg, gr_setup_ch); err = nvgpu_tsg_unbind_channel(gr_setup_tsg, gr_setup_ch, true);
if (err != 0) { if (err != 0) {
unit_err(m, "failed tsg channel unbind\n"); unit_err(m, "failed tsg channel unbind\n");
} }

4
userspace/units/gr/setup/nvgpu-gr-setup.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -161,7 +161,7 @@ int test_gr_setup_set_preemption_mode(struct unit_module *m,
* must have been executed successfully. * must have been executed successfully.
* *
* Steps: * Steps:
* - Call nvgpu_tsg_force_unbind_channel. * - Call nvgpu_tsg_unbind_channel.
* - Call nvgpu_channel_close. * - Call nvgpu_channel_close.
* - Call nvgpu_tsg_release. * - Call nvgpu_tsg_release.
* *

4
userspace/units/rc/nvgpu-rc.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -163,7 +163,7 @@ clear_tsg:
int test_rc_deinit(struct unit_module *m, struct gk20a *g, void *args) int test_rc_deinit(struct unit_module *m, struct gk20a *g, void *args)
{ {
struct nvgpu_posix_channel *posix_channel = ch->os_priv; struct nvgpu_posix_channel *posix_channel = ch->os_priv;
int ret = nvgpu_tsg_force_unbind_channel(tsg, ch); int ret = nvgpu_tsg_unbind_channel(tsg, ch, true);
if (ret != 0) { if (ret != 0) {
ret = UNIT_FAIL; ret = UNIT_FAIL;
unit_err(m , "channel already unbound"); unit_err(m , "channel already unbound");