Commit 7ae439a0 authored by Oded Gabbay's avatar Oded Gabbay
Browse files

habanalabs: remove asic callback set_pll_profile() 



Setting PLL profile is the same for all ASICs, except for GOYA.
However, because this function is never called from common code, there
is no need to have an asic-specific callback function.

Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 092a31c5

drivers/misc/habanalabs/common/firmware_if.c

+1 −1
Original line number Diff line number Diff line
@@ -2683,7 +2683,7 @@ int hl_fw_init_cpu(struct hl_device *hdev) 
			hl_fw_static_init_cpu(hdev, fw_loader);

}



void hl_fw_set_pll_profile(struct hl_device *hdev, enum hl_pll_frequency freq)

void hl_fw_set_pll_profile(struct hl_device *hdev)

{

	hl_fw_set_frequency(hdev, hdev->asic_prop.clk_pll_index,

				hdev->asic_prop.max_freq_value);

drivers/misc/habanalabs/common/habanalabs.h

+1 −4
Original line number Diff line number Diff line
@@ -1161,7 +1161,6 @@ struct fw_load_mgr { 
 *                    internal memory via DMA engine.

 * @add_device_attr: add ASIC specific device attributes.

 * @handle_eqe: handle event queue entry (IRQ) from CPU-CP.

 * @set_pll_profile: change PLL profile (manual/automatic).

 * @get_events_stat: retrieve event queue entries histogram.

 * @read_pte: read MMU page table entry from DRAM.

 * @write_pte: write MMU page table entry to DRAM.
@@ -1291,8 +1290,6 @@ struct hl_asic_funcs { 
				struct attribute_group *dev_attr_grp);

	void (*handle_eqe)(struct hl_device *hdev,

				struct hl_eq_entry *eq_entry);

	void (*set_pll_profile)(struct hl_device *hdev,

			enum hl_pll_frequency freq);

	void* (*get_events_stat)(struct hl_device *hdev, bool aggregate,

				u32 *size);

	u64 (*read_pte)(struct hl_device *hdev, u64 addr);
@@ -3108,7 +3105,7 @@ int hl_set_current(struct hl_device *hdev, int sensor_index, u32 attr, long valu 
int hl_set_power(struct hl_device *hdev, int sensor_index, u32 attr, long value);

int hl_get_power(struct hl_device *hdev, int sensor_index, u32 attr, long *value);

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

void hl_fw_set_pll_profile(struct hl_device *hdev, enum hl_pll_frequency freq);

void hl_fw_set_pll_profile(struct hl_device *hdev);

void hl_sysfs_add_dev_clk_attr(struct hl_device *hdev, struct attribute_group *dev_attr_grp);



void hw_sob_get(struct hl_hw_sob *hw_sob);

drivers/misc/habanalabs/gaudi/gaudi.c

+1 −2
Original line number Diff line number Diff line
@@ -1635,7 +1635,7 @@ static int gaudi_late_init(struct hl_device *hdev) 
	 */

	gaudi_mmu_prepare(hdev, 1);



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

	hl_fw_set_pll_profile(hdev);



	return 0;
@@ -9363,7 +9363,6 @@ static const struct hl_asic_funcs gaudi_funcs = { 
	.debugfs_read_dma = gaudi_debugfs_read_dma,

	.add_device_attr = hl_sysfs_add_dev_clk_attr,

	.handle_eqe = gaudi_handle_eqe,

	.set_pll_profile = hl_fw_set_pll_profile,

	.get_events_stat = gaudi_get_events_stat,

	.read_pte = gaudi_read_pte,

	.write_pte = gaudi_write_pte,

drivers/misc/habanalabs/goya/goya.c

+1 −2
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ int goya_late_init(struct hl_device *hdev) 


	goya->pm_mng_profile = PM_AUTO;



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

	goya_set_pll_profile(hdev, PLL_LOW);



	schedule_delayed_work(&goya->goya_work->work_freq,

		usecs_to_jiffies(HL_PLL_LOW_JOB_FREQ_USEC));
@@ -5717,7 +5717,6 @@ static const struct hl_asic_funcs goya_funcs = { 
	.debugfs_read_dma = goya_debugfs_read_dma,

	.add_device_attr = goya_add_device_attr,

	.handle_eqe = goya_handle_eqe,

	.set_pll_profile = goya_set_pll_profile,

	.get_events_stat = goya_get_events_stat,

	.read_pte = goya_read_pte,

	.write_pte = goya_write_pte,

drivers/misc/habanalabs/goya/goya_hwmgr.c

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ void goya_set_pll_profile(struct hl_device *hdev, enum hl_pll_frequency freq) 
{

	struct goya_device *goya = hdev->asic_specific;



	if (!hdev->pdev)

		return;



	switch (freq) {

	case PLL_HIGH:

		hl_fw_set_frequency(hdev, HL_GOYA_MME_PLL, hdev->high_pll);