已合并
add dcmi version #7
Ayran创建于 2025年12月25日
add dcmi version #7
已合并
从已删除 :add_dcmi_version合入到cann/drivermaster
共 4 个文件变更+4-3
| @@ -243,6 +243,7 @@ trap cleanup INT | |||
| 243 | build_abl() | 243 | build_abl() |
| 244 | { | 244 | { |
| 245 | echo "create build directory and build ABL"; | 245 | echo "create build directory and build ABL"; |
| 246 | + export PROJECT_VERSION=$(cat scripts/package/driver/ascend910B/scripts/sys_version/sys_version.conf) | ||
| 246 | mk_dir "${BUILD_PATH}" | 247 | mk_dir "${BUILD_PATH}" |
| 247 | cd "${BUILD_PATH}" | 248 | cd "${BUILD_PATH}" |
| 248 | 249 | ||
| @@ -12,6 +12,7 @@ | |||
| 12 | #set(BUILD_CH $ENV{BUILD_CH}) | 12 | #set(BUILD_CH $ENV{BUILD_CH}) |
| 13 | set(BUILD_CH false) | 13 | set(BUILD_CH false) |
| 14 | set(BUILD_FLAG COMMERCIAL_FLAG) | 14 | set(BUILD_FLAG COMMERCIAL_FLAG) |
| 15 | +set(PROJECT_VERSION $ENV{PROJECT_VERSION}) | ||
| 15 | 16 | ||
| 16 | message(STATUS "BUILD_CH: ${BUILD_CH}") | 17 | message(STATUS "BUILD_CH: ${BUILD_CH}") |
| 17 | 18 | ||
| @@ -501,14 +501,13 @@ STATIC int show_bar_map(struct pci_dev *pdev) | |||
| 501 | 501 | ||
| 502 | STATIC void pci_bar_free(struct pci_dev *pdev) | 502 | STATIC void pci_bar_free(struct pci_dev *pdev) |
| 503 | { | 503 | { |
| 504 | - int i; | ||
| 505 | struct pci_dev_info *tc_pci_dev = ka_pci_get_drvdata(pdev); | 504 | struct pci_dev_info *tc_pci_dev = ka_pci_get_drvdata(pdev); |
| 506 | 505 | ||
| 507 | if (tc_pci_dev->bar_mem_addr != NULL) { | 506 | if (tc_pci_dev->bar_mem_addr != NULL) { |
| 508 | ka_mm_iounmap(tc_pci_dev->bar_mem_addr); | 507 | ka_mm_iounmap(tc_pci_dev->bar_mem_addr); |
| 509 | tc_pci_dev->bar_mem_addr = NULL; | 508 | tc_pci_dev->bar_mem_addr = NULL; |
| 510 | tc_pci_dev->bar_mem_len = 0; | 509 | tc_pci_dev->bar_mem_len = 0; |
| 511 | - printk(KA_KERN_ERR "[lqdcmi]bar[%d] mem free OK\n", i); | 510 | + printk(KA_KERN_ERR "[lqdcmi]bar mem free OK\n"); |
| 512 | } | 511 | } |
| 513 | } | 512 | } |
| 514 | 513 | ||
| @@ -684,7 +684,7 @@ static int debug_drv_open(ka_inode_t *a, ka_file_t *fd) | |||
| 684 | static int debug_drv_release(ka_inode_t *a, ka_file_t *fd) | 684 | static int debug_drv_release(ka_inode_t *a, ka_file_t *fd) |
| 685 | { | 685 | { |
| 686 | int i; | 686 | int i; |
| 687 | - int ret; | 687 | + int ret = 0; |
| 688 | TD_PRINT_INFO("misc file release pid=%d\n", ka_task_get_current_pid()); | 688 | TD_PRINT_INFO("misc file release pid=%d\n", ka_task_get_current_pid()); |
| 689 | for (i = 0; i < DEVICE_NUM_MAX; ++i) { | 689 | for (i = 0; i < DEVICE_NUM_MAX; ++i) { |
| 690 | TD_PRINT_INFO("debugger_pid = %d\n", g_sqcq_chn_info_list[i].debugger_pid); | 690 | TD_PRINT_INFO("debugger_pid = %d\n", g_sqcq_chn_info_list[i].debugger_pid); |