Commit 25e7aeba authored by Tomer Tayar's avatar Tomer Tayar Committed by Oded Gabbay
Browse files

habanalabs: Add INFO IOCTL opcode for time sync information 



Add a new opcode to the INFO IOCTL that retrieves the device time
alongside the host time, to allow a user application that want to measure
device time together with host time (such as a profiler) to synchronize
these times.

Signed-off-by: default avatarTomer Tayar <ttayar@habana.ai>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent ba7193c9

drivers/misc/habanalabs/goya/goya.c

+9 −1
Original line number Diff line number Diff line
@@ -5200,6 +5200,13 @@ static void goya_set_dma_mask_from_fw(struct hl_device *hdev) 
	}

}



u64 goya_get_device_time(struct hl_device *hdev)

{

	u64 device_time = ((u64) RREG32(mmPSOC_TIMESTAMP_CNTCVU)) << 32;



	return device_time | RREG32(mmPSOC_TIMESTAMP_CNTCVL);

}



static const struct hl_asic_funcs goya_funcs = {

	.early_init = goya_early_init,

	.early_fini = goya_early_fini,
@@ -5263,7 +5270,8 @@ static const struct hl_asic_funcs goya_funcs = { 
	.get_queue_id_for_cq = goya_get_queue_id_for_cq,

	.read_device_fw_version = goya_read_device_fw_version,

	.load_firmware_to_device = goya_load_firmware_to_device,

	.set_dma_mask_from_fw = goya_set_dma_mask_from_fw

	.set_dma_mask_from_fw = goya_set_dma_mask_from_fw,

	.get_device_time = goya_get_device_time

};



/*

drivers/misc/habanalabs/goya/goyaP.h

+1 −0
Original line number Diff line number Diff line
@@ -231,5 +231,6 @@ void goya_mmu_remove_device_cpu_mappings(struct hl_device *hdev); 


int goya_get_clk_rate(struct hl_device *hdev, u32 *cur_clk, u32 *max_clk);

u32 goya_get_queue_id_for_cq(struct hl_device *hdev, u32 cq_idx);

u64 goya_get_device_time(struct hl_device *hdev);



#endif /* GOYAP_H_ */

drivers/misc/habanalabs/habanalabs.h

+2 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ enum hl_pll_frequency { 
 * @load_firmware_to_device: load the firmware to the device's memory

 * @set_dma_mask_from_fw: set the DMA mask in the driver according to the

 *                        firmware configuration

 * @get_device_time: Get the device time.

 */

struct hl_asic_funcs {

	int (*early_init)(struct hl_device *hdev);
@@ -646,6 +647,7 @@ struct hl_asic_funcs { 
					enum hl_fw_component fwc);

	int (*load_firmware_to_device)(struct hl_device *hdev);

	void (*set_dma_mask_from_fw)(struct hl_device *hdev);

	u64 (*get_device_time)(struct hl_device *hdev);

};

drivers/misc/habanalabs/habanalabs_ioctl.c

+19 −0
Original line number Diff line number Diff line
@@ -258,6 +258,22 @@ static int get_reset_count(struct hl_device *hdev, struct hl_info_args *args) 
		min((size_t) max_size, sizeof(reset_count))) ? -EFAULT : 0;

}



static int time_sync_info(struct hl_device *hdev, struct hl_info_args *args)

{

	struct hl_info_time_sync time_sync = {0};

	u32 max_size = args->return_size;

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



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

		return -EINVAL;



	time_sync.device_time = hdev->asic_funcs->get_device_time(hdev);

	time_sync.host_time = ktime_get_raw_ns();



	return copy_to_user(out, &time_sync,

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

}



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

				struct device *dev)

{
@@ -315,6 +331,9 @@ static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data, 
		rc = get_clk_rate(hdev, args);

		break;



	case HL_INFO_TIME_SYNC:

		return time_sync_info(hdev, args);



	default:

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

		rc = -ENOTTY;

drivers/misc/habanalabs/include/goya/asic_reg/goya_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "psoc_mme_pll_regs.h"

#include "psoc_pci_pll_regs.h"

#include "psoc_emmc_pll_regs.h"

#include "psoc_timestamp_regs.h"

#include "cpu_if_regs.h"

#include "cpu_ca53_cfg_regs.h"

#include "cpu_pll_regs.h"