accel/habanalabs/gaudi2: un-secure register for engine cores interrupt
Subsystems (4)
Oded Gabbay
maintainerPATCH 1/12 accel/habanalabs/gaudi2: un-secure register for engine cores interrupt
From: Tomer Tayar <[email protected]>
The F/W dynamically allocates one of the PSOC scratchpad registers for the engine cores, so they can raise events towards the F/W. To allow the engine cores to access this register, this register must be non-secured.
--- .../accel/habanalabs/gaudi2/gaudi2_security.c | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/accel/habanalabs/gaudi2/gaudi2_security.c +17 -3
@@ -2907,7 +2907,7 @@ static void gaudi2_init_lbw_range_registers_secure(struct hl_device *hdev)* - range 11: NIC11_CFG + *_DBG (not including TPC_DBG) * * If F/W security is not enabled: -* - ranges 12,13: PSOC_CFG (excluding PSOC_TIMESTAMP) +* - ranges 12,13: PSOC_CFG (excluding PSOC_TIMESTAMP, PSOC_EFUSE and PSOC_GLOBAL_CONF) */ u64 lbw_range_min_short[] = { mmNIC0_TX_AXUSER_BASE,
@@ -2923,7 +2923,7 @@ static void gaudi2_init_lbw_range_registers_secure(struct hl_device *hdev) mmNIC10_TX_AXUSER_BASE, mmNIC11_TX_AXUSER_BASE, mmPSOC_I2C_M0_BASE, - mmPSOC_EFUSE_BASE + mmPSOC_GPIO0_BASE };u64 lbw_range_max_short[] = { mmNIC0_MAC_CH3_MAC_PCS_BASE + HL_BLOCK_SIZE,
@@ -3219,6 +3219,7 @@ static void gaudi2_init_range_registers(struct hl_device *hdev)*/ static int gaudi2_init_protection_bits (struct hl_device *hdev) { +u32 *user_regs_array =NULL , user_regs_array_size =0 , engine_core_intr_reg;struct asic_fixed_properties *prop = &hdev->asic_prop;u32 instance_offset;int rc =0 ;
@@ -3389,11 +3390,24 @@ static int gaudi2_init_protection_bits(struct hl_device *hdev)/* PSOC. * Except for PSOC_GLOBAL_CONF, skip when security is enabled in F/W, because the blocks are * protected by privileged RR. +* For PSOC_GLOBAL_CONF, need to un-secure the scratchpad register which is used for engine +* cores to raise events towards F/W. */ + engine_core_intr_reg = (u32) (hdev->asic_prop.engine_core_interrupt_reg_addr -CFG_BASE ); +if (engine_core_intr_reg >= mmPSOC_GLOBAL_CONF_SCRATCHPAD_0 && + engine_core_intr_reg <= mmPSOC_GLOBAL_CONF_SCRATCHPAD_31) { + user_regs_array = &engine_core_intr_reg; + user_regs_array_size =1 ; + }else { +dev_err (hdev->dev, +"Engine cores register for interrupts (%#x) is not a PSOC scratchpad register\n" , + engine_core_intr_reg); + } + rc |=hl_init_pb (hdev,HL_PB_SHARED ,HL_PB_NA ,HL_PB_SINGLE_INSTANCE ,HL_PB_NA , gaudi2_pb_psoc_global_conf,ARRAY_SIZE (gaudi2_pb_psoc_global_conf), -NULL ,HL_PB_NA ); + user_regs_array, user_regs_array_size);if (!hdev->asic_prop.fw_security_enabled) rc |= hl_init_pb(hdev, HL_PB_SHARED, HL_PB_NA,
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 2/12 accel/habanalabs/gaudi2: unsecure tpc count registers
From: Ofir Bitton <[email protected]>
As TPC kernels now must use those registers we unsecure them.
--- drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 1 + 1 file changed, 1 insertion(+)
drivers/accel/habanalabs/gaudi2/gaudi2_security.c +1 -0
@@ -1601,6 +1601,7 @@ static const u32 gaudi2_pb_dcr0_tpc0_unsecured_regs[] = { mmDCORE0_TPC0_CFG_KERNEL_SRF_30, mmDCORE0_TPC0_CFG_KERNEL_SRF_31, mmDCORE0_TPC0_CFG_TPC_SB_L0CD, + mmDCORE0_TPC0_CFG_TPC_COUNT, mmDCORE0_TPC0_CFG_TPC_ID, mmDCORE0_TPC0_CFG_QM_KERNEL_ID_INC, mmDCORE0_TPC0_CFG_QM_TID_BASE_SIZE_HIGH_DIM_0,
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 5/12 accel/habanalabs: handle f/w reserved dram space request
In reply to Oded GabbayFrom: Dani Liberman <[email protected]>
It is possible for FW to request reserved space in dram.
If the device supports this option, it will retrieve the size from the f/w and will reserve it.
Currently we add the common code infrastructure to support it.
--- drivers/accel/habanalabs/common/firmware_if.c | 5 +++++ drivers/accel/habanalabs/common/habanalabs.h | 4 ++++ drivers/accel/habanalabs/include/common/hl_boot_if.h | 5 +++++ 3 files changed, 14 insertions(+)
drivers/accel/habanalabs/common/firmware_if.c +5 -0
@@ -2783,6 +2783,11 @@ static int hl_fw_dynamic_init_cpu(struct hl_device *hdev, hdev->decoder_binning, hdev->rotator_binning); } +if (hdev->asic_prop.support_dynamic_resereved_fw_size) { + hdev->asic_prop.reserved_fw_mem_size = +le32_to_cpu (fw_loader->dynamic_loader.comm_desc.rsvd_mem_size_mb); + } +return 0 ; }
drivers/accel/habanalabs/common/habanalabs.h +4 -0
@@ -641,6 +641,7 @@ struct hl_hints_range {* @glbl_err_cause_num: global err cause number. * @hbw_flush_reg: register to read to generate HBW flush. value of 0 means HBW flush is * not supported. +* @reserved_fw_mem_size: size in MB of dram memory reserved for FW. * @collective_first_sob: first sync object available for collective use * @collective_first_mon: first monitor available for collective use * @sync_stream_first_sob: first sync object available for sync stream use
@@ -689,6 +690,7 @@ struct hl_hints_range {* @dma_mask: the dma mask to be set for this device * @supports_advanced_cpucp_rc: true if new cpucp opcodes are supported. * @supports_engine_modes: true if changing engines/engine_cores modes is supported. +* @support_dynamic_resereved_fw_size: true if we support dynamic reserved size for fw. */ struct asic_fixed_properties {struct hw_queue_properties *hw_queues_props;
@@ -772,6 +774,7 @@ struct asic_fixed_properties {u32 num_of_special_blocks;u32 glbl_err_cause_num;u32 hbw_flush_reg; +u32 reserved_fw_mem_size;u16 collective_first_sob;u16 collective_first_mon;u16 sync_stream_first_sob;
@@ -808,6 +811,7 @@ struct asic_fixed_properties {u8 dma_mask;u8 supports_advanced_cpucp_rc;u8 supports_engine_modes; +u8 support_dynamic_resereved_fw_size; };/**
drivers/accel/habanalabs/include/common/hl_boot_if.h +5 -0
@@ -570,6 +570,8 @@ struct lkd_fw_comms_desc {__le64 img_addr;/* address for next FW component load */ struct lkd_fw_binning_info binning_info;struct lkd_fw_ascii_msg ascii_msg[LKD_FW_ASCII_MSG_MAX ]; +__le32 rsvd_mem_size_mb;/* reserved memory size [MB] for FW/SVE */ +char reserved1[4 ]; };enum comms_reset_cause {
@@ -596,6 +598,9 @@ struct lkd_fw_comms_msg {__le64 img_addr;struct lkd_fw_binning_info binning_info;struct lkd_fw_ascii_msg ascii_msg[LKD_FW_ASCII_MSG_MAX ]; +/* reserved memory size [MB] for FW/SVE */ +__le32 rsvd_mem_size_mb; +char reserved1[4 ]; };struct {__u8 reset_cause;
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 3/12 accel/habanalabs/gaudi2: prepare to remove soft_rst_irq
In reply to Oded GabbayFrom: Igor Grinberg <[email protected]>
The soft reset has transitioned to CPUCP packet instead of plain register write and is about to be removed from the struct cpu_dyn_regs. As a preparation for removing the gic_host_soft_rst_irq field from struct cpu_dyn_regs, switch to use the plain macro - this keeps the backward compatibility.
--- drivers/accel/habanalabs/gaudi2/gaudi2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/accel/habanalabs/gaudi2/gaudi2.c +2 -1
@@ -6263,7 +6263,8 @@ static int gaudi2_execute_soft_reset(struct hl_device *hdev, bool driver_performWREG32 (le32_to_cpu (dyn_regs->cpu_rst_status),CPU_RST_STATUS_NA ); elseWREG32 (mmCPU_RST_STATUS_TO_HOST ,CPU_RST_STATUS_NA ); -WREG32 (le32_to_cpu (dyn_regs->gic_host_soft_rst_irq), + +WREG32 (mmGIC_HOST_SOFT_RST_IRQ_POLL_REG, gaudi2_irq_map_table[GAUDI2_EVENT_CPU_SOFT_RESET ].cpu_id);/* wait for f/w response */
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 6/12 accel/habanalabs: set default device release watchdog T/O as 30 sec
In reply to Oded GabbayFrom: Tomer Tayar <[email protected]>
After being notified about certain errors, user is expected to finish his post-errors actions and to release the device within some timeout, after which is deice is being reset.
The default timeout value is 5 sec, which in some case is not enough for a user application to collect debug data.
Increase the default value to 30 sec.
--- drivers/accel/habanalabs/common/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accel/habanalabs/common/device.c +1 -1
@@ -18,7 +18,7 @@#define HL_RESET_DELAY_USEC 10000/* 10ms */ -#define HL_DEVICE_RELEASE_WATCHDOG_TIMEOUT_SEC 5 +#define HL_DEVICE_RELEASE_WATCHDOG_TIMEOUT_SEC 30enum dma_alloc_type {DMA_ALLOC_COHERENT ,
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 9/12 accel/habanalabs: update sysfs-driver-habanalabs with the accel path
In reply to Oded GabbayFrom: Tomer Tayar <[email protected]>
Replace "/sys/class/habanalabs/hl<n>/..." with
"/sys/class/accel/accel<n>/device/...".
--- .../ABI/testing/sysfs-driver-habanalabs | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-)
Documentation/ABI/testing/sysfs-driver-habanalabs +32 -32
@@ -1,4 +1,4 @@ -What: /sys/class/habanalabs/hl<n>/armcp_kernel_ver +What: /sys/class/accel/accel<n>/device/armcp_kernel_ver Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -6,7 +6,7 @@ Description: Version of the Linux kernel running on the device's CPU. Will be DEPRECATED in Linux kernel version 5.10, and be replaced with cpucp_kernel_ver -What: /sys/class/habanalabs/hl<n>/armcp_ver +What: /sys/class/accel/accel<n>/device/armcp_ver Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -14,7 +14,7 @@ Description: Version of the application running on the device's CPU Will be DEPRECATED in Linux kernel version 5.10, and be replaced with cpucp_ver -What: /sys/class/habanalabs/hl<n>/clk_max_freq_mhz +What: /sys/class/accel/accel<n>/device/clk_max_freq_mhz Date: Jun 2019 KernelVersion: 5.7 Contact: [email protected]
@@ -24,58 +24,58 @@ Description: Allows the user to set the maximum clock frequency, in MHz. frequency value of the device clock. This property is valid only for the Gaudi ASIC family -What: /sys/class/habanalabs/hl<n>/clk_cur_freq_mhz +What: /sys/class/accel/accel<n>/device/clk_cur_freq_mhz Date: Jun 2019 KernelVersion: 5.7 Contact: [email protected] Description: Displays the current frequency, in MHz, of the device clock. This property is valid only for the Gaudi ASIC family -What: /sys/class/habanalabs/hl<n>/cpld_ver +What: /sys/class/accel/accel<n>/device/cpld_ver Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Version of the Device's CPLD F/W -What: /sys/class/habanalabs/hl<n>/cpucp_kernel_ver +What: /sys/class/accel/accel<n>/device/cpucp_kernel_ver Date: Oct 2020 KernelVersion: 5.10 Contact: [email protected] Description: Version of the Linux kernel running on the device's CPU -What: /sys/class/habanalabs/hl<n>/cpucp_ver +What: /sys/class/accel/accel<n>/device/cpucp_ver Date: Oct 2020 KernelVersion: 5.10 Contact: [email protected] Description: Version of the application running on the device's CPU -What: /sys/class/habanalabs/hl<n>/device_type +What: /sys/class/accel/accel<n>/device/device_type Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays the code name of the device according to its type. The supported values are: "GOYA" -What: /sys/class/habanalabs/hl<n>/eeprom +What: /sys/class/accel/accel<n>/device/eeprom Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: A binary file attribute that contains the contents of the on-board EEPROM -What: /sys/class/habanalabs/hl<n>/fuse_ver +What: /sys/class/accel/accel<n>/device/fuse_ver Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays the device's version from the eFuse -What: /sys/class/habanalabs/hl<n>/fw_os_ver +What: /sys/class/accel/accel<n>/device/fw_os_ver Date: Dec 2021 KernelVersion: 5.18 Contact: [email protected] Description: Version of the firmware OS running on the device's CPU -What: /sys/class/habanalabs/hl<n>/hard_reset +What: /sys/class/accel/accel<n>/device/hard_reset Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -83,14 +83,14 @@ Description: Interface to trigger a hard-reset operation for the device. Hard-reset will reset ALL internal components of the device except for the PCI interface and the internal PLLs -What: /sys/class/habanalabs/hl<n>/hard_reset_cnt +What: /sys/class/accel/accel<n>/device/hard_reset_cnt Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays how many times the device have undergone a hard-reset operation since the driver was loaded -What: /sys/class/habanalabs/hl<n>/high_pll +What: /sys/class/accel/accel<n>/device/high_pll Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -98,7 +98,7 @@ Description: Allows the user to set the maximum clock frequency for MME, TPC and IC when the power management profile is set to "automatic". This property is valid only for the Goya ASIC family -What: /sys/class/habanalabs/hl<n>/ic_clk +What: /sys/class/accel/accel<n>/device/ic_clk Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -110,27 +110,27 @@ Description: Allows the user to set the maximum clock frequency, in Hz, of frequency value of the IC. This property is valid only for the Goya ASIC family -What: /sys/class/habanalabs/hl<n>/ic_clk_curr +What: /sys/class/accel/accel<n>/device/ic_clk_curr Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays the current clock frequency, in Hz, of the Interconnect fabric. This property is valid only for the Goya ASIC family -What: /sys/class/habanalabs/hl<n>/infineon_ver +What: /sys/class/accel/accel<n>/device/infineon_ver Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Version of the Device's power supply F/W code. Relevant only to GOYA and GAUDI -What: /sys/class/habanalabs/hl<n>/max_power +What: /sys/class/accel/accel<n>/device/max_power Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Allows the user to set the maximum power consumption of the device in milliwatts. -What: /sys/class/habanalabs/hl<n>/mme_clk +What: /sys/class/accel/accel<n>/device/mme_clk Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -142,21 +142,21 @@ Description: Allows the user to set the maximum clock frequency, in Hz, of frequency value of the MME. This property is valid only for the Goya ASIC family -What: /sys/class/habanalabs/hl<n>/mme_clk_curr +What: /sys/class/accel/accel<n>/device/mme_clk_curr Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays the current clock frequency, in Hz, of the MME compute engine. This property is valid only for the Goya ASIC family -What: /sys/class/habanalabs/hl<n>/pci_addr +What: /sys/class/accel/accel<n>/device/pci_addr Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays the PCI address of the device. This is needed so the user would be able to open a device based on its PCI address -What: /sys/class/habanalabs/hl<n>/pm_mng_profile +What: /sys/class/accel/accel<n>/device/pm_mng_profile Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -170,19 +170,19 @@ Description: Power management profile. Values are "auto", "manual". In "auto" ic_clk, mme_clk and tpc_clk. This property is valid only for the Goya ASIC family -What: /sys/class/habanalabs/hl<n>/preboot_btl_ver +What: /sys/class/accel/accel<n>/device/preboot_btl_ver Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Version of the device's preboot F/W code -What: /sys/class/habanalabs/hl<n>/security_enabled +What: /sys/class/accel/accel<n>/device/security_enabled Date: Oct 2022 KernelVersion: 6.1 Contact: [email protected] Description: Displays the device's security status -What: /sys/class/habanalabs/hl<n>/soft_reset +What: /sys/class/accel/accel<n>/device/soft_reset Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -190,14 +190,14 @@ Description: Interface to trigger a soft-reset operation for the device. Soft-reset will reset only the compute and DMA engines of the device -What: /sys/class/habanalabs/hl<n>/soft_reset_cnt +What: /sys/class/accel/accel<n>/device/soft_reset_cnt Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays how many times the device have undergone a soft-reset operation since the driver was loaded -What: /sys/class/habanalabs/hl<n>/status +What: /sys/class/accel/accel<n>/device/status Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -215,13 +215,13 @@ Description: Status of the card: a compute-reset which is executed after a device release (relevant for Gaudi2 only). -What: /sys/class/habanalabs/hl<n>/thermal_ver +What: /sys/class/accel/accel<n>/device/thermal_ver Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Version of the Device's thermal daemon -What: /sys/class/habanalabs/hl<n>/tpc_clk +What: /sys/class/accel/accel<n>/device/tpc_clk Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -233,20 +233,20 @@ Description: Allows the user to set the maximum clock frequency, in Hz, of frequency value of the TPC. This property is valid only for Goya ASIC family -What: /sys/class/habanalabs/hl<n>/tpc_clk_curr +What: /sys/class/accel/accel<n>/device/tpc_clk_curr Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays the current clock frequency, in Hz, of the TPC compute engines. This property is valid only for the Goya ASIC family -What: /sys/class/habanalabs/hl<n>/uboot_ver +What: /sys/class/accel/accel<n>/device/uboot_ver Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Version of the u-boot running on the device's CPU -What: /sys/class/habanalabs/hl<n>/vrm_ver +What: /sys/class/accel/accel<n>/device/vrm_ver Date: Jan 2022 KernelVersion: 5.17 Contact: [email protected]
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 8/12 accel/habanalabs: register compute device as an accel device
In reply to Oded GabbayFrom: Tomer Tayar <[email protected]>
Register the compute device as an accel device, and remove the creation of the habanalabs compute char device.
The IOCTLs in this patch are still handled by the current driver handler. Moving to DRM IOCTL handling requires moving the IOCTLs numbers to a specific range, so it will be handled in subsequent patches.
--- drivers/accel/habanalabs/common/debugfs.c | 22 +-- drivers/accel/habanalabs/common/device.c | 163 +++++++----------- drivers/accel/habanalabs/common/habanalabs.h | 44 ++--- .../accel/habanalabs/common/habanalabs_drv.c | 157 ++++++++--------- .../habanalabs/common/habanalabs_ioctl.c | 12 +- drivers/accel/habanalabs/common/memory.c | 4 +- 6 files changed, 161 insertions(+), 241 deletions(-)
drivers/accel/habanalabs/common/debugfs.c +2 -20
@@ -18,8 +18,6 @@#define MMU_KBUF_SIZE (MMU_ADDR_BUF_SIZE + MMU_ASID_BUF_SIZE)#define I2C_MAX_TRANSACTION_LEN 8 -static struct dentry *hl_debug_root; -static int hl_debugfs_i2c_read (struct hl_device *hdev,u8 i2c_bus,u8 i2c_addr,u8 i2c_reg,u8 i2c_len,u64 *val) {
@@ -1788,20 +1786,14 @@ void hl_debugfs_add_device(struct hl_device *hdev) {struct hl_dbg_device_entry *dev_entry = &hdev->hl_debugfs; - dev_entry->root =debugfs_create_dir (dev_name (hdev->dev), hl_debug_root); + dev_entry->root = hdev->drm.accel->debugfs_root;add_files_to_device (hdev, dev_entry, dev_entry->root); +if (!hdev->asic_prop.fw_security_enabled)add_secured_nodes (dev_entry, dev_entry->root); } -void hl_debugfs_remove_device (struct hl_device *hdev) -{ -struct hl_dbg_device_entry *entry = &hdev->hl_debugfs; - -debugfs_remove_recursive (entry->root); -} -void hl_debugfs_add_file (struct hl_fpriv *hpriv) {struct hl_dbg_device_entry *dev_entry = &hpriv->hdev->hl_debugfs;
@@ -1932,13 +1924,3 @@ void hl_debugfs_set_state_dump(struct hl_device *hdev, char *data,up_write (&dev_entry->state_dump_sem); } - -void __init hl_debugfs_init (void ) -{ - hl_debug_root =debugfs_create_dir ("habanalabs" ,NULL ); -} - -void hl_debugfs_fini (void ) -{ -debugfs_remove_recursive (hl_debug_root); -}
drivers/accel/habanalabs/common/device.c +58 -105
273 lines not on this page · raw message
drivers/accel/habanalabs/common/habanalabs.h +19 -25
117 lines not on this page · raw message
drivers/accel/habanalabs/common/habanalabs_drv.c +74 -83
284 lines not on this page · raw message
drivers/accel/habanalabs/common/habanalabs_ioctl.c +6 -6
@@ -1166,10 +1166,9 @@ static const struct hl_ioctl_desc hl_ioctls_control[] = { HL_IOCTL_DEF(HL_IOCTL_INFO, hl_info_ioctl_control) }; -static long _hl_ioctl (struct file *filep,unsigned int cmd,unsigned long arg, -const struct hl_ioctl_desc *ioctl,struct device *dev) +static long _hl_ioctl (struct hl_fpriv *hpriv,unsigned int cmd,unsigned long arg, +const struct hl_ioctl_desc *ioctl,struct device *dev) { -struct hl_fpriv *hpriv = filep->private_data;unsigned int nr =_IOC_NR (cmd);char stack_kdata[128 ] = {0 };char *kdata =NULL ;
@@ -1235,7 +1234,8 @@ static long _hl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg,long hl_ioctl (struct file *filep,unsigned int cmd,unsigned long arg) { -struct hl_fpriv *hpriv = filep->private_data; +struct drm_file *file_priv = filep->private_data; +struct hl_fpriv *hpriv = file_priv->driver_priv;struct hl_device *hdev = hpriv->hdev;const struct hl_ioctl_desc *ioctl =NULL ;unsigned int nr =_IOC_NR (cmd);
@@ -1256,7 +1256,7 @@ long hl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)return -ENOTTY ; } -return _hl_ioctl (filep, cmd, arg, ioctl, hdev->dev); +return _hl_ioctl (hpriv, cmd, arg, ioctl, hdev->dev); }long hl_ioctl_control (struct file *filep,unsigned int cmd,unsigned long arg)
@@ -1282,5 +1282,5 @@ long hl_ioctl_control(struct file *filep, unsigned int cmd, unsigned long arg)return -ENOTTY ; } -return _hl_ioctl (filep, cmd, arg, ioctl, hdev->dev_ctrl); +return _hl_ioctl (hpriv, cmd, arg, ioctl, hdev->dev_ctrl); }
drivers/accel/habanalabs/common/memory.c +2 -2
@@ -1818,7 +1818,7 @@ static void hl_release_dmabuf(struct dma_buf *dmabuf)hl_ctx_put (ctx);/* Paired with get_file() in export_dmabuf() */ -fput (ctx->hpriv->filp); +fput (ctx->hpriv->file_priv->filp);kfree (hl_dmabuf); }
@@ -1864,7 +1864,7 @@ static int export_dmabuf(struct hl_ctx *ctx,* released first and only then the compute device. * Paired with fput() in hl_release_dmabuf(). */ -get_file (ctx->hpriv->filp); +get_file (ctx->hpriv->file_priv->filp); *dmabuf_fd = fd;
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 7/12 accel/habanalabs: add info ioctl for engine error reports
In reply to Oded GabbayFrom: Ofir Bitton <[email protected]>
User gets notification for every engine error report, but he still lacks the exact engine information. Hence, we allow user to query for the exact engine reported an error.
--- drivers/accel/habanalabs/common/device.c | 14 ++ drivers/accel/habanalabs/common/habanalabs.h | 17 ++ .../habanalabs/common/habanalabs_ioctl.c | 25 +++ drivers/accel/habanalabs/gaudi2/gaudi2.c | 168 ++++++++++++++++++ include/uapi/drm/habanalabs_accel.h | 16 ++ 5 files changed, 240 insertions(+)
drivers/accel/habanalabs/common/device.c +14 -0
@@ -2701,6 +2701,20 @@ void hl_handle_fw_err(struct hl_device *hdev, struct hl_info_fw_err_info *info) *info->event_mask |=HL_NOTIFIER_EVENT_CRITICL_FW_ERR ; } +void hl_capture_engine_err (struct hl_device *hdev,u16 engine_id,u16 error_count) +{ +struct engine_err_info *info = &hdev->captured_err_info.engine_err; + +/* Capture only the first engine error */ +if (atomic_cmpxchg (&info->event_detected,0 ,1 )) +return ; + + info->event.timestamp =ktime_to_ns (ktime_get ()); + info->event.engine_id = engine_id; + info->event.error_count = error_count; + info->event_info_available = true; +} +void hl_enable_err_info_capture (struct hl_error_info *captured_err_info) {vfree (captured_err_info->page_fault_info.user_mappings);
drivers/accel/habanalabs/common/habanalabs.h +17 -0
@@ -3062,6 +3062,20 @@ struct fw_err_info {bool event_info_available; }; +/** +* struct engine_err_info - engine error information. +* @event: holds information on the event. +* @event_detected: if set as 1, then an engine event was discovered for the +* first time after the driver has finished booting-up. +* @event_info_available: indicates that an engine event info is now available. +*/ +struct engine_err_info { +struct hl_info_engine_err_event event; +atomic_t event_detected; +bool event_info_available; +}; + +/** * struct hl_error_info - holds information collected during an error. * @cs_timeout: CS timeout error information.
@@ -3070,6 +3084,7 @@ struct fw_err_info {* @page_fault_info: page fault information. * @hw_err: (fatal) hardware error information. * @fw_err: firmware error information. +* @engine_err: engine error information. */ struct hl_error_info {struct cs_timeout_info cs_timeout;
@@ -3078,6 +3093,7 @@ struct hl_error_info {struct page_fault_info page_fault_info;struct hw_err_info hw_err;struct fw_err_info fw_err; +struct engine_err_info engine_err; };/**
@@ -3951,6 +3967,7 @@ void hl_handle_page_fault(struct hl_device *hdev, u64 addr, u16 eng_id, bool is_ u64 *event_mask);void hl_handle_critical_hw_err (struct hl_device *hdev,u16 event_id,u64 *event_mask);void hl_handle_fw_err (struct hl_device *hdev,struct hl_info_fw_err_info *info); +void hl_capture_engine_err (struct hl_device *hdev,u16 engine_id,u16 error_count);void hl_enable_err_info_capture (struct hl_error_info *captured_err_info);#ifdef CONFIG_DEBUG_FS
drivers/accel/habanalabs/common/habanalabs_ioctl.c +25 -0
@@ -875,6 +875,28 @@ static int fw_err_info(struct hl_fpriv *hpriv, struct hl_info_args *args)return rc ? -EFAULT :0 ; } +static int engine_err_info (struct hl_fpriv *hpriv,struct hl_info_args *args) +{ +void __user *user_buf = (void __user *) (uintptr_t ) args->return_pointer; +struct hl_device *hdev = hpriv->hdev; +u32 user_buf_size = args->return_size; +struct engine_err_info *info; +int rc; + +if (!user_buf) +return -EINVAL ; + + info = &hdev->captured_err_info.engine_err; +if (!info->event_info_available) +return 0 ; + +if (user_buf_size <sizeof (struct hl_info_engine_err_event )) +return -ENOMEM ; + + rc =copy_to_user (user_buf, &info->event,sizeof (struct hl_info_engine_err_event )); +return rc ? -EFAULT :0 ; +} +static int send_fw_generic_request (struct hl_device *hdev,struct hl_info_args *info_args) {void __user *buff = (void __user *) (uintptr_t ) info_args->return_pointer;
@@ -1001,6 +1023,9 @@ static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data,case HL_INFO_FW_ERR_EVENT :return fw_err_info (hpriv, args); +case HL_INFO_USER_ENGINE_ERR_EVENT : +return engine_err_info (hpriv, args); +case HL_INFO_DRAM_USAGE :return dram_usage_info (hpriv, args);default :
drivers/accel/habanalabs/gaudi2/gaudi2.c +168 -0
180 lines not on this page · raw message
include/uapi/drm/habanalabs_accel.h +16 -0
@@ -809,6 +809,7 @@ enum hl_server_type {* HL_INFO_FW_ERR_EVENT - Retrieve information on the reported FW error. * May return 0 even though no new data is available, in that case * timestamp will be 0. +* HL_INFO_USER_ENGINE_ERR_EVENT - Retrieve the last engine id that reported an error. */ #define HL_INFO_HW_IP_INFO 0#define HL_INFO_HW_EVENTS 1
@@ -845,6 +846,7 @@ enum hl_server_type {#define HL_INFO_FW_GENERIC_REQ 35#define HL_INFO_HW_ERR_EVENT 36#define HL_INFO_FW_ERR_EVENT 37 +#define HL_INFO_USER_ENGINE_ERR_EVENT 38#define HL_INFO_VERSION_MAX_LEN 128#define HL_INFO_CARD_NAME_MAX_LEN 16
@@ -1226,6 +1228,20 @@ struct hl_info_fw_err_event {__u32 pad; }; +/** +* struct hl_info_engine_err_event - engine error info +* @timestamp: time-stamp of error occurrence +* @engine_id: engine id who reported the error. +* @error_count: Amount of errors reported. +* @pad: size padding for u64 granularity. +*/ +struct hl_info_engine_err_event { +__s64 timestamp; +__u16 engine_id; +__u16 error_count; +__u32 pad; +}; +/** * struct hl_info_dev_memalloc_page_sizes - valid page sizes in device mem alloc information. * @page_order_bitmask: bitmap in which a set bit represents the order of the supported page size
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 10/12 accel/habanalabs: update debugfs-driver-habanalabs with the accel path
In reply to Oded GabbayFrom: Tomer Tayar <[email protected]>
Replace "/sys/kernel/debug/habanalabs/hl<n>/..." with "/sys/kernel/debug/accel/<n>/...".
--- .../ABI/testing/debugfs-driver-habanalabs | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-)
Documentation/ABI/testing/debugfs-driver-habanalabs +42 -42
@@ -1,4 +1,4 @@ -What: /sys/kernel/debug/habanalabs/hl<n>/addr +What: /sys/kernel/debug/accel/<n>/addr Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -8,34 +8,34 @@ Description: Sets the device address to be used for read or write through only when the IOMMU is disabled. The acceptable value is a string that starts with "0x" -What: /sys/kernel/debug/habanalabs/hl<n>/clk_gate +What: /sys/kernel/debug/accel/<n>/clk_gate Date: May 2020 KernelVersion: 5.8 Contact: [email protected] Description: This setting is now deprecated as clock gating is handled solely by the f/w -What: /sys/kernel/debug/habanalabs/hl<n>/command_buffers +What: /sys/kernel/debug/accel/<n>/command_buffers Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays a list with information about the currently allocated command buffers -What: /sys/kernel/debug/habanalabs/hl<n>/command_submission +What: /sys/kernel/debug/accel/<n>/command_submission Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays a list with information about the currently active command submissions -What: /sys/kernel/debug/habanalabs/hl<n>/command_submission_jobs +What: /sys/kernel/debug/accel/<n>/command_submission_jobs Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Displays a list with detailed information about each JOB (CB) of each active command submission -What: /sys/kernel/debug/habanalabs/hl<n>/data32 +What: /sys/kernel/debug/accel/<n>/data32 Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -50,7 +50,7 @@ Description: Allows the root user to read or write directly through the If the IOMMU is disabled, it also allows the root user to read or write from the host a device VA of a host mapped memory -What: /sys/kernel/debug/habanalabs/hl<n>/data64 +What: /sys/kernel/debug/accel/<n>/data64 Date: Jan 2020 KernelVersion: 5.6 Contact: [email protected]
@@ -65,7 +65,7 @@ Description: Allows the root user to read or write 64 bit data directly If the IOMMU is disabled, it also allows the root user to read or write from the host a device VA of a host mapped memory -What: /sys/kernel/debug/habanalabs/hl<n>/data_dma +What: /sys/kernel/debug/accel/<n>/data_dma Date: Apr 2021 KernelVersion: 5.13 Contact: [email protected]
@@ -79,11 +79,11 @@ Description: Allows the root user to read from the device's internal a very long time. This interface doesn't support concurrency in the same device. In GAUDI and GOYA, this action can cause undefined behavior - in case the it is done while the device is executing user + in case it is done while the device is executing user workloads. Only supported on GAUDI at this stage. -What: /sys/kernel/debug/habanalabs/hl<n>/device +What: /sys/kernel/debug/accel/<n>/device Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -91,14 +91,14 @@ Description: Enables the root user to set the device to specific state. Valid values are "disable", "enable", "suspend", "resume". User can read this property to see the valid values -What: /sys/kernel/debug/habanalabs/hl<n>/device_release_watchdog_timeout +What: /sys/kernel/debug/accel/<n>/device_release_watchdog_timeout Date: Oct 2022 KernelVersion: 6.2 Contact: [email protected] -Description: The watchdog timeout value in seconds for a device relese upon +Description: The watchdog timeout value in seconds for a device release upon certain error cases, after which the device is reset. -What: /sys/kernel/debug/habanalabs/hl<n>/dma_size +What: /sys/kernel/debug/accel/<n>/dma_size Date: Apr 2021 KernelVersion: 5.13 Contact: [email protected]
@@ -108,7 +108,7 @@ Description: Specify the size of the DMA transaction when using DMA to read When the write is finished, the user can read the "data_dma" blob -What: /sys/kernel/debug/habanalabs/hl<n>/dump_razwi_events +What: /sys/kernel/debug/accel/<n>/dump_razwi_events Date: Aug 2022 KernelVersion: 5.20 Contact: [email protected]
@@ -117,7 +117,7 @@ Description: Dumps all razwi events to dmesg if exist. the routine will clear the status register. Usage: cat dump_razwi_events -What: /sys/kernel/debug/habanalabs/hl<n>/dump_security_violations +What: /sys/kernel/debug/accel/<n>/dump_security_violations Date: Jan 2021 KernelVersion: 5.12 Contact: [email protected]
@@ -125,14 +125,14 @@ Description: Dumps all security violations to dmesg. This will also ack all security violations meanings those violations will not be dumped next time user calls this API -What: /sys/kernel/debug/habanalabs/hl<n>/engines +What: /sys/kernel/debug/accel/<n>/engines Date: Jul 2019 KernelVersion: 5.3 Contact: [email protected] Description: Displays the status registers values of the device engines and their derived idle status -What: /sys/kernel/debug/habanalabs/hl<n>/i2c_addr +What: /sys/kernel/debug/accel/<n>/i2c_addr Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -140,7 +140,7 @@ Description: Sets I2C device address for I2C transaction that is generated by the device's CPU, Not available when device is loaded with secured firmware -What: /sys/kernel/debug/habanalabs/hl<n>/i2c_bus +What: /sys/kernel/debug/accel/<n>/i2c_bus Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -148,7 +148,7 @@ Description: Sets I2C bus address for I2C transaction that is generated by the device's CPU, Not available when device is loaded with secured firmware -What: /sys/kernel/debug/habanalabs/hl<n>/i2c_data +What: /sys/kernel/debug/accel/<n>/i2c_data Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -157,7 +157,7 @@ Description: Triggers an I2C transaction that is generated by the device's reading from the file generates a read transaction, Not available when device is loaded with secured firmware -What: /sys/kernel/debug/habanalabs/hl<n>/i2c_len +What: /sys/kernel/debug/accel/<n>/i2c_len Date: Dec 2021 KernelVersion: 5.17 Contact: [email protected]
@@ -165,7 +165,7 @@ Description: Sets I2C length in bytes for I2C transaction that is generated b the device's CPU, Not available when device is loaded with secured firmware -What: /sys/kernel/debug/habanalabs/hl<n>/i2c_reg +What: /sys/kernel/debug/accel/<n>/i2c_reg Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -173,35 +173,35 @@ Description: Sets I2C register id for I2C transaction that is generated by the device's CPU, Not available when device is loaded with secured firmware -What: /sys/kernel/debug/habanalabs/hl<n>/led0 +What: /sys/kernel/debug/accel/<n>/led0 Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Sets the state of the first S/W led on the device, Not available when device is loaded with secured firmware -What: /sys/kernel/debug/habanalabs/hl<n>/led1 +What: /sys/kernel/debug/accel/<n>/led1 Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Sets the state of the second S/W led on the device, Not available when device is loaded with secured firmware -What: /sys/kernel/debug/habanalabs/hl<n>/led2 +What: /sys/kernel/debug/accel/<n>/led2 Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Sets the state of the third S/W led on the device, Not available when device is loaded with secured firmware -What: /sys/kernel/debug/habanalabs/hl<n>/memory_scrub +What: /sys/kernel/debug/accel/<n>/memory_scrub Date: May 2022 KernelVersion: 5.19 Contact: [email protected] Description: Allows the root user to scrub the dram memory. The scrubbing value can be set using the debugfs file memory_scrub_val. -What: /sys/kernel/debug/habanalabs/hl<n>/memory_scrub_val +What: /sys/kernel/debug/accel/<n>/memory_scrub_val Date: May 2022 KernelVersion: 5.19 Contact: [email protected]
@@ -209,7 +209,7 @@ Description: The value to which the dram will be set to when the user scrubs the dram using 'memory_scrub' debugfs file and the scrubbing value when using module param 'memory_scrub' -What: /sys/kernel/debug/habanalabs/hl<n>/mmu +What: /sys/kernel/debug/accel/<n>/mmu Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
@@ -217,19 +217,19 @@ Description: Displays the hop values and physical address for a given ASID and virtual address. The user should write the ASID and VA into the file and then read the file to get the result. e.g. to display info about VA 0x1000 for ASID 1 you need to do: - echo "1 0x1000" > /sys/kernel/debug/habanalabs/hl0/mmu + echo "1 0x1000" > /sys/kernel/debug/accel/0/mmu -What: /sys/kernel/debug/habanalabs/hl<n>/mmu_error +What: /sys/kernel/debug/accel/<n>/mmu_error Date: Mar 2021 KernelVersion: 5.12 Contact: [email protected] Description: Check and display page fault or access violation mmu errors for all MMUs specified in mmu_cap_mask. e.g. to display error info for MMU hw cap bit 9, you need to do: - echo "0x200" > /sys/kernel/debug/habanalabs/hl0/mmu_error - cat /sys/kernel/debug/habanalabs/hl0/mmu_error + echo "0x200" > /sys/kernel/debug/accel/0/mmu_error + cat /sys/kernel/debug/accel/0/mmu_error -What: /sys/kernel/debug/habanalabs/hl<n>/monitor_dump +What: /sys/kernel/debug/accel/<n>/monitor_dump Date: Mar 2022 KernelVersion: 5.19 Contact: [email protected]
@@ -243,7 +243,7 @@ Description: Allows the root user to dump monitors status from the device's This interface doesn't support concurrency in the same device. Only supported on GAUDI. -What: /sys/kernel/debug/habanalabs/hl<n>/monitor_dump_trig +What: /sys/kernel/debug/accel/<n>/monitor_dump_trig Date: Mar 2022 KernelVersion: 5.19 Contact: [email protected]
@@ -253,14 +253,14 @@ Description: Triggers dump of monitor data. The value to trigger the operatio When the write is finished, the user can read the "monitor_dump" blob -What: /sys/kernel/debug/habanalabs/hl<n>/set_power_state +What: /sys/kernel/debug/accel/<n>/set_power_state Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] Description: Sets the PCI power state. Valid values are "1" for D0 and "2" for D3Hot -What: /sys/kernel/debug/habanalabs/hl<n>/skip_reset_on_timeout +What: /sys/kernel/debug/accel/<n>/skip_reset_on_timeout Date: Jun 2021 KernelVersion: 5.13 Contact: [email protected]
@@ -268,7 +268,7 @@ Description: Sets the skip reset on timeout option for the device. Value of "0" means device will be reset in case some CS has timed out, otherwise it will not be reset. -What: /sys/kernel/debug/habanalabs/hl<n>/state_dump +What: /sys/kernel/debug/accel/<n>/state_dump Date: Oct 2021 KernelVersion: 5.15 Contact: [email protected]
@@ -279,7 +279,7 @@ Description: Gets the state dump occurring on a CS timeout or failure. Writing an integer X discards X state dumps, so that the next read would return X+1-st newest state dump. -What: /sys/kernel/debug/habanalabs/hl<n>/stop_on_err +What: /sys/kernel/debug/accel/<n>/stop_on_err Date: Mar 2020 KernelVersion: 5.6 Contact: [email protected]
@@ -287,21 +287,21 @@ Description: Sets the stop-on_error option for the device engines. Value of "0" is for disable, otherwise enable. Relevant only for GOYA and GAUDI. -What: /sys/kernel/debug/habanalabs/hl<n>/timeout_locked +What: /sys/kernel/debug/accel/<n>/timeout_locked Date: Sep 2021 KernelVersion: 5.16 Contact: [email protected] Description: Sets the command submission timeout value in seconds. -What: /sys/kernel/debug/habanalabs/hl<n>/userptr +What: /sys/kernel/debug/accel/<n>/userptr Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] -Description: Displays a list with information about the currently user +Description: Displays a list with information about the current user pointers (user virtual addresses) that are pinned and mapped to DMA addresses -What: /sys/kernel/debug/habanalabs/hl<n>/userptr_lookup +What: /sys/kernel/debug/accel/<n>/userptr_lookup Date: Oct 2021 KernelVersion: 5.15 Contact: [email protected]
@@ -309,7 +309,7 @@ Description: Allows to search for specific user pointers (user virtual addresses) that are pinned and mapped to DMA addresses, and see their resolution to the specific dma address. -What: /sys/kernel/debug/habanalabs/hl<n>/vm +What: /sys/kernel/debug/accel/<n>/vm Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected]
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 4/12 accel/habanalabs/gaudi2: fix missing check of kernel ctx
In reply to Oded GabbayIf we are initializing the kernel context when we have a Gaudi2 device, we don't need to do any late initializing of that context with specific Gaudi2 code.
--- drivers/accel/habanalabs/gaudi2/gaudi2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/accel/habanalabs/gaudi2/gaudi2.c +3 -0
@@ -10650,6 +10650,9 @@ static int gaudi2_ctx_init(struct hl_ctx *ctx) {int rc; +if (ctx->asid ==HL_KERNEL_ASID_ID ) +return 0 ; + rc =gaudi2_mmu_prepare (ctx->hdev, ctx->asid);if (rc)return rc;
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 11/12 accel/habanalabs: Move ioctls to the device specific ioctls range
In reply to Oded GabbayFrom: Tomer Tayar <[email protected]>
To use drm_ioctl(), move the ioctls to the device specific ioctls range at [DRM_COMMAND_BASE, DRM_COMMAND_END).
--- .../accel/habanalabs/common/command_buffer.c | 5 +- .../habanalabs/common/command_submission.c | 6 ++- drivers/accel/habanalabs/common/habanalabs.h | 11 ++-- .../accel/habanalabs/common/habanalabs_drv.c | 18 +++++-- .../habanalabs/common/habanalabs_ioctl.c | 53 ++++--------------- drivers/accel/habanalabs/common/memory.c | 3 +- include/uapi/drm/habanalabs_accel.h | 39 +++++++------- 7 files changed, 59 insertions(+), 76 deletions(-)
drivers/accel/habanalabs/common/command_buffer.c +3 -2
@@ -361,10 +361,11 @@ static int hl_cb_info(struct hl_mem_mgr *mmg,return rc; } -int hl_cb_ioctl (struct hl_fpriv *hpriv,void *data) +int hl_cb_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv) { -union hl_cb_args *args = data; +struct hl_fpriv *hpriv = file_priv->driver_priv;struct hl_device *hdev = hpriv->hdev; +union hl_cb_args *args = data;u64 handle =0 , device_va =0 ;enum hl_device_status status;u32 usage_cnt =0 ;
drivers/accel/habanalabs/common/command_submission.c +4 -2
@@ -2557,8 +2557,9 @@ static int cs_ioctl_flush_pci_hbw_writes(struct hl_fpriv *hpriv)return 0 ; } -int hl_cs_ioctl (struct hl_fpriv *hpriv,void *data) +int hl_cs_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv) { +struct hl_fpriv *hpriv = file_priv->driver_priv;union hl_cs_args *args = data;enum hl_cs_type cs_type =0 ;u64 cs_seq =ULONG_MAX ;
@@ -3718,8 +3719,9 @@ static int hl_interrupt_wait_ioctl(struct hl_fpriv *hpriv, void *data)return 0 ; } -int hl_wait_ioctl (struct hl_fpriv *hpriv,void *data) +int hl_wait_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv) { +struct hl_fpriv *hpriv = file_priv->driver_priv;struct hl_device *hdev = hpriv->hdev;union hl_wait_cs_args *args = data;u32 flags = args->in.flags;
drivers/accel/habanalabs/common/habanalabs.h +6 -5
@@ -4117,11 +4117,12 @@ void hl_ack_pb_single_dcore(struct hl_device *hdev, u32 dcore_offset, const u32 pb_blocks[], u32 blocks_array_size);/* IOCTLs */ -long hl_ioctl (struct file *filep,unsigned int cmd,unsigned long arg);long hl_ioctl_control (struct file *filep,unsigned int cmd,unsigned long arg); -int hl_cb_ioctl (struct hl_fpriv *hpriv,void *data); -int hl_cs_ioctl (struct hl_fpriv *hpriv,void *data); -int hl_wait_ioctl (struct hl_fpriv *hpriv,void *data); -int hl_mem_ioctl (struct hl_fpriv *hpriv,void *data); +int hl_info_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv); +int hl_cb_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv); +int hl_cs_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv); +int hl_wait_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv); +int hl_mem_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv); +int hl_debug_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv);#endif /* HABANALABSP_H_ */
drivers/accel/habanalabs/common/habanalabs_drv.c +15 -3
@@ -18,6 +18,7 @@#include <drm/drm_accel.h> #include <drm/drm_drv.h> +#include <drm/drm_ioctl.h> #define CREATE_TRACE_POINTS #include <trace/events/habanalabs.h>
@@ -73,12 +74,21 @@ static const struct pci_device_id ids[] = { };MODULE_DEVICE_TABLE (pci, ids); +static const struct drm_ioctl_desc hl_drm_ioctls[] = { +DRM_IOCTL_DEF_DRV (HL_INFO , hl_info_ioctl,0 ), +DRM_IOCTL_DEF_DRV (HL_CB , hl_cb_ioctl,0 ), +DRM_IOCTL_DEF_DRV (HL_CS , hl_cs_ioctl,0 ), +DRM_IOCTL_DEF_DRV (HL_WAIT_CS , hl_wait_ioctl,0 ), +DRM_IOCTL_DEF_DRV (HL_MEMORY , hl_mem_ioctl,0 ), +DRM_IOCTL_DEF_DRV (HL_DEBUG , hl_debug_ioctl,0 ), +}; +static const struct file_operations hl_fops = { .owner =THIS_MODULE , .open = accel_open, .release = drm_release, - .unlocked_ioctl = hl_ioctl, - .compat_ioctl = hl_ioctl, + .unlocked_ioctl = drm_ioctl, + .compat_ioctl = drm_compat_ioctl, .llseek = noop_llseek, .mmap = hl_mmap };
@@ -95,7 +105,9 @@ static const struct drm_driver hl_driver = { .fops = &hl_fops, .open = hl_device_open, - .postclose = hl_device_release + .postclose = hl_device_release, + .ioctls = hl_drm_ioctls, + .num_ioctls = ARRAY_SIZE(hl_drm_ioctls) };/*
drivers/accel/habanalabs/common/habanalabs_ioctl.c +10 -43
88 lines not on this page · raw message
drivers/accel/habanalabs/common/memory.c +2 -1
@@ -2171,8 +2171,9 @@ static int allocate_timestamps_buffers(struct hl_fpriv *hpriv, struct hl_mem_inreturn 0 ; } -int hl_mem_ioctl (struct hl_fpriv *hpriv,void *data) +int hl_mem_ioctl (struct drm_device *ddev,void *data,struct drm_file *file_priv) { +struct hl_fpriv *hpriv = file_priv->driver_priv;enum hl_device_status status;union hl_mem_args *args = data;struct hl_device *hdev = hpriv->hdev;
include/uapi/drm/habanalabs_accel.h +19 -20
@@ -8,8 +8,7 @@#ifndef HABANALABS_H_ #define HABANALABS_H_ -#include <linux/types.h> -#include <linux/ioctl.h> +#include <drm/drm.h> /* * Defines that are asic-specific but constitutes as ABI between kernel driver
@@ -607,9 +606,9 @@ enum gaudi2_engine_id {/* * ASIC specific PLL index * -* Used to retrieve in frequency info of different IPs via -* HL_INFO_PLL_FREQUENCY under HL_IOCTL_INFO IOCTL. The enums need to be -* used as an index in struct hl_pll_frequency_info +* Used to retrieve in frequency info of different IPs via HL_INFO_PLL_FREQUENCY under +* DRM_IOCTL_HL_INFO IOCTL. +* The enums need to be used as an index in struct hl_pll_frequency_info. */ enum hl_goya_pll_index {
@@ -2163,6 +2162,13 @@ struct hl_debug_args {__u32 ctx_id; }; +#define HL_IOCTL_INFO 0x00 +#define HL_IOCTL_CB 0x01 +#define HL_IOCTL_CS 0x02 +#define HL_IOCTL_WAIT_CS 0x03 +#define HL_IOCTL_MEMORY 0x04 +#define HL_IOCTL_DEBUG 0x05 +/* * Various information operations such as: * - H/W IP information
@@ -2177,8 +2183,7 @@ struct hl_debug_args {* definitions of structures in kernel and userspace, e.g. in case of old * userspace and new kernel driver */ -#define HL_IOCTL_INFO \ - _IOWR('H', 0x01, struct hl_info_args) +#define DRM_IOCTL_HL_INFO DRM_IOWR(DRM_COMMAND_BASE + HL_IOCTL_INFO, struct hl_info_args)/* * Command Buffer
@@ -2199,8 +2204,7 @@ struct hl_debug_args {* and won't be returned to user. * */ -#define HL_IOCTL_CB \ - _IOWR('H', 0x02, union hl_cb_args) +#define DRM_IOCTL_HL_CB DRM_IOWR(DRM_COMMAND_BASE + HL_IOCTL_CB, union hl_cb_args)/* * Command Submission
@@ -2252,8 +2256,7 @@ struct hl_debug_args {* and only if CS N and CS N-1 are exactly the same (same CBs for the same * queues). */ -#define HL_IOCTL_CS \ - _IOWR('H', 0x03, union hl_cs_args) +#define DRM_IOCTL_HL_CS DRM_IOWR(DRM_COMMAND_BASE + HL_IOCTL_CS, union hl_cs_args)/* * Wait for Command Submission
@@ -2285,9 +2288,7 @@ struct hl_debug_args {* HL_WAIT_CS_STATUS_ABORTED - The CS was aborted, usually because the * device was reset (EIO) */ - -#define HL_IOCTL_WAIT_CS \ - _IOWR('H', 0x04, union hl_wait_cs_args) +#define DRM_IOCTL_HL_WAIT_CS DRM_IOWR(DRM_COMMAND_BASE + HL_IOCTL_WAIT_CS, union hl_wait_cs_args)/* * Memory
@@ -2304,8 +2305,7 @@ struct hl_debug_args {* There is an option for the user to specify the requested virtual address. * */ -#define HL_IOCTL_MEMORY \ - _IOWR('H', 0x05, union hl_mem_args) +#define DRM_IOCTL_HL_MEMORY DRM_IOWR(DRM_COMMAND_BASE + HL_IOCTL_MEMORY, union hl_mem_args)/* * Debug
@@ -2331,10 +2331,9 @@ struct hl_debug_args {* The driver can decide to "kick out" the user if he abuses this interface. * */ -#define HL_IOCTL_DEBUG \ - _IOWR('H', 0x06, struct hl_debug_args) +#define DRM_IOCTL_HL_DEBUG DRM_IOWR(DRM_COMMAND_BASE + HL_IOCTL_DEBUG, struct hl_debug_args) -#define HL_COMMAND_START 0x01 -#define HL_COMMAND_END 0x07 +#define HL_COMMAND_START (DRM_COMMAND_BASE + HL_IOCTL_INFO) +#define HL_COMMAND_END (DRM_COMMAND_BASE + HL_IOCTL_DEBUG + 1)#endif /* HABANALABS_H_ */
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 12/12 accel/habanalabs: release user interfaces earlier in device fini
In reply to Oded GabbayFrom: Tomer Tayar <[email protected]>
Currently the sysfs/debugfs interfaces and device un-registration are done as the last thing in hl_device_fini(), after several finalizations and releases are done.
While a disabled flag is set at the beginning of hl_device_fini(), and it is being checked when handling user accesses to these interfaces, this check is not hermetic and it is better to just reverse the order of the code in hl_device_fini().
--- drivers/accel/habanalabs/common/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/accel/habanalabs/common/device.c +6 -6
@@ -2408,6 +2408,12 @@ void hl_device_fini(struct hl_device *hdev) hdev->fw_loader.fw_comp_loaded =FW_TYPE_NONE ; +/* Hide devices and sysfs/debugfs files from user */ +cdev_sysfs_debugfs_remove (hdev); +drm_dev_unregister (&hdev->drm); + +hl_debugfs_device_fini (hdev); +/* Release kernel context */ if ((hdev->kernel_ctx) && (hl_ctx_put (hdev->kernel_ctx) !=1 ))dev_err (hdev->dev,"kernel ctx is still alive\n" );
@@ -2436,12 +2442,6 @@ void hl_device_fini(struct hl_device *hdev)device_early_fini (hdev); -/* Hide devices and sysfs/debugfs files from user */ -cdev_sysfs_debugfs_remove (hdev); -drm_dev_unregister (&hdev->drm); - -hl_debugfs_device_fini (hdev); -pr_info ("removed device successfully\n" ); }
Signature · 1 line
2.34.1
Re: [PATCH 04/12] accel/habanalabs/gaudi2: fix missing check of kernel ctx
In reply to Oded GabbayQuoted 14 lines · Oded Gabbay
If we are initializing the kernel context when we have a Gaudi2 device, we don't need to do any late initializing of that context with specific Gaudi2 code.
Signed-off-by Oded Gabbay <[email protected]>--- drivers/accel/habanalabs/gaudi2/gaudi2.c | 3 +++ 1 file changed, 3 insertions(+)drivers/accel/habanalabs/gaudi2/gaudi2.c +0
-0
drivers/accel/habanalabs/gaudi2/gaudi2.c static int gaudi2_ctx_init(struct hl_ctx *ctx) · line 10658
Quoted 9 lines
drivers/accel/habanalabs/gaudi2/gaudi2.c +3
-0@@ -10650,6 +10650,9 @@ static int gaudi2_ctx_init(struct hl_ctx *ctx) {int rc; +if (ctx->asid ==HL_KERNEL_ASID_ID ) +return 0 ; + rc =gaudi2_mmu_prepare (ctx->hdev, ctx->asid);if (rc)return rc;