habanalabs: expose device security status through sysfs
Subsystems (2)
PATCH 1/3 habanalabs: expose device security status through sysfs
From: Ofir Bitton <[email protected]>
In order for the user to know if he is running on a secured device or not, a sysfs node is added.
Signed-off-by Ofir Bitton <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- Documentation/ABI/testing/sysfs-driver-habanalabs | 6 ++++++ drivers/misc/habanalabs/common/sysfs.c | 10 ++++++++++ 2 files changed, 16 insertions(+)
Documentation/ABI/testing/sysfs-driver-habanalabs +6 -0
@@ -176,6 +176,12 @@ KernelVersion: 5.1 Contact: [email protected] Description: Version of the device's preboot F/W code +What: /sys/class/habanalabs/hl<n>/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 Date: Jan 2019 KernelVersion: 5.1
drivers/misc/habanalabs/common/sysfs.c +10 -0
@@ -375,6 +375,14 @@ static ssize_t eeprom_read_handler(struct file *filp, struct kobject *kobj,return max_size; } +static ssize_t security_enabled_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct hl_device *hdev =dev_get_drvdata (dev); + +return sprintf (buf,"%d\n" , hdev->asic_prop.fw_security_enabled); +} +static DEVICE_ATTR_RO (armcp_kernel_ver);static DEVICE_ATTR_RO (armcp_ver);static DEVICE_ATTR_RO (cpld_ver);
@@ -393,6 +401,7 @@ static DEVICE_ATTR_RO(status);static DEVICE_ATTR_RO (thermal_ver);static DEVICE_ATTR_RO (uboot_ver);static DEVICE_ATTR_RO (fw_os_ver); +static DEVICE_ATTR_RO (security_enabled);static struct bin_attribute bin_attr_eeprom = { .attr = {.name ="eeprom" , .mode = (0444 )},
@@ -417,6 +426,7 @@ static struct attribute *hl_dev_attrs[] = { &dev_attr_thermal_ver.attr, &dev_attr_uboot_ver.attr, &dev_attr_fw_os_ver.attr, + &dev_attr_security_enabled.attr, NULL, };
Signature · 1 line
2.25.1
PATCH 2/3 habanalabs: expose device security status using info ioctl
From: Ofir Bitton <[email protected]>
In order for the user to know if he is running on a secured device or not, we add it also to the hw_ip info ioctl.
Signed-off-by Ofir Bitton <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/common/habanalabs_ioctl.c | 1 + include/uapi/misc/habanalabs.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/misc/habanalabs/common/habanalabs_ioctl.c +1 -0
@@ -104,6 +104,7 @@ static int hw_ip_info(struct hl_device *hdev, struct hl_info_args *args) hw_ip.edma_enabled_mask = prop->edma_enabled_mask; hw_ip.server_type = prop->server_type; + hw_ip.security_enabled = prop->fw_security_enabled;return copy_to_user (out, &hw_ip,min ((size_t ) size,sizeof (hw_ip))) ? -EFAULT :0 ;
include/uapi/misc/habanalabs.h +2 -1
@@ -840,6 +840,7 @@ enum hl_server_type {* @tpc_enabled_mask: Bit-mask that represents which TPCs are enabled. Relevant * for Goya/Gaudi only. * @dram_enabled: Whether the DRAM is enabled. +* @security_enabled: Whether security is enabled on device. * @mme_master_slave_mode: Indicate whether the MME is working in master/slave * configuration. Relevant for Greco and later. * @cpucp_version: The CPUCP f/w version.
@@ -871,7 +872,7 @@ struct hl_info_hw_ip_info {__u32 psoc_pci_pll_div_factor;__u8 tpc_enabled_mask;__u8 dram_enabled; -__u8 reserved; +__u8 security_enabled;__u8 mme_master_slave_mode;__u8 cpucp_version[HL_INFO_VERSION_MAX_LEN ];__u8 card_name[HL_INFO_CARD_NAME_MAX_LEN ];
Signature · 1 line
2.25.1
PATCH 3/3 habanalabs: fix bug when setting va block size
In reply to Oded GabbayFrom: Dafna Hirschfeld <[email protected]>
the size of a block is always 'block->end - block->start + 1'
Signed-off-by Dafna Hirschfeld <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/common/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/common/memory.c +2 -2
@@ -457,7 +457,7 @@ static void merge_va_blocks_locked(struct hl_device *hdev, prev =list_prev_entry (va_block, node);if (&prev->node != va_list && prev->end +1 == va_block->start) { prev->end = va_block->end; - prev->size = prev->end - prev->start; + prev->size = prev->end - prev->start +1 ;list_del (&va_block->node);kfree (va_block); va_block = prev;
@@ -466,7 +466,7 @@ static void merge_va_blocks_locked(struct hl_device *hdev, next =list_next_entry (va_block, node);if (&next->node != va_list && va_block->end +1 == next->start) { next->start = va_block->start; - next->size = next->end - next->start; + next->size = next->end - next->start +1 ;list_del (&va_block->node);kfree (va_block); }
Signature · 1 line
2.25.1