Commit bfbe9cbe authored by Oded Gabbay's avatar Oded Gabbay
Browse files

habanalabs: sysfs functions should be in sysfs.c 



Move common sysfs store/show functions to sysfs.c file for
consistency.

This is part of a patch-set to remove hwmgr.c

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

drivers/misc/habanalabs/common/habanalabs.h

+1 −2
Original line number Diff line number Diff line
@@ -3125,8 +3125,7 @@ int hl_get_power(struct hl_device *hdev, 
int hl_get_clk_rate(struct hl_device *hdev,

			u32 *cur_clk, u32 *max_clk);

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

void hl_add_device_attr(struct hl_device *hdev,

			struct attribute_group *dev_attr_grp);

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);

void hw_sob_put(struct hl_hw_sob *hw_sob);

void hl_encaps_handle_do_release(struct kref *ref);

drivers/misc/habanalabs/common/hwmgr.c

+0 −72
Original line number Diff line number Diff line
@@ -43,75 +43,3 @@ int hl_get_clk_rate(struct hl_device *hdev, u32 *cur_clk, u32 *max_clk) 


	return 0;

}
 


static ssize_t clk_max_freq_mhz_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct hl_device *hdev = dev_get_drvdata(dev);

	long value;



	if (!hl_device_operational(hdev, NULL))

		return -ENODEV;



	value = hl_get_frequency(hdev, hdev->asic_prop.clk_pll_index, false);



	hdev->asic_prop.max_freq_value = value;



	return sprintf(buf, "%lu\n", (value / 1000 / 1000));

}



static ssize_t clk_max_freq_mhz_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count)

{

	struct hl_device *hdev = dev_get_drvdata(dev);

	int rc;

	u64 value;



	if (!hl_device_operational(hdev, NULL)) {

		count = -ENODEV;

		goto fail;

	}



	rc = kstrtoull(buf, 0, &value);

	if (rc) {

		count = -EINVAL;

		goto fail;

	}



	hdev->asic_prop.max_freq_value = value * 1000 * 1000;



	hl_set_frequency(hdev, hdev->asic_prop.clk_pll_index,

			hdev->asic_prop.max_freq_value);



fail:

	return count;

}



static ssize_t clk_cur_freq_mhz_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct hl_device *hdev = dev_get_drvdata(dev);

	long value;



	if (!hl_device_operational(hdev, NULL))

		return -ENODEV;



	value = hl_get_frequency(hdev, hdev->asic_prop.clk_pll_index, true);



	return sprintf(buf, "%lu\n", (value / 1000 / 1000));

}



static DEVICE_ATTR_RW(clk_max_freq_mhz);

static DEVICE_ATTR_RO(clk_cur_freq_mhz);



static struct attribute *hl_dev_attrs[] = {

	&dev_attr_clk_max_freq_mhz.attr,

	&dev_attr_clk_cur_freq_mhz.attr,

	NULL,

};



void hl_add_device_attr(struct hl_device *hdev,

			struct attribute_group *dev_attr_grp)

{

	dev_attr_grp->attrs = hl_dev_attrs;

}

drivers/misc/habanalabs/common/sysfs.c

+69 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/*

 * Copyright 2016-2019 HabanaLabs, Ltd.

 * Copyright 2016-2022 HabanaLabs, Ltd.

 * All Rights Reserved.

 */
@@ -109,6 +109,69 @@ void hl_set_max_power(struct hl_device *hdev) 
		dev_err(hdev->dev, "Failed to set max power, error %d\n", rc);

}



static ssize_t clk_max_freq_mhz_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct hl_device *hdev = dev_get_drvdata(dev);

	long value;



	if (!hl_device_operational(hdev, NULL))

		return -ENODEV;



	value = hl_get_frequency(hdev, hdev->asic_prop.clk_pll_index, false);



	hdev->asic_prop.max_freq_value = value;



	return sprintf(buf, "%lu\n", (value / 1000 / 1000));

}



static ssize_t clk_max_freq_mhz_store(struct device *dev, struct device_attribute *attr,

					const char *buf, size_t count)

{

	struct hl_device *hdev = dev_get_drvdata(dev);

	int rc;

	u64 value;



	if (!hl_device_operational(hdev, NULL)) {

		count = -ENODEV;

		goto fail;

	}



	rc = kstrtoull(buf, 0, &value);

	if (rc) {

		count = -EINVAL;

		goto fail;

	}



	hdev->asic_prop.max_freq_value = value * 1000 * 1000;



	hl_set_frequency(hdev, hdev->asic_prop.clk_pll_index, hdev->asic_prop.max_freq_value);



fail:

	return count;

}



static ssize_t clk_cur_freq_mhz_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct hl_device *hdev = dev_get_drvdata(dev);

	long value;



	if (!hl_device_operational(hdev, NULL))

		return -ENODEV;



	value = hl_get_frequency(hdev, hdev->asic_prop.clk_pll_index, true);



	return sprintf(buf, "%lu\n", (value / 1000 / 1000));

}



static DEVICE_ATTR_RW(clk_max_freq_mhz);

static DEVICE_ATTR_RO(clk_cur_freq_mhz);



static struct attribute *hl_dev_clk_attrs[] = {

	&dev_attr_clk_max_freq_mhz.attr,

	&dev_attr_clk_cur_freq_mhz.attr,

	NULL,

};



static ssize_t uboot_ver_show(struct device *dev, struct device_attribute *attr,

				char *buf)

{
@@ -463,6 +526,11 @@ static const struct attribute_group *hl_dev_inference_attr_groups[] = { 
	NULL,

};



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

{

	dev_attr_grp->attrs = hl_dev_clk_attrs;

}



int hl_sysfs_init(struct hl_device *hdev)

{

	int rc;

drivers/misc/habanalabs/gaudi/gaudi.c

+1 −1
Original line number Diff line number Diff line
@@ -9361,7 +9361,7 @@ static const struct hl_asic_funcs gaudi_funcs = { 
	.debugfs_read64 = gaudi_debugfs_read64,

	.debugfs_write64 = gaudi_debugfs_write64,

	.debugfs_read_dma = gaudi_debugfs_read_dma,

	.add_device_attr = hl_add_device_attr,

	.add_device_attr = hl_sysfs_add_dev_clk_attr,

	.handle_eqe = gaudi_handle_eqe,

	.set_pll_profile = hl_set_pll_profile,

	.get_events_stat = gaudi_get_events_stat,