habanalabs: re-factor goya_parse_cb_no_ext_queue()
PATCH 1/2 habanalabs: re-factor goya_parse_cb_no_ext_queue()
This patch re-factors goya_parse_cb_no_ext_queue() to make it more readable by inverting the check inside the first if statement so the bulk of the function won't be inside an if statement.
The patch also fixes a spelling error in the name of the function.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/goya/goya.c | 43 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 22 deletions(-)
drivers/misc/habanalabs/goya/goya.c +21 -22
@@ -3859,36 +3859,35 @@ static int goya_parse_cb_no_mmu(struct hl_device *hdev,return rc; } -static int goya_parse_cb_no_ext_quque (struct hl_device *hdev, +static int goya_parse_cb_no_ext_queue (struct hl_device *hdev,struct hl_cs_parser *parser) {struct asic_fixed_properties *asic_prop = &hdev->asic_prop;struct goya_device *goya = hdev->asic_specific; -if (!(goya->hw_cap_initialized &HW_CAP_MMU )) { -/* For internal queue jobs, just check if cb address is valid */ -if (hl_mem_area_inside_range ( - (u64 ) (uintptr_t ) parser->user_cb, - parser->user_cb_size, - asic_prop->sram_user_base_address, - asic_prop->sram_end_address)) -return 0 ; +if (goya->hw_cap_initialized &HW_CAP_MMU ) +return 0 ; -if (hl_mem_area_inside_range ( - (u64 ) (uintptr_t ) parser->user_cb, - parser->user_cb_size, - asic_prop->dram_user_base_address, - asic_prop->dram_end_address)) -return 0 ; +/* For internal queue jobs, just check if CB address is valid */ +if (hl_mem_area_inside_range ( + (u64 ) (uintptr_t ) parser->user_cb, + parser->user_cb_size, + asic_prop->sram_user_base_address, + asic_prop->sram_end_address)) +return 0 ; -dev_err (hdev->dev, -"Internal CB address %px + 0x%x is not in SRAM nor in DRAM\n" , - parser->user_cb, parser->user_cb_size); +if (hl_mem_area_inside_range ( + (u64 ) (uintptr_t ) parser->user_cb, + parser->user_cb_size, + asic_prop->dram_user_base_address, + asic_prop->dram_end_address)) +return 0 ; -return -EFAULT ; - } +dev_err (hdev->dev, +"Internal CB address %px + 0x%x is not in SRAM nor in DRAM\n" , + parser->user_cb, parser->user_cb_size); -return 0 ; +return -EFAULT ; }int goya_cs_parser (struct hl_device *hdev,struct hl_cs_parser *parser)
@@ -3896,7 +3895,7 @@ int goya_cs_parser(struct hl_device *hdev, struct hl_cs_parser *parser)struct goya_device *goya = hdev->asic_specific;if (!parser->ext_queue) -return goya_parse_cb_no_ext_quque (hdev, parser); +return goya_parse_cb_no_ext_queue (hdev, parser);if ((goya->hw_cap_initialized &HW_CAP_MMU ) && parser->use_virt_addr)return goya_parse_cb_mmu (hdev, parser);
Signature · 1 line
2.17.1
PATCH 2/2 uapi/habanalabs: add missing fields in bmon params
This patch adds missing fields of start address 0 and 1 in the bmon parameter structure that is received from the user in the debug IOCTL.
Without these fields, the functionality of the bmon trace is broken, because there is no configuration of the base address of the filter of the bus monitor.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/goya/goya_coresight.c | 16 ++++++++++++---- include/uapi/misc/habanalabs.h | 9 ++++++--- 2 files changed, 18 insertions(+), 7 deletions(-)
drivers/misc/habanalabs/goya/goya_coresight.c +12 -4
@@ -459,10 +459,14 @@ static int goya_config_bmon(struct hl_device *hdev,if (!input)return -EINVAL ; -WREG32 (base_reg +0x208 ,lower_32_bits (input->addr_range0)); -WREG32 (base_reg +0x20C ,upper_32_bits (input->addr_range0)); -WREG32 (base_reg +0x248 ,lower_32_bits (input->addr_range1)); -WREG32 (base_reg +0x24C ,upper_32_bits (input->addr_range1)); +WREG32 (base_reg +0x200 ,lower_32_bits (input->start_addr0)); +WREG32 (base_reg +0x204 ,upper_32_bits (input->start_addr0)); +WREG32 (base_reg +0x208 ,lower_32_bits (input->addr_mask0)); +WREG32 (base_reg +0x20C ,upper_32_bits (input->addr_mask0)); +WREG32 (base_reg +0x240 ,lower_32_bits (input->start_addr1)); +WREG32 (base_reg +0x244 ,upper_32_bits (input->start_addr1)); +WREG32 (base_reg +0x248 ,lower_32_bits (input->addr_mask1)); +WREG32 (base_reg +0x24C ,upper_32_bits (input->addr_mask1));WREG32 (base_reg +0x224 ,0 );WREG32 (base_reg +0x234 ,0 );WREG32 (base_reg +0x30C , input->bw_win);
@@ -482,8 +486,12 @@ static int goya_config_bmon(struct hl_device *hdev,WREG32 (base_reg +0x100 ,0x11 );WREG32 (base_reg +0x304 ,0x1 ); }else { +WREG32 (base_reg +0x200 ,0 ); +WREG32 (base_reg +0x204 ,0 );WREG32 (base_reg +0x208 ,0xFFFFFFFF );WREG32 (base_reg +0x20C ,0xFFFFFFFF ); +WREG32 (base_reg +0x240 ,0 ); +WREG32 (base_reg +0x244 ,0 );WREG32 (base_reg +0x248 ,0xFFFFFFFF );WREG32 (base_reg +0x24C ,0xFFFFFFFF );WREG32 (base_reg +0x224 ,0xFFFFFFFF );
include/uapi/misc/habanalabs.h +6 -3
@@ -374,9 +374,12 @@ struct hl_debug_params_stm { };struct hl_debug_params_bmon { -/* Transaction address filter */ -__u64 addr_range0; -__u64 addr_range1; +/* Two address ranges that the user can request to filter */ +__u64 start_addr0; +__u64 addr_mask0; + +__u64 start_addr1; +__u64 addr_mask1;/* Capture window configuration */ __u32 bw_win;
Signature · 1 line
2.17.1