habanalabs: Add INFO IOCTL opcode for time sync information
PATCH 1/5 habanalabs: Add INFO IOCTL opcode for time sync information
From: Tomer Tayar <[email protected]>
Add a new opcode to the INFO IOCTL that retrieves the device time alongside the host time, to allow a user application that want to measure device time together with host time (such as a profiler) to synchronize these times.
--- drivers/misc/habanalabs/goya/goya.c | 10 +++- drivers/misc/habanalabs/goya/goyaP.h | 1 + drivers/misc/habanalabs/habanalabs.h | 2 + drivers/misc/habanalabs/habanalabs_ioctl.c | 19 +++++++ .../include/goya/asic_reg/goya_regs.h | 1 + .../goya/asic_reg/psoc_timestamp_regs.h | 56 +++++++++++++++++++ include/uapi/misc/habanalabs.h | 8 +++ 7 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_timestamp_regs.h
drivers/misc/habanalabs/goya/goya.c +9 -1
@@ -5200,6 +5200,13 @@ static void goya_set_dma_mask_from_fw(struct hl_device *hdev) } } +u64 goya_get_device_time (struct hl_device *hdev) +{ +u64 device_time = ((u64 )RREG32 (mmPSOC_TIMESTAMP_CNTCVU)) <<32 ; + +return device_time |RREG32 (mmPSOC_TIMESTAMP_CNTCVL); +} +static const struct hl_asic_funcs goya_funcs = { .early_init = goya_early_init, .early_fini = goya_early_fini,
@@ -5263,7 +5270,8 @@ static const struct hl_asic_funcs goya_funcs = { .get_queue_id_for_cq = goya_get_queue_id_for_cq, .read_device_fw_version = goya_read_device_fw_version, .load_firmware_to_device = goya_load_firmware_to_device, - .set_dma_mask_from_fw = goya_set_dma_mask_from_fw + .set_dma_mask_from_fw = goya_set_dma_mask_from_fw, + .get_device_time = goya_get_device_time };/*
drivers/misc/habanalabs/goya/goyaP.h +1 -0
@@ -231,5 +231,6 @@ void goya_mmu_remove_device_cpu_mappings(struct hl_device *hdev);int goya_get_clk_rate (struct hl_device *hdev,u32 *cur_clk,u32 *max_clk);u32 goya_get_queue_id_for_cq (struct hl_device *hdev,u32 cq_idx); +u64 goya_get_device_time (struct hl_device *hdev);#endif /* GOYAP_H_ */
drivers/misc/habanalabs/habanalabs.h +2 -0
@@ -554,6 +554,7 @@ enum hl_pll_frequency {* @load_firmware_to_device: load the firmware to the device's memory * @set_dma_mask_from_fw: set the DMA mask in the driver according to the * firmware configuration +* @get_device_time: Get the device time. */ struct hl_asic_funcs {int (*early_init)(struct hl_device *hdev);
@@ -646,6 +647,7 @@ struct hl_asic_funcs { enum hl_fw_component fwc);int (*load_firmware_to_device)(struct hl_device *hdev);void (*set_dma_mask_from_fw)(struct hl_device *hdev); +u64 (*get_device_time)(struct hl_device *hdev); };
drivers/misc/habanalabs/habanalabs_ioctl.c +19 -0
@@ -258,6 +258,22 @@ static int get_reset_count(struct hl_device *hdev, struct hl_info_args *args) min((size_t) max_size, sizeof(reset_count))) ? -EFAULT : 0; } +static int time_sync_info (struct hl_device *hdev,struct hl_info_args *args) +{ +struct hl_info_time_sync time_sync = {0 }; +u32 max_size = args->return_size; +void __user *out = (void __user *) (uintptr_t ) args->return_pointer; + +if ((!max_size) || (!out)) +return -EINVAL ; + + time_sync.device_time = hdev->asic_funcs->get_device_time (hdev); + time_sync.host_time =ktime_get_raw_ns (); + +return copy_to_user (out, &time_sync, +min ((size_t ) max_size,sizeof (time_sync))) ? -EFAULT :0 ; +} +static int _hl_info_ioctl (struct hl_fpriv *hpriv,void *data,struct device *dev) {
@@ -315,6 +331,9 @@ static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data, rc =get_clk_rate (hdev, args);break ; +case HL_INFO_TIME_SYNC : +return time_sync_info (hdev, args); +default :dev_err (dev,"Invalid request %d\n" , args->op); rc = -ENOTTY ;
drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h +1 -0
@@ -18,6 +18,7 @@#include "psoc_mme_pll_regs.h" #include "psoc_pci_pll_regs.h" #include "psoc_emmc_pll_regs.h" +#include "psoc_timestamp_regs.h" #include "cpu_if_regs.h" #include "cpu_ca53_cfg_regs.h" #include "cpu_pll_regs.h"
drivers/misc/habanalabs/include/goya/asic_reg/psoc_timestamp_regs.h new file +56 -0
56 lines not on this page · raw message
include/uapi/misc/habanalabs.h +8 -0
@@ -101,6 +101,8 @@ enum hl_device_status {* HL_INFO_RESET_COUNT - Retrieve the counts of the soft and hard reset * operations performed on the device since the last * time the driver was loaded. +* HL_INFO_TIME_SYNC - Retrieve the device's time alongside the host's time +* for synchronization. */ #define HL_INFO_HW_IP_INFO 0#define HL_INFO_HW_EVENTS 1
@@ -111,6 +113,7 @@ enum hl_device_status {#define HL_INFO_HW_EVENTS_AGGREGATE 7#define HL_INFO_CLK_RATE 8#define HL_INFO_RESET_COUNT 9 +#define HL_INFO_TIME_SYNC 10#define HL_INFO_VERSION_MAX_LEN 128#define HL_INFO_CARD_NAME_MAX_LEN 16
@@ -169,6 +172,11 @@ struct hl_info_reset_count {__u32 soft_reset_cnt; }; +struct hl_info_time_sync { +__u64 device_time; +__u64 host_time; +}; +struct hl_info_args {/* Location of relevant struct in userspace */ __u64 return_pointer;
Signature · 1 line
2.17.1
PATCH 2/5 habanalabs: Allow access to TPC LFSR register
From: Tomer Tayar <[email protected]>
Allow user access to TPC LFSR register, as it might be accessed by TPC kernels.
--- drivers/misc/habanalabs/goya/goya_security.c | 1 - 1 file changed, 1 deletion(-)
drivers/misc/habanalabs/goya/goya_security.c +0 -1
@@ -683,7 +683,6 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev) mask =1 << ((mmTPC0_CFG_SEMAPHORE &0x7F ) >>2 ); mask |=1 << ((mmTPC0_CFG_VFLAGS &0x7F ) >>2 ); mask |=1 << ((mmTPC0_CFG_SFLAGS &0x7F ) >>2 ); - mask |=1 << ((mmTPC0_CFG_LFSR_POLYNOM &0x7F ) >>2 ); mask |=1 << ((mmTPC0_CFG_STATUS &0x7F ) >>2 );WREG32 (pb_addr + word_offset, ~mask);
Signature · 1 line
2.17.1
PATCH 3/5 habanalabs: Align protection bits configuration of all TPCs
In reply to Oded GabbayFrom: Tomer Tayar <[email protected]>
Align the protection bits configuration of all TPC cores to be as of TPC core 0.
--- drivers/misc/habanalabs/goya/goya_security.c | 99 +++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-)
drivers/misc/habanalabs/goya/goya_security.c +98 -1
@@ -694,7 +694,6 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev) mask |=1 << ((mmTPC0_CFG_CFG_SUBTRACT_VALUE &0x7F ) >>2 ); mask |=1 << ((mmTPC0_CFG_SM_BASE_ADDRESS_LOW &0x7F ) >>2 ); mask |=1 << ((mmTPC0_CFG_SM_BASE_ADDRESS_HIGH &0x7F ) >>2 ); - mask |=1 << ((mmTPC0_CFG_CFG_SUBTRACT_VALUE &0x7F ) >>2 ); mask |=1 << ((mmTPC0_CFG_TPC_STALL &0x7F ) >>2 ); mask |=1 << ((mmTPC0_CFG_MSS_CONFIG &0x7F ) >>2 ); mask |=1 << ((mmTPC0_CFG_TPC_INTR_CAUSE &0x7F ) >>2 );
@@ -874,6 +873,16 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev)goya_pb_set_block (hdev, mmTPC1_RD_REGULATOR_BASE);goya_pb_set_block (hdev, mmTPC1_WR_REGULATOR_BASE); + pb_addr = (mmTPC1_CFG_SEMAPHORE & ~0xFFF ) +PROT_BITS_OFFS ; + word_offset = ((mmTPC1_CFG_SEMAPHORE &PROT_BITS_OFFS ) >>7 ) <<2 ; + + mask =1 << ((mmTPC1_CFG_SEMAPHORE &0x7F ) >>2 ); + mask |=1 << ((mmTPC1_CFG_VFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC1_CFG_SFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC1_CFG_STATUS &0x7F ) >>2 ); + +WREG32 (pb_addr + word_offset, ~mask); + pb_addr = (mmTPC1_CFG_CFG_BASE_ADDRESS_HIGH & ~0xFFF ) +PROT_BITS_OFFS ; word_offset = ((mmTPC1_CFG_CFG_BASE_ADDRESS_HIGH &PROT_BITS_OFFS ) >>7 ) <<2 ;
@@ -881,6 +890,10 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev) mask |=1 << ((mmTPC1_CFG_CFG_SUBTRACT_VALUE &0x7F ) >>2 ); mask |=1 << ((mmTPC1_CFG_SM_BASE_ADDRESS_LOW &0x7F ) >>2 ); mask |=1 << ((mmTPC1_CFG_SM_BASE_ADDRESS_HIGH &0x7F ) >>2 ); + mask |=1 << ((mmTPC1_CFG_TPC_STALL &0x7F ) >>2 ); + mask |=1 << ((mmTPC1_CFG_MSS_CONFIG &0x7F ) >>2 ); + mask |=1 << ((mmTPC1_CFG_TPC_INTR_CAUSE &0x7F ) >>2 ); + mask |=1 << ((mmTPC1_CFG_TPC_INTR_MASK &0x7F ) >>2 );WREG32 (pb_addr + word_offset, ~mask);
@@ -1056,6 +1069,16 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev)goya_pb_set_block (hdev, mmTPC2_RD_REGULATOR_BASE);goya_pb_set_block (hdev, mmTPC2_WR_REGULATOR_BASE); + pb_addr = (mmTPC2_CFG_SEMAPHORE & ~0xFFF ) +PROT_BITS_OFFS ; + word_offset = ((mmTPC2_CFG_SEMAPHORE &PROT_BITS_OFFS ) >>7 ) <<2 ; + + mask =1 << ((mmTPC2_CFG_SEMAPHORE &0x7F ) >>2 ); + mask |=1 << ((mmTPC2_CFG_VFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC2_CFG_SFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC2_CFG_STATUS &0x7F ) >>2 ); + +WREG32 (pb_addr + word_offset, ~mask); + pb_addr = (mmTPC2_CFG_CFG_BASE_ADDRESS_HIGH & ~0xFFF ) +PROT_BITS_OFFS ; word_offset = ((mmTPC2_CFG_CFG_BASE_ADDRESS_HIGH &PROT_BITS_OFFS ) >>7 ) <<2 ;
@@ -1063,6 +1086,10 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev) mask |=1 << ((mmTPC2_CFG_CFG_SUBTRACT_VALUE &0x7F ) >>2 ); mask |=1 << ((mmTPC2_CFG_SM_BASE_ADDRESS_LOW &0x7F ) >>2 ); mask |=1 << ((mmTPC2_CFG_SM_BASE_ADDRESS_HIGH &0x7F ) >>2 ); + mask |=1 << ((mmTPC2_CFG_TPC_STALL &0x7F ) >>2 ); + mask |=1 << ((mmTPC2_CFG_MSS_CONFIG &0x7F ) >>2 ); + mask |=1 << ((mmTPC2_CFG_TPC_INTR_CAUSE &0x7F ) >>2 ); + mask |=1 << ((mmTPC2_CFG_TPC_INTR_MASK &0x7F ) >>2 );WREG32 (pb_addr + word_offset, ~mask);
@@ -1238,6 +1265,16 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev)goya_pb_set_block (hdev, mmTPC3_RD_REGULATOR_BASE);goya_pb_set_block (hdev, mmTPC3_WR_REGULATOR_BASE); + pb_addr = (mmTPC3_CFG_SEMAPHORE & ~0xFFF ) +PROT_BITS_OFFS ; + word_offset = ((mmTPC3_CFG_SEMAPHORE &PROT_BITS_OFFS ) >>7 ) <<2 ; + + mask =1 << ((mmTPC3_CFG_SEMAPHORE &0x7F ) >>2 ); + mask |=1 << ((mmTPC3_CFG_VFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC3_CFG_SFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC3_CFG_STATUS &0x7F ) >>2 ); + +WREG32 (pb_addr + word_offset, ~mask); + pb_addr = (mmTPC3_CFG_CFG_BASE_ADDRESS_HIGH & ~0xFFF ) +PROT_BITS_OFFS ; word_offset = ((mmTPC3_CFG_CFG_BASE_ADDRESS_HIGH &PROT_BITS_OFFS ) >>7 ) <<2 ;
@@ -1245,6 +1282,10 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev) mask |=1 << ((mmTPC3_CFG_CFG_SUBTRACT_VALUE &0x7F ) >>2 ); mask |=1 << ((mmTPC3_CFG_SM_BASE_ADDRESS_LOW &0x7F ) >>2 ); mask |=1 << ((mmTPC3_CFG_SM_BASE_ADDRESS_HIGH &0x7F ) >>2 ); + mask |=1 << ((mmTPC3_CFG_TPC_STALL &0x7F ) >>2 ); + mask |=1 << ((mmTPC3_CFG_MSS_CONFIG &0x7F ) >>2 ); + mask |=1 << ((mmTPC3_CFG_TPC_INTR_CAUSE &0x7F ) >>2 ); + mask |=1 << ((mmTPC3_CFG_TPC_INTR_MASK &0x7F ) >>2 );WREG32 (pb_addr + word_offset, ~mask);
@@ -1420,6 +1461,16 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev)goya_pb_set_block (hdev, mmTPC4_RD_REGULATOR_BASE);goya_pb_set_block (hdev, mmTPC4_WR_REGULATOR_BASE); + pb_addr = (mmTPC4_CFG_SEMAPHORE & ~0xFFF ) +PROT_BITS_OFFS ; + word_offset = ((mmTPC4_CFG_SEMAPHORE &PROT_BITS_OFFS ) >>7 ) <<2 ; + + mask =1 << ((mmTPC4_CFG_SEMAPHORE &0x7F ) >>2 ); + mask |=1 << ((mmTPC4_CFG_VFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC4_CFG_SFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC4_CFG_STATUS &0x7F ) >>2 ); + +WREG32 (pb_addr + word_offset, ~mask); + pb_addr = (mmTPC4_CFG_CFG_BASE_ADDRESS_HIGH & ~0xFFF ) +PROT_BITS_OFFS ; word_offset = ((mmTPC4_CFG_CFG_BASE_ADDRESS_HIGH &PROT_BITS_OFFS ) >>7 ) <<2 ;
@@ -1427,6 +1478,10 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev) mask |=1 << ((mmTPC4_CFG_CFG_SUBTRACT_VALUE &0x7F ) >>2 ); mask |=1 << ((mmTPC4_CFG_SM_BASE_ADDRESS_LOW &0x7F ) >>2 ); mask |=1 << ((mmTPC4_CFG_SM_BASE_ADDRESS_HIGH &0x7F ) >>2 ); + mask |=1 << ((mmTPC4_CFG_TPC_STALL &0x7F ) >>2 ); + mask |=1 << ((mmTPC4_CFG_MSS_CONFIG &0x7F ) >>2 ); + mask |=1 << ((mmTPC4_CFG_TPC_INTR_CAUSE &0x7F ) >>2 ); + mask |=1 << ((mmTPC4_CFG_TPC_INTR_MASK &0x7F ) >>2 );WREG32 (pb_addr + word_offset, ~mask);
@@ -1602,6 +1657,16 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev)goya_pb_set_block (hdev, mmTPC5_RD_REGULATOR_BASE);goya_pb_set_block (hdev, mmTPC5_WR_REGULATOR_BASE); + pb_addr = (mmTPC5_CFG_SEMAPHORE & ~0xFFF ) +PROT_BITS_OFFS ; + word_offset = ((mmTPC5_CFG_SEMAPHORE &PROT_BITS_OFFS ) >>7 ) <<2 ; + + mask =1 << ((mmTPC5_CFG_SEMAPHORE &0x7F ) >>2 ); + mask |=1 << ((mmTPC5_CFG_VFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC5_CFG_SFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC5_CFG_STATUS &0x7F ) >>2 ); + +WREG32 (pb_addr + word_offset, ~mask); + pb_addr = (mmTPC5_CFG_CFG_BASE_ADDRESS_HIGH & ~0xFFF ) +PROT_BITS_OFFS ; word_offset = ((mmTPC5_CFG_CFG_BASE_ADDRESS_HIGH &PROT_BITS_OFFS ) >>7 ) <<2 ;
@@ -1609,6 +1674,10 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev) mask |=1 << ((mmTPC5_CFG_CFG_SUBTRACT_VALUE &0x7F ) >>2 ); mask |=1 << ((mmTPC5_CFG_SM_BASE_ADDRESS_LOW &0x7F ) >>2 ); mask |=1 << ((mmTPC5_CFG_SM_BASE_ADDRESS_HIGH &0x7F ) >>2 ); + mask |=1 << ((mmTPC5_CFG_TPC_STALL &0x7F ) >>2 ); + mask |=1 << ((mmTPC5_CFG_MSS_CONFIG &0x7F ) >>2 ); + mask |=1 << ((mmTPC5_CFG_TPC_INTR_CAUSE &0x7F ) >>2 ); + mask |=1 << ((mmTPC5_CFG_TPC_INTR_MASK &0x7F ) >>2 );WREG32 (pb_addr + word_offset, ~mask);
@@ -1784,6 +1853,16 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev)goya_pb_set_block (hdev, mmTPC6_RD_REGULATOR_BASE);goya_pb_set_block (hdev, mmTPC6_WR_REGULATOR_BASE); + pb_addr = (mmTPC6_CFG_SEMAPHORE & ~0xFFF ) +PROT_BITS_OFFS ; + word_offset = ((mmTPC6_CFG_SEMAPHORE &PROT_BITS_OFFS ) >>7 ) <<2 ; + + mask =1 << ((mmTPC6_CFG_SEMAPHORE &0x7F ) >>2 ); + mask |=1 << ((mmTPC6_CFG_VFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC6_CFG_SFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC6_CFG_STATUS &0x7F ) >>2 ); + +WREG32 (pb_addr + word_offset, ~mask); + pb_addr = (mmTPC6_CFG_CFG_BASE_ADDRESS_HIGH & ~0xFFF ) +PROT_BITS_OFFS ; word_offset = ((mmTPC6_CFG_CFG_BASE_ADDRESS_HIGH &PROT_BITS_OFFS ) >>7 ) <<2 ;
@@ -1791,6 +1870,10 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev) mask |=1 << ((mmTPC6_CFG_CFG_SUBTRACT_VALUE &0x7F ) >>2 ); mask |=1 << ((mmTPC6_CFG_SM_BASE_ADDRESS_LOW &0x7F ) >>2 ); mask |=1 << ((mmTPC6_CFG_SM_BASE_ADDRESS_HIGH &0x7F ) >>2 ); + mask |=1 << ((mmTPC6_CFG_TPC_STALL &0x7F ) >>2 ); + mask |=1 << ((mmTPC6_CFG_MSS_CONFIG &0x7F ) >>2 ); + mask |=1 << ((mmTPC6_CFG_TPC_INTR_CAUSE &0x7F ) >>2 ); + mask |=1 << ((mmTPC6_CFG_TPC_INTR_MASK &0x7F ) >>2 );WREG32 (pb_addr + word_offset, ~mask);
@@ -1966,6 +2049,16 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev)goya_pb_set_block (hdev, mmTPC7_RD_REGULATOR_BASE);goya_pb_set_block (hdev, mmTPC7_WR_REGULATOR_BASE); + pb_addr = (mmTPC7_CFG_SEMAPHORE & ~0xFFF ) +PROT_BITS_OFFS ; + word_offset = ((mmTPC7_CFG_SEMAPHORE &PROT_BITS_OFFS ) >>7 ) <<2 ; + + mask =1 << ((mmTPC7_CFG_SEMAPHORE &0x7F ) >>2 ); + mask |=1 << ((mmTPC7_CFG_VFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC7_CFG_SFLAGS &0x7F ) >>2 ); + mask |=1 << ((mmTPC7_CFG_STATUS &0x7F ) >>2 ); + +WREG32 (pb_addr + word_offset, ~mask); + pb_addr = (mmTPC7_CFG_CFG_BASE_ADDRESS_HIGH & ~0xFFF ) +PROT_BITS_OFFS ; word_offset = ((mmTPC7_CFG_CFG_BASE_ADDRESS_HIGH &PROT_BITS_OFFS ) >>7 ) <<2 ;
@@ -1973,6 +2066,10 @@ static void goya_init_tpc_protection_bits(struct hl_device *hdev) mask |=1 << ((mmTPC7_CFG_CFG_SUBTRACT_VALUE &0x7F ) >>2 ); mask |=1 << ((mmTPC7_CFG_SM_BASE_ADDRESS_LOW &0x7F ) >>2 ); mask |=1 << ((mmTPC7_CFG_SM_BASE_ADDRESS_HIGH &0x7F ) >>2 ); + mask |=1 << ((mmTPC7_CFG_TPC_STALL &0x7F ) >>2 ); + mask |=1 << ((mmTPC7_CFG_MSS_CONFIG &0x7F ) >>2 ); + mask |=1 << ((mmTPC7_CFG_TPC_INTR_CAUSE &0x7F ) >>2 ); + mask |=1 << ((mmTPC7_CFG_TPC_INTR_MASK &0x7F ) >>2 );WREG32 (pb_addr + word_offset, ~mask);
Signature · 1 line
2.17.1
PATCH 4/5 habanalabs: support hwmon_reset_history attribute
In reply to Oded GabbayFrom: Christine Gharzuzi <[email protected]>
Support hwmon_temp_reset_histroy, hwmon_in_reset_history and hwmon_curr_reset attribute which resets the historical highest value.
--- drivers/misc/habanalabs/habanalabs.h | 4 ++ drivers/misc/habanalabs/hwmon.c | 75 ++++++++++++++++++++++ drivers/misc/habanalabs/include/armcp_if.h | 21 +++++- 3 files changed, 97 insertions(+), 3 deletions(-)
drivers/misc/habanalabs/habanalabs.h +4 -0
@@ -1676,6 +1676,10 @@ void hl_set_pwm_info(struct hl_device *hdev, int sensor_index, u32 attr, long value);u64 hl_get_max_power (struct hl_device *hdev);void hl_set_max_power (struct hl_device *hdev,u64 value); +int hl_set_voltage (struct hl_device *hdev, +int sensor_index,u32 attr,long value); +int hl_set_current (struct hl_device *hdev, +int sensor_index,u32 attr,long value);#ifdef CONFIG_DEBUG_FS
drivers/misc/habanalabs/hwmon.c +75 -0
111 lines not on this page · raw message
drivers/misc/habanalabs/include/armcp_if.h +18 -3
@@ -193,6 +193,16 @@ enum pq_init_status {* Set the value of the offset property of a specified thermal sensor. * The packet's arguments specify the desired sensor and the field to * set. +* +* ARMCP_PACKET_VOLTAGE_SET - +* Trigger the reset_history property of a specified voltage sensor. +* The packet's arguments specify the desired sensor and the field to +* set. +* +* ARMCP_PACKET_CURRENT_SET - +* Trigger the reset_history property of a specified current sensor. +* The packet's arguments specify the desired sensor and the field to +* set. */ enum armcp_packet_id {
@@ -220,6 +230,8 @@ enum armcp_packet_id {ARMCP_PACKET_EEPROM_DATA_GET ,/* sysfs */ ARMCP_RESERVED ,ARMCP_PACKET_TEMPERATURE_SET ,/* sysfs */ +ARMCP_PACKET_VOLTAGE_SET ,/* sysfs */ + ARMCP_PACKET_CURRENT_SET, /* sysfs */ };#define ARMCP_PACKET_FENCE_VAL 0xFE8CE7A5
@@ -288,21 +300,24 @@ enum armcp_temp_type { armcp_temp_crit, armcp_temp_crit_hyst, armcp_temp_offset =19 , - armcp_temp_highest =22 + armcp_temp_highest =22 , + armcp_temp_reset_history =23 };enum armcp_in_attributes { armcp_in_input, armcp_in_min, armcp_in_max, - armcp_in_highest =7 + armcp_in_highest =7 , + armcp_in_reset_history };enum armcp_curr_attributes { armcp_curr_input, armcp_curr_min, armcp_curr_max, - armcp_curr_highest =7 + armcp_curr_highest =7 , + armcp_curr_reset_history }; enum armcp_fan_attributes {
Signature · 1 line
2.17.1
PATCH 5/5 habanalabs: leave space for 2xMSG_PROT in CB
In reply to Oded GabbayThe user must leave space for 2xMSG_PROT in the external CB, so adjust the define of max size accordingly. The driver, however, can still create a CB with the maximum size of 2MB. Therefore, we need to add a check specifically for the user requested size.
--- drivers/misc/habanalabs/command_buffer.c | 24 +++++++++++++++++------- include/uapi/misc/habanalabs.h | 3 ++- 2 files changed, 19 insertions(+), 8 deletions(-)
drivers/misc/habanalabs/command_buffer.c +17 -7
@@ -105,10 +105,9 @@ int hl_cb_create(struct hl_device *hdev, struct hl_cb_mgr *mgr, goto out_err; } -if (cb_size >HL_MAX_CB_SIZE ) { -dev_err (hdev->dev, -"CB size %d must be less then %d\n" , - cb_size,HL_MAX_CB_SIZE ); +if (cb_size >SZ_2M ) { +dev_err (hdev->dev,"CB size %d must be less than %d\n" , + cb_size,SZ_2M ); rc = -EINVAL ; goto out_err; }
@@ -211,7 +210,7 @@ int hl_cb_ioctl(struct hl_fpriv *hpriv, void *data) {union hl_cb_args *args = data;struct hl_device *hdev = hpriv->hdev; -u64 handle; +u64 handle =0 ;int rc;if (hl_device_disabled_or_in_reset (hdev)) {
@@ -223,15 +222,26 @@ int hl_cb_ioctl(struct hl_fpriv *hpriv, void *data)switch (args->in.op) {case HL_CB_OP_CREATE : - rc =hl_cb_create (hdev, &hpriv->cb_mgr, args->in.cb_size, - &handle, hpriv->ctx->asid); +if (args->in.cb_size >HL_MAX_CB_SIZE ) { +dev_err (hdev->dev, +"User requested CB size %d must be less than %d\n" , + args->in.cb_size,HL_MAX_CB_SIZE ); + rc = -EINVAL ; + }else { + rc =hl_cb_create (hdev, &hpriv->cb_mgr, + args->in.cb_size, &handle, + hpriv->ctx->asid); + } +memset (args,0 ,sizeof (*args)); args->out.cb_handle = handle;break ; +case HL_CB_OP_DESTROY : rc =hl_cb_destroy (hdev, &hpriv->cb_mgr, args->in.cb_handle);break ; +default : rc = -ENOTTY ;break ;
include/uapi/misc/habanalabs.h +2 -1
@@ -209,7 +209,8 @@ struct hl_info_args {/* Opcode to destroy previously created command buffer */ #define HL_CB_OP_DESTROY 1 -#define HL_MAX_CB_SIZE 0x200000/* 2MB */ +/* 2MB minus 32 bytes for 2xMSG_PROT */ +#define HL_MAX_CB_SIZE (0x200000 - 32)struct hl_cb_in {/* Handle of CB or 0 if we want to create one */
Signature · 1 line
2.17.1
RE: [PATCH 5/5] habanalabs: leave space for 2xMSG_PROT in CB
Quoted 6 lines · Oded Gabbay
The user must leave space for 2xMSG_PROT in the external CB, so adjust the define of max size accordingly. The driver, however, can still create a CB with the maximum size of 2MB. Therefore, we need to add a check specifically for the user requested size.
Signed-off-by Oded Gabbay <[email protected]>
Quoted 10 lines · Oded Gabbay
From: Tomer Tayar <[email protected]>
Add a new opcode to the INFO IOCTL that retrieves the device time alongside the host time, to allow a user application that want to measure device time together with host time (such as a profiler) to synchronize these times.
Signed-off-by Tomer Tayar <[email protected]>Reviewed-by Oded Gabbay <[email protected]>Signed-off-by Oded Gabbay <[email protected]>
Quoted 10 lines
--- drivers/misc/habanalabs/goya/goya.c | 10 +++- drivers/misc/habanalabs/goya/goyaP.h | 1 + drivers/misc/habanalabs/habanalabs.h | 2 + drivers/misc/habanalabs/habanalabs_ioctl.c | 19 +++++++ .../include/goya/asic_reg/goya_regs.h | 1 + .../goya/asic_reg/psoc_timestamp_regs.h | 56 +++++++++++++++++++ include/uapi/misc/habanalabs.h | 8 +++ 7 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_timestamp_regs.h
Hi,
Not a comment about this patch per se, but ioctls (main number, 'H' in this case) should be documented in Documentation/userspace-api/ioctl/ioctl-number.rst.
thanks.
Signature · 1 line
~Randy
Quoted 23 lines · Randy Dunlap
Quoted 10 lines · Oded Gabbay
From: Tomer Tayar <[email protected]>
Add a new opcode to the INFO IOCTL that retrieves the device time alongside the host time, to allow a user application that want to measure device time together with host time (such as a profiler) to synchronize these times.
Signed-off-by Tomer Tayar <[email protected]>Reviewed-by Oded Gabbay <[email protected]>Signed-off-by Oded Gabbay <[email protected]>Quoted 10 lines
--- drivers/misc/habanalabs/goya/goya.c | 10 +++- drivers/misc/habanalabs/goya/goyaP.h | 1 + drivers/misc/habanalabs/habanalabs.h | 2 + drivers/misc/habanalabs/habanalabs_ioctl.c | 19 +++++++ .../include/goya/asic_reg/goya_regs.h | 1 + .../goya/asic_reg/psoc_timestamp_regs.h | 56 +++++++++++++++++++ include/uapi/misc/habanalabs.h | 8 +++ 7 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/psoc_timestamp_regs.h
Quoted 3 lines
Hi,
Not a comment about this patch per se, but ioctls (main number, 'H' in this case) should be documented inDocumentation/userspace-api/ioctl/ioctl-number.rst.
I'll send a patch, thanks for telling me.
Oded
Quoted 5 lines
thanks.
--
~Randy