Commit 586f2caf authored by Sagiv Ozeri's avatar Sagiv Ozeri Committed by Oded Gabbay
Browse files

habanalabs: return current power via INFO IOCTL 



Add driver implementation for reading the current power from the device
CPU F/W.

Signed-off-by: default avatarSagiv Ozeri <sozeri@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent a4371c1a

drivers/misc/habanalabs/common/firmware_if.c

+23 −0
Original line number Diff line number Diff line
@@ -565,6 +565,29 @@ int hl_fw_cpucp_pll_info_get(struct hl_device *hdev, u16 pll_index, 
	return rc;

}



int hl_fw_cpucp_power_get(struct hl_device *hdev, u64 *power)

{

	struct cpucp_packet pkt;

	u64 result;

	int rc;



	memset(&pkt, 0, sizeof(pkt));



	pkt.ctl = cpu_to_le32(CPUCP_PACKET_POWER_GET <<

				CPUCP_PKT_CTL_OPCODE_SHIFT);



	rc = hdev->asic_funcs->send_cpu_message(hdev, (u32 *) &pkt, sizeof(pkt),

			HL_CPUCP_INFO_TIMEOUT_USEC, &result);

	if (rc) {

		dev_err(hdev->dev, "Failed to read power, error %d\n", rc);

		return rc;

	}



	*power = result;



	return rc;

}



static void detect_cpu_boot_status(struct hl_device *hdev, u32 status)

{

	/* Some of the status codes below are deprecated in newer f/w

drivers/misc/habanalabs/common/habanalabs.h

+1 −0
Original line number Diff line number Diff line
@@ -2361,6 +2361,7 @@ int hl_fw_cpucp_total_energy_get(struct hl_device *hdev, 
			u64 *total_energy);

int hl_fw_cpucp_pll_info_get(struct hl_device *hdev, u16 pll_index,

		u16 *pll_freq_arr);

int hl_fw_cpucp_power_get(struct hl_device *hdev, u64 *power);

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 cpu_security_boot_status_reg, u32 boot_err0_reg,

drivers/misc/habanalabs/common/habanalabs_ioctl.c

+22 −0
Original line number Diff line number Diff line
@@ -446,6 +446,25 @@ static int pll_frequency_info(struct hl_fpriv *hpriv, struct hl_info_args *args) 
		min((size_t) max_size, sizeof(freq_info))) ? -EFAULT : 0;

}



static int power_info(struct hl_fpriv *hpriv, struct hl_info_args *args)

{

	struct hl_device *hdev = hpriv->hdev;

	u32 max_size = args->return_size;

	struct hl_power_info power_info = {0};

	void __user *out = (void __user *) (uintptr_t) args->return_pointer;

	int rc;



	if ((!max_size) || (!out))

		return -EINVAL;



	rc = hl_fw_cpucp_power_get(hdev, &power_info.power);

	if (rc)

		return rc;



	return copy_to_user(out, &power_info,

		min((size_t) max_size, sizeof(power_info))) ? -EFAULT : 0;

}



static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data,

				struct device *dev)

{
@@ -526,6 +545,9 @@ static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data, 
	case HL_INFO_PLL_FREQUENCY:

		return pll_frequency_info(hpriv, args);



	case HL_INFO_POWER:

		return power_info(hpriv, args);



	default:

		dev_err(dev, "Invalid request %d\n", args->op);

		rc = -ENOTTY;

drivers/misc/habanalabs/include/common/cpucp_if.h

+5 −0
Original line number Diff line number Diff line
@@ -296,6 +296,9 @@ enum pq_init_status { 
 *       The result is composed of 4 outputs, each is 16-bit

 *       frequency in MHz.

 *

 * CPUCP_PACKET_POWER_GET

 *       Fetch the present power consumption of the device (Current * Voltage).

 *

 */



enum cpucp_packet_id {
@@ -329,6 +332,8 @@ enum cpucp_packet_id { 
	CPUCP_PACKET_PCIE_REPLAY_CNT_GET,	/* internal */

	CPUCP_PACKET_TOTAL_ENERGY_GET,		/* internal */

	CPUCP_PACKET_PLL_INFO_GET,		/* internal */

	CPUCP_PACKET_NIC_STATUS,		/* internal */

	CPUCP_PACKET_POWER_GET,			/* internal */

};



#define CPUCP_PACKET_FENCE_VAL	0xFE8CE7A5

include/uapi/misc/habanalabs.h

+9 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ enum hl_device_status { 
#define HL_INFO_SYNC_MANAGER		14

#define HL_INFO_TOTAL_ENERGY		15

#define HL_INFO_PLL_FREQUENCY		16

#define HL_INFO_POWER			17



#define HL_INFO_VERSION_MAX_LEN	128

#define HL_INFO_CARD_NAME_MAX_LEN	16
@@ -410,6 +411,14 @@ struct hl_pll_frequency_info { 
	__u16 output[HL_PLL_NUM_OUTPUTS];

};



/**

 * struct hl_power_info - power information

 * @power: power consumption

 */

struct hl_power_info {

	__u64 power;

};



/**

 * struct hl_info_sync_manager - sync manager information

 * @first_available_sync_object: first available sob