From 24d20485a5b3add12f1751f8a9e4779227ad8592 Mon Sep 17 00:00:00 2001 From: Philip Elcan Date: Fri, 17 Jan 2020 10:30:25 -0500 Subject: [PATCH] gpu: nvgpu: init: cleanup traceability nvgpu_init_hal is private to the common.init unit in the driver, used only by nvgpu_detect_chip. However, it is used extensively by the unit tests, so it can't be static. So, hide it from doxygen, so it is not included in SWVR traceability. Add missing target APIs in SWUTS for init UTs. JIRA NVGPU-4818 Change-Id: I4d8acf29e9cbafdfd26d7088f98974da3b12a8ba Signed-off-by: Philip Elcan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2280641 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/include/nvgpu/hal_init.h | 8 +++++--- userspace/units/init/nvgpu-init.h | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/nvgpu/include/nvgpu/hal_init.h b/drivers/gpu/nvgpu/include/nvgpu/hal_init.h index 96611a9cd..4f6d34073 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hal_init.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hal_init.h @@ -1,7 +1,7 @@ /* * NVIDIA GPU Hardware Abstraction Layer functions definitions. * - * 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"), @@ -27,8 +27,6 @@ struct gk20a; -int nvgpu_init_hal(struct gk20a *g); - /** * @brief Detect GPU and initialize the HAL. * @@ -43,4 +41,8 @@ int nvgpu_init_hal(struct gk20a *g); */ int nvgpu_detect_chip(struct gk20a *g); +/** @cond DOXYGEN_SHOULD_SKIP_THIS */ +int nvgpu_init_hal(struct gk20a *g); +/** @endcond DOXYGEN_SHOULD_SKIP_THIS */ + #endif /* NVGPU_HAL_INIT_H */ diff --git a/userspace/units/init/nvgpu-init.h b/userspace/units/init/nvgpu-init.h index 618eb9efd..6be4be02d 100644 --- a/userspace/units/init/nvgpu-init.h +++ b/userspace/units/init/nvgpu-init.h @@ -157,7 +157,8 @@ int test_get_put(struct unit_module *m, * Input: * - test_setup_env() must be called before. * - * Targets: nvgpu_check_gpu_state, gops_mc.get_chip_details + * Targets: nvgpu_check_gpu_state, is_nvgpu_gpu_state_valid, + * gops_mc.get_chip_details * * Steps: * - Test valid case. @@ -224,7 +225,7 @@ int test_hal_init(struct unit_module *m, * * Test Type: Feature * - * Targets: nvgpu_finalize_poweron + * Targets: nvgpu_finalize_poweron, nvgpu_init_gpu_characteristics * * Input: * - test_setup_env() must be called before.