habanalabs: replace armcp with the generic cpucp
Subsystems (2)
PATCH 2/2 habanalabs: cast to u64 before shift > 31 bits
In reply to Oded GabbayWhen shifting a boolean variable by more than 31 bits and putting the result into a u64 variable, we need to cast the boolean into unsigned 64 bits to prevent possible overflow.
--- drivers/misc/habanalabs/gaudi/gaudi.c | 8 +++++--- drivers/misc/habanalabs/goya/goya.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +5 -3
@@ -6114,7 +6114,7 @@ static bool gaudi_is_device_idle(struct hl_device *hdev, u64 *mask, is_idle &= is_eng_idle;if (mask) - *mask |= !is_eng_idle << + *mask |= ((u64 ) !is_eng_idle) << (GAUDI_ENGINE_ID_DMA_0 + dma_id);if (s) seq_printf(s, fmt, dma_id,
@@ -6137,7 +6137,8 @@ static bool gaudi_is_device_idle(struct hl_device *hdev, u64 *mask, is_idle &= is_eng_idle;if (mask) - *mask |= !is_eng_idle << (GAUDI_ENGINE_ID_TPC_0 + i); + *mask |= ((u64 ) !is_eng_idle) << + (GAUDI_ENGINE_ID_TPC_0 + i);if (s) seq_printf(s, fmt, i, is_eng_idle ? "Y" : "N",
@@ -6165,7 +6166,8 @@ static bool gaudi_is_device_idle(struct hl_device *hdev, u64 *mask, is_idle &= is_eng_idle;if (mask) - *mask |= !is_eng_idle << (GAUDI_ENGINE_ID_MME_0 + i); + *mask |= ((u64 ) !is_eng_idle) << + (GAUDI_ENGINE_ID_MME_0 + i);if (s) {if (!is_slave) seq_printf(s, fmt, i,
drivers/misc/habanalabs/goya/goya.c +5 -3
@@ -5173,7 +5173,8 @@ static bool goya_is_device_idle(struct hl_device *hdev, u64 *mask, is_idle &= is_eng_idle;if (mask) - *mask |= !is_eng_idle << (GOYA_ENGINE_ID_DMA_0 + i); + *mask |= ((u64 ) !is_eng_idle) << + (GOYA_ENGINE_ID_DMA_0 + i);if (s)seq_printf (s, dma_fmt, i, is_eng_idle ?"Y" :"N" , qm_glbl_sts0, dma_core_sts0);
@@ -5196,7 +5197,8 @@ static bool goya_is_device_idle(struct hl_device *hdev, u64 *mask, is_idle &= is_eng_idle;if (mask) - *mask |= !is_eng_idle << (GOYA_ENGINE_ID_TPC_0 + i); + *mask |= ((u64 ) !is_eng_idle) << + (GOYA_ENGINE_ID_TPC_0 + i);if (s)seq_printf (s, fmt, i, is_eng_idle ?"Y" :"N" , qm_glbl_sts0, cmdq_glbl_sts0, tpc_cfg_sts);
@@ -5216,7 +5218,7 @@ static bool goya_is_device_idle(struct hl_device *hdev, u64 *mask, is_idle &= is_eng_idle;if (mask) - *mask |= !is_eng_idle <<GOYA_ENGINE_ID_MME_0 ; + *mask |= ((u64 ) !is_eng_idle) <<GOYA_ENGINE_ID_MME_0 ;if (s) {seq_printf (s, fmt,0 , is_eng_idle ?"Y" :"N" , qm_glbl_sts0, cmdq_glbl_sts0, mme_arch_sts);
Signature · 1 line
2.17.1
PATCH 1/2 habanalabs: replace armcp with the generic cpucp
ArmCP mandates that the device CPU is always an ARM processor, which might be wrong in the future.
Most of this change is an internal renaming of variables, functions and defines but there are two entries in sysfs which have armcp in their names. Add identical cpucp entries but don't remove yet the armcp entries. Those will be deprecated next year. Add the documentation about it in sysfs documentation.
---
.../ABI/testing/sysfs-driver-habanalabs | 18 +-
drivers/misc/habanalabs/common/debugfs.c | 18 +-
drivers/misc/habanalabs/common/device.c | 2 +-
drivers/misc/habanalabs/common/firmware_if.c | 127 ++++----
drivers/misc/habanalabs/common/habanalabs.h | 20 +-
.../misc/habanalabs/common/habanalabs_ioctl.c | 12 +-
drivers/misc/habanalabs/common/hwmon.c | 60 ++--
drivers/misc/habanalabs/common/irq.c | 2 +-
drivers/misc/habanalabs/common/sysfs.c | 60 ++--
drivers/misc/habanalabs/gaudi/gaudi.c | 30 +-
drivers/misc/habanalabs/gaudi/gaudiP.h | 4 +-
drivers/misc/habanalabs/goya/goya.c | 34 +--
drivers/misc/habanalabs/goya/goyaP.h | 2 +-
.../include/common/{armcp_if.h => cpucp_if.h} | 273 +++++++++---------
include/uapi/misc/habanalabs.h | 4 +-
15 files changed, 350 insertions(+), 316 deletions(-)
rename drivers/misc/habanalabs/include/common/{armcp_if.h => cpucp_if.h} (63%)Documentation/ABI/testing/sysfs-driver-habanalabs +17 -1
@@ -2,13 +2,17 @@ What: /sys/class/habanalabs/hl<n>/armcp_kernel_ver Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] -Description: Version of the Linux kernel running on the device's CPU +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 Date: Jan 2019 KernelVersion: 5.1 Contact: [email protected] 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 Date: Jun 2019
@@ -33,6 +37,18 @@ KernelVersion: 5.1 Contact: [email protected] Description: Version of the Device's CPLD F/W +What: /sys/class/habanalabs/hl<n>/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 +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 Date: Jan 2019 KernelVersion: 5.1
drivers/misc/habanalabs/common/debugfs.c +9 -9
@@ -21,7 +21,7 @@ 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,long *val) { -struct armcp_packet pkt; +struct cpucp_packet pkt;int rc;if (hl_device_disabled_or_in_reset (hdev))
@@ -29,8 +29,8 @@ static int hl_debugfs_i2c_read(struct hl_device *hdev, u8 i2c_bus, u8 i2c_addr,memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =cpu_to_le32 (ARMCP_PACKET_I2C_RD << -ARMCP_PKT_CTL_OPCODE_SHIFT ); + pkt.ctl =cpu_to_le32 (CPUCP_PACKET_I2C_RD << +CPUCP_PKT_CTL_OPCODE_SHIFT ); pkt.i2c_bus = i2c_bus; pkt.i2c_addr = i2c_addr; pkt.i2c_reg = i2c_reg;
@@ -47,7 +47,7 @@ static int hl_debugfs_i2c_read(struct hl_device *hdev, u8 i2c_bus, u8 i2c_addr,static int hl_debugfs_i2c_write (struct hl_device *hdev,u8 i2c_bus,u8 i2c_addr,u8 i2c_reg,u32 val) { -struct armcp_packet pkt; +struct cpucp_packet pkt;int rc;if (hl_device_disabled_or_in_reset (hdev))
@@ -55,8 +55,8 @@ static int hl_debugfs_i2c_write(struct hl_device *hdev, u8 i2c_bus, u8 i2c_addr,memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =cpu_to_le32 (ARMCP_PACKET_I2C_WR << -ARMCP_PKT_CTL_OPCODE_SHIFT ); + pkt.ctl =cpu_to_le32 (CPUCP_PACKET_I2C_WR << +CPUCP_PKT_CTL_OPCODE_SHIFT ); pkt.i2c_bus = i2c_bus; pkt.i2c_addr = i2c_addr; pkt.i2c_reg = i2c_reg;
@@ -73,7 +73,7 @@ static int hl_debugfs_i2c_write(struct hl_device *hdev, u8 i2c_bus, u8 i2c_addr,static void hl_debugfs_led_set (struct hl_device *hdev,u8 led,u8 state) { -struct armcp_packet pkt; +struct cpucp_packet pkt;int rc;if (hl_device_disabled_or_in_reset (hdev))
@@ -81,8 +81,8 @@ static void hl_debugfs_led_set(struct hl_device *hdev, u8 led, u8 state)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =cpu_to_le32 (ARMCP_PACKET_LED_SET << -ARMCP_PKT_CTL_OPCODE_SHIFT ); + pkt.ctl =cpu_to_le32 (CPUCP_PACKET_LED_SET << +CPUCP_PKT_CTL_OPCODE_SHIFT ); pkt.led_index =cpu_to_le32 (led); pkt.value =cpu_to_le64 (state);
drivers/misc/habanalabs/common/device.c +1 -1
@@ -871,7 +871,7 @@ int hl_device_reset(struct hl_device *hdev, bool hard_reset,* so this message won't be sent */ if (hl_fw_send_pci_access_msg (hdev, -ARMCP_PACKET_DISABLE_PCI_ACCESS )) +CPUCP_PACKET_DISABLE_PCI_ACCESS ))dev_warn (hdev->dev,"Failed to disable PCI access by F/W\n" ); }
drivers/misc/habanalabs/common/firmware_if.c +63 -64
300 lines not on this page · raw message
drivers/misc/habanalabs/common/habanalabs.h +10 -10
@@ -8,7 +8,7 @@#ifndef HABANALABSP_H_ #define HABANALABSP_H_ -#include "../include/common/armcp_if.h" +#include "../include/common/cpucp_if.h" #include "../include/common/qman_if.h" #include <uapi/misc/habanalabs.h>
@@ -34,8 +34,8 @@#define HL_PLL_LOW_JOB_FREQ_USEC 5000000/* 5 s */ -#define HL_ARMCP_INFO_TIMEOUT_USEC 10000000/* 10s */ -#define HL_ARMCP_EEPROM_TIMEOUT_USEC 10000000/* 10s */ +#define HL_CPUCP_INFO_TIMEOUT_USEC 10000000/* 10s */ +#define HL_CPUCP_EEPROM_TIMEOUT_USEC 10000000/* 10s */ #define HL_PCI_ELBI_TIMEOUT_MSEC 10/* 10ms */
@@ -250,7 +250,7 @@ struct hl_mmu_properties {/** * struct asic_fixed_properties - ASIC specific immutable properties. * @hw_queues_props: H/W queues properties. -* @armcp_info: received various information from ArmCP regarding the H/W, e.g. +* @cpucp_info: received various information from CPU-CP regarding the H/W, e.g. * available sensors. * @uboot_ver: F/W U-boot version. * @preboot_ver: F/W Preboot version.
@@ -301,7 +301,7 @@ struct hl_mmu_properties {*/ struct asic_fixed_properties {struct hw_queue_properties *hw_queues_props; -struct armcp_info armcp_info; +struct cpucp_info cpucp_info;char uboot_ver[VERSION_MAX_LEN ];char preboot_ver[VERSION_MAX_LEN ];struct hl_mmu_properties dmmu;
@@ -1588,7 +1588,7 @@ struct hl_device {u64 clock_gating_mask;atomic_t in_reset;enum hl_pll_frequency curr_pll_profile; -enum armcp_card_types card_type; +enum cpucp_card_types card_type;int cs_active_cnt;u32 major;u32 high_pll;
@@ -1776,7 +1776,7 @@ int hl_device_set_frequency(struct hl_device *hdev, enum hl_pll_frequency freq);uint32_t hl_device_utilization (struct hl_device *hdev,uint32_t period_ms);int hl_build_hwmon_channel_info (struct hl_device *hdev, -struct armcp_sensor *sensors_arr); +struct cpucp_sensor *sensors_arr);int hl_sysfs_init (struct hl_device *hdev);void hl_sysfs_fini (struct hl_device *hdev);
@@ -1848,11 +1848,11 @@ void *hl_fw_cpu_accessible_dma_pool_alloc(struct hl_device *hdev, size_t size,void hl_fw_cpu_accessible_dma_pool_free (struct hl_device *hdev,size_t size,void *vaddr);int hl_fw_send_heartbeat (struct hl_device *hdev); -int hl_fw_armcp_info_get (struct hl_device *hdev); +int hl_fw_cpucp_info_get (struct hl_device *hdev);int hl_fw_get_eeprom_data (struct hl_device *hdev,void *data,size_t max_size); -int hl_fw_armcp_pci_counters_get (struct hl_device *hdev, +int hl_fw_cpucp_pci_counters_get (struct hl_device *hdev,struct hl_info_pci_counters *counters); -int hl_fw_armcp_total_energy_get (struct hl_device *hdev, +int hl_fw_cpucp_total_energy_get (struct hl_device *hdev,u64 *total_energy); int hl_fw_init_cpu(struct hl_device *hdev, u32 cpu_boot_status_reg, u32 msg_to_cpu_reg, u32 cpu_msg_status_reg,
drivers/misc/habanalabs/common/habanalabs_ioctl.c +6 -6
@@ -65,14 +65,14 @@ static int hw_ip_info(struct hl_device *hdev, struct hl_info_args *args) hw_ip.dram_enabled =1 ; hw_ip.num_of_events = prop->num_of_events; -memcpy (hw_ip.armcp_version, prop->armcp_info.armcp_version, +memcpy (hw_ip.cpucp_version, prop->cpucp_info.cpucp_version,min (VERSION_MAX_LEN ,HL_INFO_VERSION_MAX_LEN )); -memcpy (hw_ip.card_name, prop->armcp_info.card_name, +memcpy (hw_ip.card_name, prop->cpucp_info.card_name,min (CARD_NAME_MAX_LEN ,HL_INFO_CARD_NAME_MAX_LEN )); - hw_ip.armcp_cpld_version =le32_to_cpu (prop->armcp_info.cpld_version); - hw_ip.module_id =le32_to_cpu (prop->armcp_info.card_location); + hw_ip.cpld_version =le32_to_cpu (prop->cpucp_info.cpld_version); + hw_ip.module_id =le32_to_cpu (prop->cpucp_info.card_location); hw_ip.psoc_pci_pll_nr = prop->psoc_pci_pll_nr; hw_ip.psoc_pci_pll_nf = prop->psoc_pci_pll_nf;
@@ -288,7 +288,7 @@ static int pci_counters_info(struct hl_fpriv *hpriv, struct hl_info_args *args)if ((!max_size) || (!out))return -EINVAL ; - rc =hl_fw_armcp_pci_counters_get (hdev, &pci_counters); + rc =hl_fw_cpucp_pci_counters_get (hdev, &pci_counters);if (rc)return rc;
@@ -369,7 +369,7 @@ static int total_energy_consumption_info(struct hl_fpriv *hpriv,if ((!max_size) || (!out))return -EINVAL ; - rc =hl_fw_armcp_total_energy_get (hdev, + rc =hl_fw_cpucp_total_energy_get (hdev, &total_energy.total_energy_consumption);if (rc)return rc;
drivers/misc/habanalabs/common/hwmon.c +30 -30
168 lines not on this page · raw message
drivers/misc/habanalabs/common/irq.c +1 -1
@@ -11,7 +11,7 @@/** * struct hl_eqe_work - This structure is used to schedule work of EQ -* entry and armcp_reset event +* entry and cpucp_reset event * * @eq_work: workqueue object to run when EQ entry is received * @hdev: pointer to device structure
drivers/misc/habanalabs/common/sysfs.c +40 -20
152 lines not on this page · raw message
drivers/misc/habanalabs/gaudi/gaudi.c +15 -15
@@ -359,7 +359,7 @@ static int gaudi_memset_device_memory(struct hl_device *hdev, u64 addr,static int gaudi_run_tpc_kernel (struct hl_device *hdev,u64 tpc_kernel,u32 tpc_id);static int gaudi_mmu_clear_pgt_range (struct hl_device *hdev); -static int gaudi_armcp_info_get (struct hl_device *hdev); +static int gaudi_cpucp_info_get (struct hl_device *hdev);static void gaudi_disable_clock_gating (struct hl_device *hdev);static void gaudi_mmu_prepare (struct hl_device *hdev,u32 asid);
@@ -465,7 +465,7 @@ static int gaudi_get_fixed_properties(struct hl_device *hdev) prop->pcie_dbi_base_address = mmPCIE_DBI_BASE; prop->pcie_aux_dbi_reg_addr =CFG_BASE + mmPCIE_AUX_DBI; -strncpy (prop->armcp_info.card_name,GAUDI_DEFAULT_CARD_NAME , +strncpy (prop->cpucp_info.card_name,GAUDI_DEFAULT_CARD_NAME ,CARD_NAME_MAX_LEN ); prop->max_pending_cs =GAUDI_MAX_PENDING_CS ;
@@ -786,13 +786,13 @@ static int gaudi_late_init(struct hl_device *hdev)struct gaudi_device *gaudi = hdev->asic_specific;int rc; - rc = gaudi->armcp_info_get (hdev); + rc = gaudi->cpucp_info_get (hdev);if (rc) { -dev_err (hdev->dev,"Failed to get armcp info\n" ); +dev_err (hdev->dev,"Failed to get cpucp info\n" );return rc; } - rc =hl_fw_send_pci_access_msg (hdev,ARMCP_PACKET_ENABLE_PCI_ACCESS ); + rc =hl_fw_send_pci_access_msg (hdev,CPUCP_PACKET_ENABLE_PCI_ACCESS );if (rc) {dev_err (hdev->dev,"Failed to enable PCI access from CPU\n" );return rc;
@@ -817,7 +817,7 @@ static int gaudi_late_init(struct hl_device *hdev)return 0 ; disable_pci_access: -hl_fw_send_pci_access_msg (hdev,ARMCP_PACKET_DISABLE_PCI_ACCESS ); +hl_fw_send_pci_access_msg (hdev,CPUCP_PACKET_DISABLE_PCI_ACCESS );return rc; }
@@ -987,7 +987,7 @@ static int gaudi_sw_init(struct hl_device *hdev) } } - gaudi->armcp_info_get = gaudi_armcp_info_get; + gaudi->cpucp_info_get = gaudi_cpucp_info_get; gaudi->max_freq_value =GAUDI_MAX_CLK_FREQ ;
@@ -3078,7 +3078,7 @@ static int gaudi_suspend(struct hl_device *hdev) {int rc; - rc =hl_fw_send_pci_access_msg (hdev,ARMCP_PACKET_DISABLE_PCI_ACCESS ); + rc =hl_fw_send_pci_access_msg (hdev,CPUCP_PACKET_DISABLE_PCI_ACCESS );if (rc)dev_err (hdev->dev,"Failed to disable PCI access from CPU\n" );
@@ -6053,7 +6053,7 @@ static int gaudi_send_heartbeat(struct hl_device *hdev)return hl_fw_send_heartbeat (hdev); } -static int gaudi_armcp_info_get (struct hl_device *hdev) +static int gaudi_cpucp_info_get (struct hl_device *hdev) {struct gaudi_device *gaudi = hdev->asic_specific;struct asic_fixed_properties *prop = &hdev->asic_prop;
@@ -6062,19 +6062,19 @@ static int gaudi_armcp_info_get(struct hl_device *hdev)if (!(gaudi->hw_cap_initialized &HW_CAP_CPU_Q ))return 0 ; - rc =hl_fw_armcp_info_get (hdev); + rc =hl_fw_cpucp_info_get (hdev);if (rc)return rc; -if (!strlen (prop->armcp_info.card_name)) -strncpy (prop->armcp_info.card_name,GAUDI_DEFAULT_CARD_NAME , +if (!strlen (prop->cpucp_info.card_name)) +strncpy (prop->cpucp_info.card_name,GAUDI_DEFAULT_CARD_NAME ,CARD_NAME_MAX_LEN ); - hdev->card_type =le32_to_cpu (hdev->asic_prop.armcp_info.card_type); + hdev->card_type =le32_to_cpu (hdev->asic_prop.cpucp_info.card_type); -if (hdev->card_type == armcp_card_type_pci) +if (hdev->card_type == cpucp_card_type_pci) prop->max_power_default =MAX_POWER_DEFAULT_PCI ; -else if (hdev->card_type == armcp_card_type_pmc) +else if (hdev->card_type == cpucp_card_type_pmc) prop->max_power_default =MAX_POWER_DEFAULT_PMC ; hdev->max_power = prop->max_power_default;
drivers/misc/habanalabs/gaudi/gaudiP.h +2 -2
@@ -216,7 +216,7 @@ struct gaudi_internal_qman_info {/** * struct gaudi_device - ASIC specific manage structure. -* @armcp_info_get: get information on device from ArmCP +* @cpucp_info_get: get information on device from CPU-CP * @hw_queues_lock: protects the H/W queues from concurrent access. * @clk_gate_mutex: protects code areas that require clock gating to be disabled * temporarily
@@ -239,7 +239,7 @@ struct gaudi_internal_qman_info {* 8-bit value so use u8. */ struct gaudi_device { -int (*armcp_info_get)(struct hl_device *hdev); +int (*cpucp_info_get)(struct hl_device *hdev);/* TODO: remove hw_queues_lock after moving to scheduler code */ spinlock_t hw_queues_lock;
drivers/misc/habanalabs/goya/goya.c +17 -17
@@ -449,7 +449,7 @@ int goya_get_fixed_properties(struct hl_device *hdev) prop->pcie_dbi_base_address = mmPCIE_DBI_BASE; prop->pcie_aux_dbi_reg_addr =CFG_BASE + mmPCIE_AUX_DBI; -strncpy (prop->armcp_info.card_name,GOYA_DEFAULT_CARD_NAME , +strncpy (prop->cpucp_info.card_name,GOYA_DEFAULT_CARD_NAME ,CARD_NAME_MAX_LEN ); prop->max_pending_cs =GOYA_MAX_PENDING_CS ;
@@ -727,9 +727,9 @@ int goya_late_init(struct hl_device *hdev)if (rc)return rc; - rc =goya_armcp_info_get (hdev); + rc =goya_cpucp_info_get (hdev);if (rc) { -dev_err (hdev->dev,"Failed to get armcp info %d\n" , rc); +dev_err (hdev->dev,"Failed to get cpucp info %d\n" , rc);return rc; }
@@ -739,7 +739,7 @@ int goya_late_init(struct hl_device *hdev)*/ WREG32 (mmMMU_LOG2_DDR_SIZE,ilog2 (prop->dram_size)); - rc =hl_fw_send_pci_access_msg (hdev,ARMCP_PACKET_ENABLE_PCI_ACCESS ); + rc =hl_fw_send_pci_access_msg (hdev,CPUCP_PACKET_ENABLE_PCI_ACCESS );if (rc) {dev_err (hdev->dev,"Failed to enable PCI access from CPU %d\n" , rc);
@@ -2648,7 +2648,7 @@ int goya_suspend(struct hl_device *hdev) {int rc; - rc =hl_fw_send_pci_access_msg (hdev,ARMCP_PACKET_DISABLE_PCI_ACCESS ); + rc =hl_fw_send_pci_access_msg (hdev,CPUCP_PACKET_DISABLE_PCI_ACCESS );if (rc)dev_err (hdev->dev,"Failed to disable PCI access from CPU\n" );
@@ -4500,14 +4500,14 @@ static void goya_print_irq_info(struct hl_device *hdev, u16 event_type,static int goya_unmask_irq_arr (struct hl_device *hdev,u32 *irq_arr,size_t irq_arr_size) { -struct armcp_unmask_irq_arr_packet *pkt; +struct cpucp_unmask_irq_arr_packet *pkt;size_t total_pkt_size;long result;int rc;int irq_num_entries, irq_arr_index;__le32 *goya_irq_arr; - total_pkt_size =sizeof (struct armcp_unmask_irq_arr_packet ) + + total_pkt_size =sizeof (struct cpucp_unmask_irq_arr_packet ) + irq_arr_size;/* data should be aligned to 8 bytes in order to ArmCP to copy it */
@@ -4534,8 +4534,8 @@ static int goya_unmask_irq_arr(struct hl_device *hdev, u32 *irq_arr, goya_irq_arr[irq_arr_index] =cpu_to_le32 (irq_arr[irq_arr_index]); - pkt->armcp_pkt.ctl =cpu_to_le32 (ARMCP_PACKET_UNMASK_RAZWI_IRQ_ARRAY << -ARMCP_PKT_CTL_OPCODE_SHIFT ); + pkt->cpucp_pkt.ctl =cpu_to_le32 (CPUCP_PACKET_UNMASK_RAZWI_IRQ_ARRAY << +CPUCP_PKT_CTL_OPCODE_SHIFT ); rc = hdev->asic_funcs->send_cpu_message (hdev, (u32 *) pkt, total_pkt_size,0 , &result);
@@ -4560,14 +4560,14 @@ static int goya_soft_reset_late_init(struct hl_device *hdev)static int goya_unmask_irq (struct hl_device *hdev,u16 event_type) { -struct armcp_packet pkt; +struct cpucp_packet pkt;long result;int rc;memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =cpu_to_le32 (ARMCP_PACKET_UNMASK_RAZWI_IRQ << -ARMCP_PKT_CTL_OPCODE_SHIFT ); + pkt.ctl =cpu_to_le32 (CPUCP_PACKET_UNMASK_RAZWI_IRQ << +CPUCP_PKT_CTL_OPCODE_SHIFT ); pkt.value =cpu_to_le64 (event_type); rc = hdev->asic_funcs->send_cpu_message(hdev, (u32 *) &pkt, sizeof(pkt),
@@ -5103,7 +5103,7 @@ int goya_send_heartbeat(struct hl_device *hdev)return hl_fw_send_heartbeat (hdev); } -int goya_armcp_info_get (struct hl_device *hdev) +int goya_cpucp_info_get (struct hl_device *hdev) {struct goya_device *goya = hdev->asic_specific;struct asic_fixed_properties *prop = &hdev->asic_prop;
@@ -5113,11 +5113,11 @@ int goya_armcp_info_get(struct hl_device *hdev)if (!(goya->hw_cap_initialized &HW_CAP_CPU_Q ))return 0 ; - rc =hl_fw_armcp_info_get (hdev); + rc =hl_fw_cpucp_info_get (hdev);if (rc)return rc; - dram_size =le64_to_cpu (prop->armcp_info.dram_size); + dram_size =le64_to_cpu (prop->cpucp_info.dram_size);if (dram_size) {if ((!is_power_of_2 (dram_size)) || (dram_size <DRAM_PHYS_DEFAULT_SIZE )) {
@@ -5131,8 +5131,8 @@ int goya_armcp_info_get(struct hl_device *hdev) prop->dram_end_address = prop->dram_base_address + dram_size; } -if (!strlen (prop->armcp_info.card_name)) -strncpy (prop->armcp_info.card_name,GOYA_DEFAULT_CARD_NAME , +if (!strlen (prop->cpucp_info.card_name)) +strncpy (prop->cpucp_info.card_name,GOYA_DEFAULT_CARD_NAME ,CARD_NAME_MAX_LEN );return 0 ;
drivers/misc/habanalabs/goya/goyaP.h +1 -1
@@ -207,7 +207,7 @@ void goya_set_max_power(struct hl_device *hdev, u64 value);void goya_set_pll_profile (struct hl_device *hdev,enum hl_pll_frequency freq);void goya_add_device_attr (struct hl_device *hdev,struct attribute_group *dev_attr_grp); -int goya_armcp_info_get (struct hl_device *hdev); +int goya_cpucp_info_get (struct hl_device *hdev);int goya_debug_coresight (struct hl_device *hdev,void *data);void goya_halt_coresight (struct hl_device *hdev);
drivers/misc/habanalabs/include/common/cpucp_if.h renamed from drivers/misc/habanalabs/include/common/armcp_if.h +136 -137
475 lines not on this page · raw message
include/uapi/misc/habanalabs.h +2 -2
@@ -297,7 +297,7 @@ struct hl_info_hw_ip_info {__u32 device_id;/* PCI Device ID */ __u32 module_id;/* For mezzanine cards in servers (From OCP spec.) */ __u32 reserved[2 ]; -__u32 armcp_cpld_version; +__u32 cpld_version;__u32 psoc_pci_pll_nr;__u32 psoc_pci_pll_nf;__u32 psoc_pci_pll_od;
@@ -305,7 +305,7 @@ struct hl_info_hw_ip_info {__u8 tpc_enabled_mask;__u8 dram_enabled;__u8 pad[2 ]; -__u8 armcp_version[HL_INFO_VERSION_MAX_LEN ]; +__u8 cpucp_version[HL_INFO_VERSION_MAX_LEN ];__u8 card_name[HL_INFO_CARD_NAME_MAX_LEN ]; };
Signature · 1 line
2.17.1