Commit d8eb50f3 authored by Rajaravi Krishna Katta's avatar Rajaravi Krishna Katta Committed by Oded Gabbay
Browse files

habanalabs: Move frequency change thread to goya_late_init 



Changing the frequency automatically is only done in Goya. In future
ASICs this is done inside the firmware. Therefore, move the common code
into the Goya specific files.

Main changes as part of the commit are:
    1. The thread for setting frequency is moved from device_late_init
       to goya_late_init
    2. hl_device_set_frequency is removed from hl_device_open as it is
       not relevant for other ASICs and for Goya it is taken care by
       the thread
    3. hl_device_set_frequency is renamed as goya_set_frequency

Signed-off-by: default avatarRajaravi Krishna Katta <rkatta@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent ab440d3e

drivers/misc/habanalabs/common/device.c

+0 −58
Original line number Diff line number Diff line
@@ -516,22 +516,6 @@ static void device_early_fini(struct hl_device *hdev) 
		hdev->asic_funcs->early_fini(hdev);

}



static void set_freq_to_low_job(struct work_struct *work)

{

	struct hl_device *hdev = container_of(work, struct hl_device,

						work_freq.work);



	mutex_lock(&hdev->fpriv_list_lock);



	if (!hdev->compute_ctx)

		hl_device_set_frequency(hdev, PLL_LOW);



	mutex_unlock(&hdev->fpriv_list_lock);



	schedule_delayed_work(&hdev->work_freq,

			usecs_to_jiffies(HL_PLL_LOW_JOB_FREQ_USEC));

}



static void hl_device_heartbeat(struct work_struct *work)

