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: move userspace firmware files to gv11b

Browse Source 
qnx unit test access ucode from /proc/boot/gv11b. QNX Unit test face
issues like permission, platform dependency etc when test tries to
access ucode from /proc/boot. To fix issue updating qnx firmware unit
to read ucode from firmware/gv11b in case of unit test. Patch also
updates firmware access path for posix as well.

Jira NVGPU-3582
Bug 2693908

Change-Id: I1b28c8475b6bc4fe5ec3d6a525cb3af152feb887
Signed-off-by: Prateek sethi <prsethi@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2306278
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-by: Nicolas Benech <nbenech@nvidia.com>
Reviewed-by: Dinesh T <dt@nvidia.com>
Reviewed-by: Vaibhav Kachore <vkachore@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Prateek sethi
2020-03-03 12:29:30 +05:30
committed by Alex Waterman
parent 7a4ecc8966
commit 451797a6d5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/nvgpu/os/posix/firmware.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2018-2020, 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"),
@@ -30,7 +30,7 @@
#include <nvgpu/gk20a.h> #include <nvgpu/gk20a.h>
#define FW_MAX_PATH_SIZE 2048U #define FW_MAX_PATH_SIZE 2048U
#define NVGPU_UNITTEST_UCODE_PATH "/firmware/" #define NVGPU_UNITTEST_UCODE_PATH "/firmware/gv11b/"
static int nvgpu_ucode_load(struct gk20a *g, const char *path, static int nvgpu_ucode_load(struct gk20a *g, const char *path,
struct nvgpu_firmware *ucode) struct nvgpu_firmware *ucode)

2
userspace/Makefile.tmk
View File

@@ -71,7 +71,7 @@ NV_ACR_UCODE_PROD_IMG=acr_ucode_prod.bin
NV_ACR_UCODE_DBG_IMG=acr_ucode_dbg.bin NV_ACR_UCODE_DBG_IMG=acr_ucode_dbg.bin
NV_PMU_BL_IMG=pmu_bl.bin NV_PMU_BL_IMG=pmu_bl.bin
NV_COMPONENT_SYSTEMIMAGE_DIR := $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/nvgpu_unit NV_COMPONENT_SYSTEMIMAGE_DIR := $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/nvgpu_unit
NV_UNIT_REQ_FIRMWARE_DIR := $(NV_COMPONENT_SYSTEMIMAGE_DIR)/firmware NV_UNIT_REQ_FIRMWARE_DIR := $(NV_COMPONENT_SYSTEMIMAGE_DIR)/firmware/gv11b
systemimage:: $(NV_COMPONENT_SYSTEMIMAGE_DIR) $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_UNIT_SH) \ systemimage:: $(NV_COMPONENT_SYSTEMIMAGE_DIR) $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_UNIT_SH) \
$(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/$(NV_SUBMIT_UNIT_SH) \ $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/$(NV_SUBMIT_UNIT_SH) \
$(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_TESTLIST_PY) \ $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_TESTLIST_PY) \

6
userspace/install-unit.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# 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 # 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"),
@@ -103,7 +103,7 @@ fi
# Building the necessary directory structure. It may not be present # Building the necessary directory structure. It may not be present
# first time this is run. # first time this is run.
ssh $target mkdir -p nvgpu_unit/units ssh $target mkdir -p nvgpu_unit/units
ssh $target mkdir -p nvgpu_unit/firmware ssh $target mkdir -p nvgpu_unit/firmware/gv11b
ssh $target mkdir -p $TOP/kernel ssh $target mkdir -p $TOP/kernel
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo echo
@@ -122,7 +122,7 @@ jcp $TOP/kernel/nvgpu/userspace/gcov.sh nvgpu_unit/gcov.sh
jcp $TOP/kernel/nvgpu/userspace/testlist.py nvgpu_unit/testlist.py jcp $TOP/kernel/nvgpu/userspace/testlist.py nvgpu_unit/testlist.py
jcp $TOP/kernel/nvgpu/userspace/required_tests.json \ jcp $TOP/kernel/nvgpu/userspace/required_tests.json \
nvgpu_unit/required_tests.json nvgpu_unit/required_tests.json
jcp $TOP/kernel/nvgpu/userspace/firmware/ nvgpu_unit/firmware/ jcp $TOP/kernel/nvgpu/userspace/firmware/ nvgpu_unit/firmware/gv11b/
find $nvgpu_bins/userspace/units -name "*.so" -not -path "*unit.so" \ find $nvgpu_bins/userspace/units -name "*.so" -not -path "*unit.so" \
-not -path "*drv.so" -exec du -b {} \; | sort -n | while read size unit_so ; do -not -path "*drv.so" -exec du -b {} \; | sort -n | while read size unit_so ; do