habanalabs: add support for getting device total energy
PATCH 1/2 habanalabs: add support for getting device total energy
From: farah kassabri <[email protected]>
Add driver implementation for reading the total energy consumption from the device ARM FW.
Signed-off-by farah kassabri <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/common/firmware_if.c | 24 +++++++++++++++++++ drivers/misc/habanalabs/common/habanalabs.h | 2 ++ .../misc/habanalabs/common/habanalabs_ioctl.c | 24 +++++++++++++++++++ .../misc/habanalabs/include/common/armcp_if.h | 1 + include/uapi/misc/habanalabs.h | 10 ++++++++ 5 files changed, 61 insertions(+)
drivers/misc/habanalabs/common/firmware_if.c +24 -0
@@ -402,6 +402,30 @@ int hl_fw_armcp_pci_counters_get(struct hl_device *hdev,return rc; } +int hl_fw_armcp_total_energy_get (struct hl_device *hdev, +u64 *total_energy) +{ +struct armcp_packet pkt = {}; +long result; +int rc; + + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_TOTAL_ENERGY_GET << +ARMCP_PKT_CTL_OPCODE_SHIFT ); + + rc = hdev->asic_funcs->send_cpu_message (hdev, (u32 *) &pkt,sizeof (pkt), +HL_ARMCP_INFO_TIMEOUT_USEC , &result); +if (rc) { +dev_err (hdev->dev, +"Failed to handle ArmCP total energy pkt, error %d\n" , + rc); +return rc; + } + + *total_energy = result; + +return rc; +} +static void fw_read_errors (struct hl_device *hdev,u32 boot_err0_reg) {u32 err_val;
drivers/misc/habanalabs/common/habanalabs.h +2 -0
@@ -1849,6 +1849,8 @@ int hl_fw_armcp_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,struct hl_info_pci_counters *counters); +int hl_fw_armcp_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, u32 boot_err0_reg, bool skip_bmc,
drivers/misc/habanalabs/common/habanalabs_ioctl.c +24 -0
@@ -357,6 +357,27 @@ static int sync_manager_info(struct hl_fpriv *hpriv, struct hl_info_args *args) sizeof(sm_info))) ? -EFAULT : 0; } +static int total_energy_consumption_info (struct hl_fpriv *hpriv, +struct hl_info_args *args) +{ +struct hl_device *hdev = hpriv->hdev; +struct hl_info_energy total_energy = {0 }; +u32 max_size = args->return_size; +void __user *out = (void __user *) (uintptr_t ) args->return_pointer; +int rc; + +if ((!max_size) || (!out)) +return -EINVAL ; + + rc =hl_fw_armcp_total_energy_get (hdev, + &total_energy.total_energy_consumption); +if (rc) +return rc; + +return copy_to_user (out, &total_energy, +min ((size_t ) max_size,sizeof (total_energy))) ? -EFAULT :0 ; +} +static int _hl_info_ioctl (struct hl_fpriv *hpriv,void *data,struct device *dev) {
@@ -429,6 +450,9 @@ static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data,case HL_INFO_SYNC_MANAGER :return sync_manager_info (hpriv, args); +case HL_INFO_TOTAL_ENERGY : +return total_energy_consumption_info (hpriv, args); +default :dev_err (dev,"Invalid request %d\n" , args->op); rc = -ENOTTY ;
drivers/misc/habanalabs/include/common/armcp_if.h +1 -0
@@ -245,6 +245,7 @@ enum armcp_packet_id {ARMCP_PACKET_CURRENT_SET ,/* sysfs */ ARMCP_PACKET_PCIE_THROUGHPUT_GET ,/* internal */ ARMCP_PACKET_PCIE_REPLAY_CNT_GET ,/* internal */ + ARMCP_PACKET_TOTAL_ENERGY_GET, /* internal */ };#define ARMCP_PACKET_FENCE_VAL 0xFE8CE7A5
include/uapi/misc/habanalabs.h +10 -0
@@ -267,6 +267,7 @@ enum hl_device_status {* HL_INFO_PCI_COUNTERS - Retrieve PCI counters * HL_INFO_CLK_THROTTLE_REASON - Retrieve clock throttling reason * HL_INFO_SYNC_MANAGER - Retrieve sync manager info per dcore +* HL_INFO_TOTAL_ENERGY - Retrieve total energy consumption */ #define HL_INFO_HW_IP_INFO 0#define HL_INFO_HW_EVENTS 1
@@ -282,6 +283,7 @@ enum hl_device_status {#define HL_INFO_PCI_COUNTERS 12#define HL_INFO_CLK_THROTTLE_REASON 13#define HL_INFO_SYNC_MANAGER 14 +#define HL_INFO_TOTAL_ENERGY 15#define HL_INFO_VERSION_MAX_LEN 128#define HL_INFO_CARD_NAME_MAX_LEN 16
@@ -375,6 +377,14 @@ struct hl_info_clk_throttle {__u32 clk_throttling_reason; }; +/** +* struct hl_info_energy - device energy information +* @total_energy_consumption: total device energy consumption +*/ +struct hl_info_energy { +__u64 total_energy_consumption; +}; +/** * struct hl_info_sync_manager - sync manager information * @first_available_sync_object: first available sob
Signature · 1 line
2.17.1
PATCH 2/2 habanalabs: update GAUDI hardware specs
Add define for the 2 MME slave engines.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/include/gaudi/gaudi.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/misc/habanalabs/include/gaudi/gaudi.h +2 -0
@@ -44,6 +44,8 @@#define MME_NUMBER_OF_MASTER_ENGINES 2 +#define MME_NUMBER_OF_SLAVE_ENGINES 2 +#define TPC_NUMBER_OF_ENGINES 8#define DMA_NUMBER_OF_CHANNELS 8
Signature · 1 line
2.17.1
RE: [PATCH 2/2] habanalabs: update GAUDI hardware specs
Quoted 3 lines · On Sat, Aug 22, 2020 at 19:24 Oded Gabbay <[email protected]> wrote:
Add define for the 2 MME slave engines.
Signed-off-by Oded Gabbay <[email protected]>
Reviewed-by Tomer Tayar <[email protected]>