From 8da4c91ad5134a3a582306caee6de1ca129126b2 Mon Sep 17 00:00:00 2001 From: vinodg Date: Wed, 11 Mar 2020 12:36:05 -0700 Subject: [PATCH] gpu: nvgpu: move userspace firmware files to gv11b dir Move all userspaces firmware files from firmware dir to firmware/gv11b dir. Fix for unit.sh test failure in local host. Update Makefile.tmk and install-unit.sh scripts to copy from firmware/gv11b dir. Jira NVGPU-5144 Signed-off-by: vinodg Change-Id: I706af069f6796db085947278e56a8598a9e3fff2 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2311071 Reviewed-by: automaticguardword Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- userspace/Makefile.tmk | 16 ++++++++-------- userspace/firmware/{ => gv11b}/NETD_img.bin | Bin userspace/firmware/{ => gv11b}/acr_ucode.bin | Bin .../firmware/{ => gv11b}/acr_ucode_dbg.bin | Bin .../firmware/{ => gv11b}/acr_ucode_prod.bin | Bin userspace/firmware/{ => gv11b}/fecs.bin | Bin userspace/firmware/{ => gv11b}/fecs_sig.bin | Bin userspace/firmware/{ => gv11b}/gpccs.bin | Bin userspace/firmware/{ => gv11b}/gpccs_sig.bin | Bin userspace/firmware/{ => gv11b}/pmu_bl.bin | Bin userspace/install-unit.sh | 2 +- 11 files changed, 9 insertions(+), 9 deletions(-) rename userspace/firmware/{ => gv11b}/NETD_img.bin (100%) rename userspace/firmware/{ => gv11b}/acr_ucode.bin (100%) rename userspace/firmware/{ => gv11b}/acr_ucode_dbg.bin (100%) rename userspace/firmware/{ => gv11b}/acr_ucode_prod.bin (100%) rename userspace/firmware/{ => gv11b}/fecs.bin (100%) rename userspace/firmware/{ => gv11b}/fecs_sig.bin (100%) rename userspace/firmware/{ => gv11b}/gpccs.bin (100%) rename userspace/firmware/{ => gv11b}/gpccs_sig.bin (100%) rename userspace/firmware/{ => gv11b}/pmu_bl.bin (100%) diff --git a/userspace/Makefile.tmk b/userspace/Makefile.tmk index b718b3511..efe5aeb00 100644 --- a/userspace/Makefile.tmk +++ b/userspace/Makefile.tmk @@ -101,21 +101,21 @@ $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_TESTLIST_PY) : $(NV_COMPONENT_DIR)/$(NV_TES $(CP) $< $@ $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_JSON) : $(NV_COMPONENT_DIR)/$(NV_REQ_TESTS_JSON) $(NV_COMPONENT_SYSTEMIMAGE_DIR) $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_NETD_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_NETD_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) +$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_NETD_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_NETD_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_FECS_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) +$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_FECS_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_SIG_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_FECS_SIG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) +$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_SIG_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_FECS_SIG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_GPCCS_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) +$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_GPCCS_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_SIG_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_GPCCS_SIG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) +$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_SIG_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_GPCCS_SIG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_PROD_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_ACR_UCODE_PROD_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) +$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_PROD_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_ACR_UCODE_PROD_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_DBG_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_ACR_UCODE_DBG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) +$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_DBG_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_ACR_UCODE_DBG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_PMU_BL_IMG) : $(NV_COMPONENT_DIR)/firmware/$(NV_PMU_BL_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) +$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_PMU_BL_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_PMU_BL_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) $(CP) $< $@ include $(NV_BUILD_NVTEST_EXECUTABLE) diff --git a/userspace/firmware/NETD_img.bin b/userspace/firmware/gv11b/NETD_img.bin similarity index 100% rename from userspace/firmware/NETD_img.bin rename to userspace/firmware/gv11b/NETD_img.bin diff --git a/userspace/firmware/acr_ucode.bin b/userspace/firmware/gv11b/acr_ucode.bin similarity index 100% rename from userspace/firmware/acr_ucode.bin rename to userspace/firmware/gv11b/acr_ucode.bin diff --git a/userspace/firmware/acr_ucode_dbg.bin b/userspace/firmware/gv11b/acr_ucode_dbg.bin similarity index 100% rename from userspace/firmware/acr_ucode_dbg.bin rename to userspace/firmware/gv11b/acr_ucode_dbg.bin diff --git a/userspace/firmware/acr_ucode_prod.bin b/userspace/firmware/gv11b/acr_ucode_prod.bin similarity index 100% rename from userspace/firmware/acr_ucode_prod.bin rename to userspace/firmware/gv11b/acr_ucode_prod.bin diff --git a/userspace/firmware/fecs.bin b/userspace/firmware/gv11b/fecs.bin similarity index 100% rename from userspace/firmware/fecs.bin rename to userspace/firmware/gv11b/fecs.bin diff --git a/userspace/firmware/fecs_sig.bin b/userspace/firmware/gv11b/fecs_sig.bin similarity index 100% rename from userspace/firmware/fecs_sig.bin rename to userspace/firmware/gv11b/fecs_sig.bin diff --git a/userspace/firmware/gpccs.bin b/userspace/firmware/gv11b/gpccs.bin similarity index 100% rename from userspace/firmware/gpccs.bin rename to userspace/firmware/gv11b/gpccs.bin diff --git a/userspace/firmware/gpccs_sig.bin b/userspace/firmware/gv11b/gpccs_sig.bin similarity index 100% rename from userspace/firmware/gpccs_sig.bin rename to userspace/firmware/gv11b/gpccs_sig.bin diff --git a/userspace/firmware/pmu_bl.bin b/userspace/firmware/gv11b/pmu_bl.bin similarity index 100% rename from userspace/firmware/pmu_bl.bin rename to userspace/firmware/gv11b/pmu_bl.bin diff --git a/userspace/install-unit.sh b/userspace/install-unit.sh index 928646da7..c7acc75f7 100755 --- a/userspace/install-unit.sh +++ b/userspace/install-unit.sh @@ -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/required_tests.json \ nvgpu_unit/required_tests.json -jcp $TOP/kernel/nvgpu/userspace/firmware/ nvgpu_unit/firmware/gv11b/ +jcp $TOP/kernel/nvgpu/userspace/firmware/gv11b nvgpu_unit/firmware/gv11b/ 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