{

	struct hl_device *hdev = container_of(work, struct hl_device,
@@ -591,18 +575,6 @@ static int device_late_init(struct hl_device *hdev) 


	hdev->high_pll = hdev->asic_prop.high_pll;



	/* force setting to low frequency */

	hdev->curr_pll_profile = PLL_LOW;



	if (hdev->pm_mng_profile == PM_AUTO)

		hdev->asic_funcs->set_pll_profile(hdev, PLL_LOW);

	else

		hdev->asic_funcs->set_pll_profile(hdev, PLL_LAST);



	INIT_DELAYED_WORK(&hdev->work_freq, set_freq_to_low_job);

	schedule_delayed_work(&hdev->work_freq,

	usecs_to_jiffies(HL_PLL_LOW_JOB_FREQ_USEC));



	if (hdev->heartbeat) {

		INIT_DELAYED_WORK(&hdev->work_heartbeat, hl_device_heartbeat);

		schedule_delayed_work(&hdev->work_heartbeat,
@@ -625,7 +597,6 @@ static void device_late_fini(struct hl_device *hdev) 
	if (!hdev->late_init_done)

		return;



	cancel_delayed_work_sync(&hdev->work_freq);

	if (hdev->heartbeat)

		cancel_delayed_work_sync(&hdev->work_heartbeat);
@@ -655,35 +626,6 @@ int hl_device_utilization(struct hl_device *hdev, u32 *utilization) 
	return 0;

}



/*

 * hl_device_set_frequency - set the frequency of the device

 *

 * @hdev: pointer to habanalabs device structure

 * @freq: the new frequency value

 *

 * Change the frequency if needed. This function has no protection against

 * concurrency, therefore it is assumed that the calling function has protected

 * itself against the case of calling this function from multiple threads with

 * different values

 *

 * Returns 0 if no change was done, otherwise returns 1

 */

int hl_device_set_frequency(struct hl_device *hdev, enum hl_pll_frequency freq)

{

	if ((hdev->pm_mng_profile == PM_MANUAL) ||

			(hdev->curr_pll_profile == freq))

		return 0;



	dev_dbg(hdev->dev, "Changing device frequency to %s\n",

		freq == PLL_HIGH ? "high" : "low");



	hdev->asic_funcs->set_pll_profile(hdev, freq);



	hdev->curr_pll_profile = freq;



	return 1;

}



int hl_device_set_debug_mode(struct hl_device *hdev, bool enable)

{

	int rc = 0;

drivers/misc/habanalabs/common/habanalabs.h

+0 −7
Original line number Diff line number Diff line
@@ -2450,7 +2450,6 @@ struct last_error_session_info { 
 * @cdev_ctrl: char device for control operations only (INFO IOCTL)

 * @dev: related kernel basic device structure.

 * @dev_ctrl: related kernel device structure for the control device

 * @work_freq: delayed work to lower device frequency if possible.

 * @work_heartbeat: delayed work for CPU-CP is-alive check.

 * @device_reset_work: delayed work which performs hard reset

 * @asic_name: ASIC specific name.
@@ -2485,7 +2484,6 @@ struct last_error_session_info { 
 * @asic_specific: ASIC specific information to use only from ASIC files.

 * @vm: virtual memory manager for MMU.

 * @hwmon_dev: H/W monitor device.

 * @pm_mng_profile: current power management profile.

 * @hl_chip_info: ASIC's sensors information.

 * @device_status_description: device status description.

 * @hl_debugfs: device's debugfs manager.
@@ -2530,7 +2528,6 @@ struct last_error_session_info { 
 * @open_counter: number of successful device open operations.

 * @fw_poll_interval_usec: FW status poll interval in usec.

 * @in_reset: is device in reset flow.

 * @curr_pll_profile: current PLL profile.

 * @card_type: Various ASICs have several card types. This indicates the card

 *             type of the current device.

 * @major: habanalabs kernel driver major.
@@ -2604,7 +2601,6 @@ struct hl_device { 
	struct cdev			cdev_ctrl;

	struct device			*dev;

	struct device			*dev_ctrl;

	struct delayed_work		work_freq;

	struct delayed_work		work_heartbeat;

	struct hl_device_reset_work	device_reset_work;

	char				asic_name[HL_STR_MAX];
@@ -2635,7 +2631,6 @@ struct hl_device { 
	void				*asic_specific;

	struct hl_vm			vm;

	struct device			*hwmon_dev;

	enum hl_pm_mng_profile		pm_mng_profile;

	struct hwmon_chip_info		*hl_chip_info;



	struct hl_dbg_device_entry	hl_debugfs;
@@ -2682,7 +2677,6 @@ struct hl_device { 
	u64				fw_poll_interval_usec;

	atomic_t			in_reset;

	ktime_t				last_successful_open_ktime;

	enum hl_pll_frequency		curr_pll_profile;

	enum cpucp_card_types		card_type;

	u32				major;

	u32				high_pll;
@@ -2912,7 +2906,6 @@ int hl_device_resume(struct hl_device *hdev); 
int hl_device_reset(struct hl_device *hdev, u32 flags);

void hl_hpriv_get(struct hl_fpriv *hpriv);

int hl_hpriv_put(struct hl_fpriv *hpriv);

int hl_device_set_frequency(struct hl_device *hdev, enum hl_pll_frequency freq);

int hl_device_utilization(struct hl_device *hdev, u32 *utilization);



int hl_build_hwmon_channel_info(struct hl_device *hdev,

drivers/misc/habanalabs/common/habanalabs_drv.c

+0 −7
Original line number Diff line number Diff line
@@ -175,13 +175,6 @@ int hl_device_open(struct inode *inode, struct file *filp) 
		goto out_err;

	}



	/* Device is IDLE at this point so it is legal to change PLLs.

	 * There is no need to check anything because if the PLL is

	 * already HIGH, the set function will return without doing

	 * anything

	 */

	hl_device_set_frequency(hdev, PLL_HIGH);



	list_add(&hpriv->dev_node, &hdev->fpriv_list);

	mutex_unlock(&hdev->fpriv_list_lock);

drivers/misc/habanalabs/common/sysfs.c

+0 −5
Original line number Diff line number Diff line
@@ -449,11 +449,6 @@ int hl_sysfs_init(struct hl_device *hdev) 
{

	int rc;



	if (hdev->asic_type == ASIC_GOYA)

		hdev->pm_mng_profile = PM_AUTO;

	else

		hdev->pm_mng_profile = PM_MANUAL;



	hdev->max_power = hdev->asic_prop.max_power_default;



	hdev->asic_funcs->add_device_attr(hdev, &hl_dev_clks_attr_group);

drivers/misc/habanalabs/gaudi/gaudi.c

+2 −0
Original line number Diff line number Diff line
@@ -1636,6 +1636,8 @@ static int gaudi_late_init(struct hl_device *hdev) 
	 */

	gaudi_mmu_prepare(hdev, 1);



	hdev->asic_funcs->set_pll_profile(hdev, PLL_LAST);



	return 0;



disable_pci_access: