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

Revert "gpu: nvgpu: posix support for firmware files"

Browse Source 
This reverts commit 2a7e6a1111c2e52df2eae22fd084f0c955ed0759.

Bug 2693908

Change-Id: Id9ed7a6b18929cf1b319a54aca227c7c36515f26
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2189199
This commit is contained in:
Bo Yan
2019-09-03 09:32:24 -07:00
committed by Alex Waterman
parent 55a3d10719
commit d6a4cf11e3
2 changed files with 3 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,135 +20,16 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <nvgpu/types.h>
#include <nvgpu/kmem.h>
#include <nvgpu/firmware.h> #include <nvgpu/firmware.h>
#include <nvgpu/gk20a.h>
#define FW_MAX_PATH_SIZE 1024U
#define NVGPU_UNITTEST_UCODE_PATH "/firmware/"
static int nvgpu_ucode_load(struct gk20a *g, const char *path,
struct nvgpu_firmware *ucode)
{
struct stat buf;
size_t bufsize;
ssize_t len;
int fd = -1;
int ret = -1;
u8 *data, *data1;
fd = open(path, O_RDONLY);
if (fd < 0) {
nvgpu_err(g, "fw: %s open failed", path);
goto done;
}
if (fstat(fd, &buf) == -1) {
nvgpu_err(g, "fw: fstat failed");
goto done;
}
if (buf.st_size <= 0) {
nvgpu_err(g, "fw: invalid buf.st_size");
goto done;
}
bufsize = (size_t)buf.st_size;
data = (u8 *)nvgpu_kmalloc(g, bufsize);
if (data == NULL) {
nvgpu_err(g, "fw: malloc failed");
goto done;
}
data1 = data;
while (bufsize > 0UL) {
len = read(fd, data, bufsize);
if (len < 0) {
ret = errno;
nvgpu_err(g, "fw: read failed");
goto err;
}
if (len == 0) {
nvgpu_err(g, "fw load failed: read size mismatch");
ret = -1;
goto err;
}
data += len;
bufsize -= (size_t)len;
}
ucode->data = data1;
ucode->size = (size_t)buf.st_size;
ret = 0;
goto done;
err:
nvgpu_kfree(g, data);
done:
if (fd >= 0) {
if (close(fd) != 0) {
nvgpu_err(g, "close() failed");
}
}
return ret;
}
struct nvgpu_firmware *nvgpu_request_firmware(struct gk20a *g, struct nvgpu_firmware *nvgpu_request_firmware(struct gk20a *g,
const char *fw_name, const char *fw_name,
u32 flags) u32 flags)
{ {
struct nvgpu_firmware *fw;
char full_path[FW_MAX_PATH_SIZE] = "";
int ret;
size_t full_path_len;
if (fw_name == NULL) {
return NULL;
}
getcwd(full_path, FW_MAX_PATH_SIZE);
full_path_len = strlen(full_path);
full_path_len += strlen(fw_name);
full_path_len += strlen(NVGPU_UNITTEST_UCODE_PATH);
if(full_path_len >= FW_MAX_PATH_SIZE) {
nvgpu_err(g, "Invalid MAX_PATH_SIZE %lu %u", full_path_len,
FW_MAX_PATH_SIZE);
goto err;
}
strcat(full_path, NVGPU_UNITTEST_UCODE_PATH);
strcat(full_path, fw_name);
fw = nvgpu_kzalloc(g, sizeof(*fw));
if (fw == NULL) {
nvgpu_err(g, "malloc failed");
goto err;
}
ret = nvgpu_ucode_load(g, full_path, fw);
if (ret != 0) {
nvgpu_err(g, "failed to load %s ucode", fw_name);
goto err_fw;
}
return fw;
err_fw:
nvgpu_kfree(g, fw);
err:
return NULL; return NULL;
} }
void nvgpu_release_firmware(struct gk20a *g, struct nvgpu_firmware *fw) void nvgpu_release_firmware(struct gk20a *g, struct nvgpu_firmware *fw)
{ {
nvgpu_kfree(g, fw->data); /* Noop. */
nvgpu_kfree(g, fw);
} }

18
userspace/Makefile.tmk
View File

@@ -62,24 +62,15 @@ NV_UNIT_SH=unit.sh
NV_SUBMIT_UNIT_SH=nvgpu_submit_unit.sh NV_SUBMIT_UNIT_SH=nvgpu_submit_unit.sh
NV_TESTLIST_PY=testlist.py NV_TESTLIST_PY=testlist.py
NV_REQ_TESTS_JSON=required_tests.json NV_REQ_TESTS_JSON=required_tests.json
NV_NETD_IMG=NETD_img.bin
NV_FECS_IMG=fecs.bin
NV_GPCCS_IMG=gpccs.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
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) \
$(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_JSON) \ $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_JSON)
$(NV_UNIT_REQ_FIRMWARE_DIR) $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_NETD_IMG) \
$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_IMG) \
$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_IMG)
#make the output directory #make the output directory
$(NV_COMPONENT_SYSTEMIMAGE_DIR) : $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR) $(NV_COMPONENT_SYSTEMIMAGE_DIR) : $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)
$(MKDIR_P) $@ $(MKDIR_P) $@
$(NV_UNIT_REQ_FIRMWARE_DIR) : $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)
$(MKDIR_P) $@
#copy the test script #copy the test script
$(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_UNIT_SH) : $(NV_COMPONENT_DIR)/$(NV_UNIT_SH) $(NV_COMPONENT_SYSTEMIMAGE_DIR) $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_UNIT_SH) : $(NV_COMPONENT_DIR)/$(NV_UNIT_SH) $(NV_COMPONENT_SYSTEMIMAGE_DIR)
@@ -91,12 +82,7 @@ $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_TESTLIST_PY) : $(NV_COMPONENT_DIR)/$(NV_TES
$(CP) $< $@ $(CP) $< $@
$(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_JSON) : $(NV_COMPONENT_DIR)/$(NV_REQ_TESTS_JSON) $(NV_COMPONENT_SYSTEMIMAGE_DIR) $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_JSON) : $(NV_COMPONENT_DIR)/$(NV_REQ_TESTS_JSON) $(NV_COMPONENT_SYSTEMIMAGE_DIR)
$(CP) $< $@ $(CP) $< $@
$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_NETD_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_NETD_IMG)
$(CP) $< $@
$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_FECS_IMG)
$(CP) $< $@
$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_GPCCS_IMG)
$(CP) $< $@
include $(NV_BUILD_NVTEST_EXECUTABLE) include $(NV_BUILD_NVTEST_EXECUTABLE)