habanalabs/goya: add dma direction enum to uapi file
PATCH 1/5 habanalabs/goya: add dma direction enum to uapi file
The values in this enum are not used by h/w but are a contract between userspace and the kernel driver so they must be defined in the uapi file.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/goya/goya.c | 28 ++++++++++++++-------------- include/uapi/misc/habanalabs.h | 27 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 14 deletions(-)
drivers/misc/habanalabs/goya/goya.c +14 -14
@@ -3403,7 +3403,7 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev, {u64 device_memory_addr, addr;enum dma_data_direction dir; -enum goya_dma_direction user_dir; +enum hl_goya_dma_direction user_dir;bool sram_addr = true;bool skip_host_mem_pin = false;bool user_memset;
@@ -3419,7 +3419,7 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev,GOYA_PKT_LIN_DMA_CTL_MEMSET_SHIFT ;switch (user_dir) { -case DMA_HOST_TO_DRAM : +case HL_DMA_HOST_TO_DRAM :dev_dbg (hdev->dev,"DMA direction is HOST --> DRAM\n" ); dir =DMA_TO_DEVICE ; sram_addr = false;
@@ -3429,7 +3429,7 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev, skip_host_mem_pin = true;break ; -case DMA_DRAM_TO_HOST : +case HL_DMA_DRAM_TO_HOST :dev_dbg (hdev->dev,"DMA direction is DRAM --> HOST\n" ); dir =DMA_FROM_DEVICE ; sram_addr = false;
@@ -3437,7 +3437,7 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev, device_memory_addr =le64_to_cpu (user_dma_pkt->src_addr);break ; -case DMA_HOST_TO_SRAM : +case HL_DMA_HOST_TO_SRAM :dev_dbg (hdev->dev,"DMA direction is HOST --> SRAM\n" ); dir =DMA_TO_DEVICE ; addr =le64_to_cpu (user_dma_pkt->src_addr);
@@ -3446,14 +3446,14 @@ static int goya_validate_dma_pkt_host(struct hl_device *hdev, skip_host_mem_pin = true;break ; -case DMA_SRAM_TO_HOST : +case HL_DMA_SRAM_TO_HOST :dev_dbg (hdev->dev,"DMA direction is SRAM --> HOST\n" ); dir =DMA_FROM_DEVICE ; addr =le64_to_cpu (user_dma_pkt->dst_addr); device_memory_addr =le64_to_cpu (user_dma_pkt->src_addr);break ;default : -dev_err (hdev->dev,"DMA direction is undefined\n" ); +dev_err (hdev->dev,"DMA direction %d is unsupported/undefined\n" , user_dir);return -EFAULT ; }
@@ -3505,14 +3505,14 @@ static int goya_validate_dma_pkt_no_host(struct hl_device *hdev, struct packet_lin_dma *user_dma_pkt) {u64 sram_memory_addr, dram_memory_addr; -enum goya_dma_direction user_dir; +enum hl_goya_dma_direction user_dir;u32 ctl; ctl =le32_to_cpu (user_dma_pkt->ctl); user_dir = (ctl &GOYA_PKT_LIN_DMA_CTL_DMA_DIR_MASK ) >>GOYA_PKT_LIN_DMA_CTL_DMA_DIR_SHIFT ; -if (user_dir ==DMA_DRAM_TO_SRAM ) { +if (user_dir ==HL_DMA_DRAM_TO_SRAM ) {dev_dbg (hdev->dev,"DMA direction is DRAM --> SRAM\n" ); dram_memory_addr =le64_to_cpu (user_dma_pkt->src_addr); sram_memory_addr =le64_to_cpu (user_dma_pkt->dst_addr);
@@ -3549,7 +3549,7 @@ static int goya_validate_dma_pkt_no_mmu(struct hl_device *hdev,struct hl_cs_parser *parser, struct packet_lin_dma *user_dma_pkt) { - enum goya_dma_direction user_dir; + enum hl_goya_dma_direction user_dir;u32 ctl;int rc;
@@ -3574,7 +3574,7 @@ static int goya_validate_dma_pkt_no_mmu(struct hl_device *hdev,return -EINVAL ; } -if ((user_dir ==DMA_DRAM_TO_SRAM ) || (user_dir ==DMA_SRAM_TO_DRAM )) +if ((user_dir ==HL_DMA_DRAM_TO_SRAM ) || (user_dir ==HL_DMA_SRAM_TO_DRAM )) rc =goya_validate_dma_pkt_no_host (hdev, parser, user_dma_pkt);else rc =goya_validate_dma_pkt_host (hdev, parser, user_dma_pkt);
@@ -3781,7 +3781,7 @@ static int goya_patch_dma_packet(struct hl_device *hdev,u32 count, dma_desc_cnt;u64 len, len_next;dma_addr_t dma_addr, dma_addr_next; -enum goya_dma_direction user_dir; +enum hl_goya_dma_direction user_dir;u64 device_memory_addr, addr;enum dma_data_direction dir;struct sg_table *sgt;
@@ -3797,14 +3797,14 @@ static int goya_patch_dma_packet(struct hl_device *hdev, user_memset = (ctl &GOYA_PKT_LIN_DMA_CTL_MEMSET_MASK ) >>GOYA_PKT_LIN_DMA_CTL_MEMSET_SHIFT ; -if ((user_dir ==DMA_DRAM_TO_SRAM ) || (user_dir ==DMA_SRAM_TO_DRAM ) || +if ((user_dir ==HL_DMA_DRAM_TO_SRAM ) || (user_dir ==HL_DMA_SRAM_TO_DRAM ) || (user_dma_pkt->tsize ==0 )) {memcpy (new_dma_pkt, user_dma_pkt,sizeof (*new_dma_pkt)); *new_dma_pkt_size =sizeof (*new_dma_pkt);return 0 ; } -if ((user_dir ==DMA_HOST_TO_DRAM ) || (user_dir ==DMA_HOST_TO_SRAM )) { +if ((user_dir ==HL_DMA_HOST_TO_DRAM ) || (user_dir ==HL_DMA_HOST_TO_SRAM )) { addr =le64_to_cpu (user_dma_pkt->src_addr); device_memory_addr =le64_to_cpu (user_dma_pkt->dst_addr); dir =DMA_TO_DEVICE ;
@@ -4804,7 +4804,7 @@ static int goya_memset_device_memory(struct hl_device *hdev, u64 addr, u64 size, (1 <<GOYA_PKT_LIN_DMA_CTL_WO_SHIFT ) | (1 <<GOYA_PKT_CTL_RB_SHIFT ) | (1 << GOYA_PKT_CTL_MB_SHIFT)); - ctl |= (is_dram ?DMA_HOST_TO_DRAM :DMA_HOST_TO_SRAM ) << + ctl |= (is_dram ?HL_DMA_HOST_TO_DRAM :HL_DMA_HOST_TO_SRAM ) <<GOYA_PKT_LIN_DMA_CTL_DMA_DIR_SHIFT ; lin_dma_pkt->ctl =cpu_to_le32 (ctl);
include/uapi/misc/habanalabs.h +27 -0
@@ -275,6 +275,33 @@ enum hl_gaudi_pll_index { HL_GAUDI_PLL_MAX }; +/** +* enum hl_goya_dma_direction - Direction of DMA operation inside a LIN_DMA packet that is +* submitted to the GOYA's DMA QMAN. This attribute is not relevant +* to the H/W but the kernel driver use it to parse the packet's +* addresses and patch/validate them. +* @HL_DMA_HOST_TO_DRAM: DMA operation from Host memory to GOYA's DDR. +* @HL_DMA_HOST_TO_SRAM: DMA operation from Host memory to GOYA's SRAM. +* @HL_DMA_DRAM_TO_SRAM: DMA operation from GOYA's DDR to GOYA's SRAM. +* @HL_DMA_SRAM_TO_DRAM: DMA operation from GOYA's SRAM to GOYA's DDR. +* @HL_DMA_SRAM_TO_HOST: DMA operation from GOYA's SRAM to Host memory. +* @HL_DMA_DRAM_TO_HOST: DMA operation from GOYA's DDR to Host memory. +* @HL_DMA_DRAM_TO_DRAM: DMA operation from GOYA's DDR to GOYA's DDR. +* @HL_DMA_SRAM_TO_SRAM: DMA operation from GOYA's SRAM to GOYA's SRAM. +* @HL_DMA_ENUM_MAX: number of values in enum +*/ +enum hl_goya_dma_direction { +HL_DMA_HOST_TO_DRAM , +HL_DMA_HOST_TO_SRAM , +HL_DMA_DRAM_TO_SRAM , +HL_DMA_SRAM_TO_DRAM , +HL_DMA_SRAM_TO_HOST , +HL_DMA_DRAM_TO_HOST , +HL_DMA_DRAM_TO_DRAM , +HL_DMA_SRAM_TO_SRAM , +HL_DMA_ENUM_MAX +}; +/** * enum hl_device_status - Device status information. * @HL_DEVICE_STATUS_OPERATIONAL: Device is operational.
Signature · 1 line
2.25.1
PATCH 2/5 habanalabs/gaudi: fix function name in comment
function name in comment didn't match actual function name.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/gaudi/gaudi_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/habanalabs/gaudi/gaudi_security.c +1 -1
@@ -469,7 +469,7 @@ static u64 gaudi_rr_hbw_mask_high_ar_regs[GAUDI_NUMBER_OF_HBW_RR_REGS] = { };/** -* gaudi_set_block_as_protected - set the given block as protected +* gaudi_pb_set_block - set the given block as protected * * @hdev: pointer to hl_device structure * @base: block base address
Signature · 1 line
2.25.1
PATCH 3/5 habanalabs/gaudi: use correct type in assignment
In reply to Oded Gabbaypackets are defined as LE so we need to convert before assigning values to them.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/gaudi/gaudi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/habanalabs/gaudi/gaudi.c +1 -1
@@ -5772,7 +5772,7 @@ static void gaudi_add_end_of_cb_packets(struct hl_device *hdev, void *kernel_add cq_pkt = kernel_address + len - (sizeof (struct packet_msg_prot ) *2 );while ((void *)cq_padding < (void *)cq_pkt) { - cq_padding->ctl =FIELD_PREP (GAUDI_PKT_CTL_OPCODE_MASK ,PACKET_NOP ); + cq_padding->ctl =cpu_to_le32 (FIELD_PREP (GAUDI_PKT_CTL_OPCODE_MASK ,PACKET_NOP )); cq_padding++; }
Signature · 1 line
2.25.1
PATCH 4/5 habanalabs/gaudi: mask constant value before cast
In reply to Oded GabbayThis fixes a sparse warning of
"cast truncates bits from constant value"
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/gaudi/gaudi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +4 -4
@@ -3384,19 +3384,19 @@ static void gaudi_init_nic_qman(struct hl_device *hdev, u32 nic_offset,u32 nic_qm_err_cfg, irq_handler_offset;u32 q_off; - mtr_base_en_lo =lower_32_bits (CFG_BASE + + mtr_base_en_lo =lower_32_bits ((CFG_BASE &U32_MAX ) + mmSYNC_MNGR_E_N_SYNC_MNGR_OBJS_MON_PAY_ADDRL_0); mtr_base_en_hi =upper_32_bits (CFG_BASE + mmSYNC_MNGR_E_N_SYNC_MNGR_OBJS_MON_PAY_ADDRL_0); - so_base_en_lo =lower_32_bits (CFG_BASE + + so_base_en_lo =lower_32_bits ((CFG_BASE &U32_MAX ) + mmSYNC_MNGR_E_N_SYNC_MNGR_OBJS_SOB_OBJ_0); so_base_en_hi =upper_32_bits (CFG_BASE + mmSYNC_MNGR_E_N_SYNC_MNGR_OBJS_SOB_OBJ_0); - mtr_base_ws_lo =lower_32_bits (CFG_BASE + + mtr_base_ws_lo =lower_32_bits ((CFG_BASE &U32_MAX ) + mmSYNC_MNGR_W_S_SYNC_MNGR_OBJS_MON_PAY_ADDRL_0); mtr_base_ws_hi =upper_32_bits (CFG_BASE + mmSYNC_MNGR_W_S_SYNC_MNGR_OBJS_MON_PAY_ADDRL_0); - so_base_ws_lo =lower_32_bits (CFG_BASE + + so_base_ws_lo =lower_32_bits ((CFG_BASE &U32_MAX ) + mmSYNC_MNGR_W_S_SYNC_MNGR_OBJS_SOB_OBJ_0); so_base_ws_hi =upper_32_bits (CFG_BASE + mmSYNC_MNGR_W_S_SYNC_MNGR_OBJS_SOB_OBJ_0);
Signature · 1 line
2.25.1
PATCH 5/5 habanalabs/gaudi: remove unused enum
In reply to Oded GabbayAlso beautify code by preferring single line wherever possible.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/gaudi/gaudi.c | 31 ++++++++------------------- 1 file changed, 9 insertions(+), 22 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +9 -22
@@ -241,12 +241,6 @@ gaudi_qman_arb_error_cause[GAUDI_NUM_OF_QM_ARB_ERR_CAUSE] = {"MSG AXI LBW returned with error" }; -enum gaudi_sm_sei_cause { -GAUDI_SM_SEI_SO_OVERFLOW , -GAUDI_SM_SEI_LBW_4B_UNALIGNED , -GAUDI_SM_SEI_AXI_RESPONSE_ERR -}; -static enum hl_queue_type gaudi_queue_type[GAUDI_QUEUE_ID_SIZE ] = {QUEUE_TYPE_EXT ,/* GAUDI_QUEUE_ID_DMA_0_0 */ QUEUE_TYPE_EXT ,/* GAUDI_QUEUE_ID_DMA_0_1 */
@@ -609,16 +603,14 @@ static int gaudi_set_fixed_properties(struct hl_device *hdev) prop->dram_base_address =DRAM_PHYS_BASE ; prop->dram_size =GAUDI_HBM_SIZE_32GB ; - prop->dram_end_address = prop->dram_base_address + - prop->dram_size; + prop->dram_end_address = prop->dram_base_address + prop->dram_size; prop->dram_user_base_address =DRAM_BASE_ADDR_USER ; prop->sram_base_address =SRAM_BASE_ADDR ; prop->sram_size =SRAM_SIZE ; - prop->sram_end_address = prop->sram_base_address + - prop->sram_size; - prop->sram_user_base_address = prop->sram_base_address + -SRAM_USER_BASE_OFFSET ; + prop->sram_end_address = prop->sram_base_address + prop->sram_size; + prop->sram_user_base_address = + prop->sram_base_address +SRAM_USER_BASE_OFFSET ; prop->mmu_pgt_addr =MMU_PAGE_TABLES_ADDR ;if (hdev->pldm)
@@ -7766,8 +7758,7 @@ static int tpc_krn_event_to_tpc_id(u16 tpc_dec_event_type)return (tpc_dec_event_type -GAUDI_EVENT_TPC0_KRN_ERR ) /6 ; } -static void gaudi_print_clk_change_info (struct hl_device *hdev, -u16 event_type) +static void gaudi_print_clk_change_info (struct hl_device *hdev,u16 event_type) {ktime_t zero_time =ktime_set (0 ,0 );
@@ -7815,8 +7806,7 @@ static void gaudi_print_clk_change_info(struct hl_device *hdev,mutex_unlock (&hdev->clk_throttling.lock); } -static void gaudi_handle_eqe (struct hl_device *hdev, -struct hl_eq_entry *eq_entry) +static void gaudi_handle_eqe (struct hl_device *hdev,struct hl_eq_entry *eq_entry) {struct gaudi_device *gaudi = hdev->asic_specific;u64 data =le64_to_cpu (eq_entry->data[0 ]), event_mask =0 ;
@@ -8103,8 +8093,7 @@ static void gaudi_handle_eqe(struct hl_device *hdev,hl_fw_unmask_irq (hdev, event_type); } -static void *gaudi_get_events_stat (struct hl_device *hdev,bool aggregate, -u32 *size) +static void *gaudi_get_events_stat (struct hl_device *hdev,bool aggregate,u32 *size) {struct gaudi_device *gaudi = hdev->asic_specific;
@@ -8117,8 +8106,7 @@ static void *gaudi_get_events_stat(struct hl_device *hdev, bool aggregate,return gaudi->events_stat; } -static int gaudi_mmu_invalidate_cache (struct hl_device *hdev,bool is_hard, -u32 flags) +static int gaudi_mmu_invalidate_cache (struct hl_device *hdev,bool is_hard,u32 flags) {struct gaudi_device *gaudi = hdev->asic_specific;u32 status, timeout_usec;
@@ -8161,8 +8149,7 @@ static int gaudi_mmu_invalidate_cache_range(struct hl_device *hdev,return hdev->asic_funcs->mmu_invalidate_cache (hdev, is_hard, flags); } -static int gaudi_mmu_update_asid_hop0_addr (struct hl_device *hdev, -u32 asid,u64 phys_addr) +static int gaudi_mmu_update_asid_hop0_addr (struct hl_device *hdev,u32 asid,u64 phys_addr) {u32 status, timeout_usec;int rc;
Signature · 1 line
2.25.1