habanalabs: remove prints on successful device initialization
PATCH 1/3 habanalabs: remove prints on successful device initialization
Successful device initialization is mentioned in kernel log with the message "Successfully added device to habanalabs driver". There is no point of spamming the log with additional messages about successful queue testing, which are implied by the above mentioned message.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/firmware_if.c | 5 +---- drivers/misc/habanalabs/goya/goya.c | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/misc/habanalabs/firmware_if.c +1 -4
@@ -143,10 +143,7 @@ int hl_fw_test_cpu_queue(struct hl_device *hdev) sizeof(test_pkt), HL_DEVICE_TIMEOUT_USEC, &result);if (!rc) { -if (result ==ARMCP_PACKET_FENCE_VAL ) -dev_info (hdev->dev, -"queue test on CPU queue succeeded\n" ); -else +if (result !=ARMCP_PACKET_FENCE_VAL )dev_err (hdev->dev,"CPU queue test failed (0x%08lX)\n" , result); }else {
drivers/misc/habanalabs/goya/goya.c +0 -3
@@ -3006,9 +3006,6 @@ int goya_test_queue(struct hl_device *hdev, u32 hw_queue_id)"H/W queue %d test failed (scratch(0x%08llX) == 0x%08X)\n" , hw_queue_id, (unsigned long long) fence_dma_addr, tmp); rc = -EIO ; - }else { -dev_info (hdev->dev,"queue test on H/W queue %d succeeded\n" , - hw_queue_id); } free_pkt:
Signature · 1 line
2.17.1
PATCH 2/3 habanalabs: use defines for F/W files
Make the code more concise and maintainable by using defines for the F/W files.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/goya/goya.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/misc/habanalabs/goya/goya.c +5 -6
@@ -72,6 +72,9 @@* */ +#define GOYA_UBOOT_FW_FILE "habanalabs/goya/goya-u-boot.bin" +#define GOYA_LINUX_FW_FILE "habanalabs/goya/goya-fit.itb" +#define GOYA_MMU_REGS_NUM 63#define GOYA_DMA_POOL_BLK_SIZE 0x100/* 256 bytes */
@@ -2163,13 +2166,11 @@ static void goya_halt_engines(struct hl_device *hdev, bool hard_reset)*/ static int goya_push_uboot_to_device (struct hl_device *hdev) { -char fw_name[200 ];void __iomem *dst; -snprintf (fw_name,sizeof (fw_name),"habanalabs/goya/goya-u-boot.bin" ); dst = hdev->pcie_bar[SRAM_CFG_BAR_ID ] +UBOOT_FW_OFFSET ; -return hl_fw_push_fw_to_device (hdev, fw_name, dst); +return hl_fw_push_fw_to_device (hdev,GOYA_UBOOT_FW_FILE , dst); }/*
@@ -2182,13 +2183,11 @@ static int goya_push_uboot_to_device(struct hl_device *hdev)*/ static int goya_push_linux_to_device (struct hl_device *hdev) { -char fw_name[200 ];void __iomem *dst; -snprintf (fw_name,sizeof (fw_name),"habanalabs/goya/goya-fit.itb" ); dst = hdev->pcie_bar[DDR_BAR_ID ] +LINUX_FW_OFFSET ; -return hl_fw_push_fw_to_device (hdev, fw_name, dst); +return hl_fw_push_fw_to_device (hdev,GOYA_LINUX_FW_FILE , dst); }static int goya_pldm_init_cpu (struct hl_device *hdev)
Signature · 1 line
2.17.1
PATCH 3/3 habanalabs: make code more concise
In reply to Oded GabbayInstead of doing if inside if, just write them with && operator.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/habanalabs_ioctl.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/misc/habanalabs/habanalabs_ioctl.c +9 -13
@@ -60,7 +60,7 @@ static int hw_ip_info(struct hl_device *hdev, struct hl_info_args *args) hw_ip.tpc_enabled_mask = prop->tpc_enabled_mask; hw_ip.sram_size = prop->sram_size - sram_kmd_size; hw_ip.dram_size = prop->dram_size - dram_kmd_size; -if (hw_ip.dram_size >0 ) +if (hw_ip.dram_size >PAGE_SIZE ) hw_ip.dram_enabled =1 ; hw_ip.num_of_events = prop->num_of_events;
@@ -184,17 +184,14 @@ static int debug_coresight(struct hl_device *hdev, struct hl_debug_args *args) goto out; } -if (output) { -if (copy_to_user ((void __user *) (uintptr_t ) args->output_ptr, - output, - args->output_size)) { -dev_err (hdev->dev, -"copy to user failed in debug ioctl\n" ); - rc = -EFAULT ; - goto out; - } +if (output &©_to_user ((void __user *) (uintptr_t ) args->output_ptr, + output, args->output_size)) { +dev_err (hdev->dev,"copy to user failed in debug ioctl\n" ); + rc = -EFAULT ; + goto out; } + out:kfree (params);kfree (output);
@@ -434,9 +431,8 @@ static long _hl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg, retcode =func (hpriv, kdata); -if (cmd &IOC_OUT ) -if (copy_to_user ((void __user *)arg, kdata, usize)) - retcode = -EFAULT ; +if ((cmd &IOC_OUT ) &©_to_user ((void __user *)arg, kdata, usize)) + retcode = -EFAULT ; out_err:if (retcode)
Signature · 1 line
2.17.1
RE: [PATCH 3/3] habanalabs: make code more concise
Quoted 3 lines · Oded Gabbay
Instead of doing if inside if, just write them with && operator.
Signed-off-by Oded Gabbay <[email protected]>
This patch-set is:
Reviewed-by Omer Shpigelman <[email protected]>