* [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux
@ 2021-12-02 2:26 Howard Chiu
2021-12-02 3:59 ` Joel Stanley
0 siblings, 1 reply; 7+ messages in thread
From: Howard Chiu @ 2021-12-02 2:26 UTC (permalink / raw)
To: openbmc, joel; +Cc: Howard Chiu
Aspeed did not commit tach driver to upstream for ast2600 series yet.
To support ast26xx on OpenBMC, we need this driver and update the g6 device tree as well.
Change-Id: I1714abf4fd08edead789439e5723b183d1b0d175
Signed-off-by: Howard Chiu <howard.chiu@quantatw.com>
---
arch/arm/boot/dts/aspeed-g6.dtsi | 22 ++
drivers/hwmon/Kconfig | 8 +
drivers/hwmon/Makefile | 1 +
drivers/hwmon/tach-aspeed-ast2600.c | 388 ++++++++++++++++++++++++++++
4 files changed, 419 insertions(+)
create mode 100644 drivers/hwmon/tach-aspeed-ast2600.c
diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
index 5106a424f1ce..ec249f450552 100644
--- a/arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -304,6 +304,28 @@ apb {
#size-cells = <1>;
ranges;
+ pwm_tach: pwm_tach@1e610000 {
+ compatible = "aspeed,ast2600-pwm-tach", "simple-mfd", "syscon";
+ reg = <0x1e610000 0x100>;
+ clocks = <&syscon ASPEED_CLK_AHB>;
+ resets = <&syscon ASPEED_RESET_PWM>;
+
+ pwm: pwm {
+ compatible = "aspeed,ast2600-pwm";
+ #pwm-cells = <3>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ tach: tach {
+ compatible = "aspeed,ast2600-tach";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+ };
+
syscon: syscon@1e6e2000 {
compatible = "aspeed,ast2600-scu", "syscon", "simple-mfd";
reg = <0x1e6e2000 0x1000>;
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 64bd3dfba2c4..0eb307cb67fc 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -397,6 +397,14 @@ config SENSORS_ASPEED
This driver can also be built as a module. If so, the module
will be called aspeed_pwm_tacho.
+config SENSORS_TACH_ASPEED_AST2600
+ tristate "ASPEED ast2600 Tachometer support"
+ help
+ This driver provides support for Aspeed ast2600 Tachometer.
+
+ To compile this driver as a module, choose M here: the module
+ will be called tach-aspeed-ast2600.
+
config SENSORS_ATXP1
tristate "Attansic ATXP1 VID controller"
depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index baee6a8d4dd1..ce66874c8ce2 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -51,6 +51,7 @@ obj-$(CONFIG_SENSORS_ARM_SCMI) += scmi-hwmon.o
obj-$(CONFIG_SENSORS_ARM_SCPI) += scpi-hwmon.o
obj-$(CONFIG_SENSORS_AS370) += as370-hwmon.o
obj-$(CONFIG_SENSORS_ASC7621) += asc7621.o
+obj-$(CONFIG_SENSORS_TACH_ASPEED_AST2600) += tach-aspeed-ast2600.o
obj-$(CONFIG_SENSORS_ASPEED) += aspeed-pwm-tacho.o
obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
obj-$(CONFIG_SENSORS_AXI_FAN_CONTROL) += axi-fan-control.o
diff --git a/drivers/hwmon/tach-aspeed-ast2600.c b/drivers/hwmon/tach-aspeed-ast2600.c
new file mode 100644
index 000000000000..0b2551fc1711
--- /dev/null
+++ b/drivers/hwmon/tach-aspeed-ast2600.c
@@ -0,0 +1,388 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) ASPEED Technology Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 or later as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/clk.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/syscon.h>
+#include <linux/sysfs.h>
+#include <linux/reset.h>
+#include <linux/regmap.h>
+/* TACH Control Register */
+#define ASPEED_TACHO_CTRL_CH(ch) ((ch * 0x10) + 0x08)
+#define TACHO_IER BIT(31) //enable tacho interrupt
+#define TACHO_INVERS_LIMIT BIT(30) //inverse tacho limit comparison
+#define TACHO_LOOPBACK BIT(29) //tacho loopback
+#define TACHO_ENABLE BIT(28) //{enable tacho}
+#define TACHO_DEBOUNCE_MASK (0x3 << 26) //{tacho de-bounce}
+#define TACHO_DEBOUNCE_BIT (26) //{tacho de-bounce}
+#define TECHIO_EDGE_MASK (0x3 << 24) //tacho edge}
+#define TECHIO_EDGE_BIT (24) //tacho edge}
+#define TACHO_CLK_DIV_T_MASK (0xf << 20)
+#define TACHO_CLK_DIV_BIT (20)
+#define TACHO_THRESHOLD_MASK (0xfffff) //tacho threshold bit
+/* [27:26] */
+#define DEBOUNCE_3_CLK 0x00 /* 10b */
+#define DEBOUNCE_2_CLK 0x01 /* 10b */
+#define DEBOUNCE_1_CLK 0x02 /* 10b */
+#define DEBOUNCE_0_CLK 0x03 /* 10b */
+/* [25:24] */
+#define F2F_EDGES 0x00 /* 10b */
+#define R2R_EDGES 0x01 /* 10b */
+#define BOTH_EDGES 0x02 /* 10b */
+/* [23:20] */
+/* Cover rpm range 5~5859375 */
+#define DEFAULT_TACHO_DIV 5
+
+/* TACH Status Register */
+#define ASPEED_TACHO_STS_CH(x) ((x * 0x10) + 0x0C)
+
+/*PWM_TACHO_STS */
+#define TACHO_ISR BIT(31) //interrupt status and clear
+#define PWM_OUT BIT(25) //{pwm_out}
+#define PWM_OEN BIT(24) //{pwm_oeN}
+#define TACHO_DEB_INPUT BIT(23) //tacho deB input
+#define TACHO_RAW_INPUT BIT(22) //tacho raw input}
+#define TACHO_VALUE_UPDATE BIT(21) //tacho value updated since the last read
+#define TACHO_FULL_MEASUREMENT BIT(20) //{tacho full measurement}
+#define TACHO_VALUE_MASK 0xfffff //tacho value bit [19:0]}
+/**********************************************************
+ * Software setting
+ *********************************************************/
+#define DEFAULT_FAN_MIN_RPM 1000
+#define DEFAULT_FAN_PULSE_PR 2
+/*
+ * Add this value to avoid CPU consuming a lot of resources in waiting rpm
+ * updating. Assume the max rpm of fan is 60000, the period of updating tach
+ * value will equal to (1000000 * 2 * 60) / (2 * max_rpm) = 1000.
+ */
+#define RPM_POLLING_PERIOD_US 1000
+
+struct aspeed_tacho_channel_params {
+ int limited_inverse;
+ u16 threshold;
+ u8 tacho_edge;
+ u8 tacho_debounce;
+ u8 pulse_pr;
+ u32 min_rpm;
+ u32 divide;
+ u32 sample_period; /* unit is us */
+};
+
+struct aspeed_tach_data {
+ struct regmap *regmap;
+ unsigned long clk_freq;
+ struct reset_control *reset;
+ bool tach_present[16];
+ struct aspeed_tacho_channel_params *tacho_channel;
+ /* for hwmon */
+ const struct attribute_group *groups[2];
+};
+
+static u32 aspeed_get_fan_tach_sample_period(struct aspeed_tach_data *priv,
+ u8 fan_tach_ch)
+{
+ u32 tach_period_us;
+ u8 pulse_pr = priv->tacho_channel[fan_tach_ch].pulse_pr;
+ u32 min_rpm = priv->tacho_channel[fan_tach_ch].min_rpm;
+ /*
+ * min(Tach input clock) = (PulsePR * minRPM) / 60
+ * max(Tach input period) = 60 / (PulsePR * minRPM)
+ * Tach sample period > 2 * max(Tach input period) = (2*60) / (PulsePR * minRPM)
+ */
+ tach_period_us = (1000000 * 2 * 60) / (pulse_pr * min_rpm);
+ /* Add the margin (about 1.2) of tach sample period to avoid sample miss */
+ tach_period_us = (tach_period_us * 1200) >> 10;
+ pr_debug("tach%d sample period = %dus", fan_tach_ch, tach_period_us);
+ return tach_period_us;
+}
+
+static void aspeed_set_fan_tach_ch_enable(struct aspeed_tach_data *priv,
+ u8 fan_tach_ch, bool enable,
+ u32 tacho_div)
+{
+ u32 reg_value = 0;
+
+ if (enable) {
+ /* divide = 2^(tacho_div*2) */
+ priv->tacho_channel[fan_tach_ch].divide = 1 << (tacho_div << 1);
+
+ reg_value = TACHO_ENABLE |
+ (priv->tacho_channel[fan_tach_ch].tacho_edge
+ << TECHIO_EDGE_BIT) |
+ (tacho_div << TACHO_CLK_DIV_BIT) |
+ (priv->tacho_channel[fan_tach_ch].tacho_debounce
+ << TACHO_DEBOUNCE_BIT);
+
+ if (priv->tacho_channel[fan_tach_ch].limited_inverse)
+ reg_value |= TACHO_INVERS_LIMIT;
+
+ if (priv->tacho_channel[fan_tach_ch].threshold)
+ reg_value |=
+ (TACHO_IER |
+ priv->tacho_channel[fan_tach_ch].threshold);
+
+ regmap_write(priv->regmap, ASPEED_TACHO_CTRL_CH(fan_tach_ch),
+ reg_value);
+
+ priv->tacho_channel[fan_tach_ch].sample_period =
+ aspeed_get_fan_tach_sample_period(priv, fan_tach_ch);
+ } else
+ regmap_update_bits(priv->regmap,
+ ASPEED_TACHO_CTRL_CH(fan_tach_ch),
+ TACHO_ENABLE, 0);
+}
+
+static int aspeed_get_fan_tach_ch_rpm(struct aspeed_tach_data *priv,
+ u8 fan_tach_ch)
+{
+ u32 raw_data, tach_div, clk_source, usec, val;
+ u64 rpm;
+ int ret;
+
+ usec = priv->tacho_channel[fan_tach_ch].sample_period;
+ /* Restart the Tach channel to guarantee the value is fresh */
+ regmap_update_bits(priv->regmap, ASPEED_TACHO_CTRL_CH(fan_tach_ch),
+ TACHO_ENABLE, 0);
+ regmap_update_bits(priv->regmap, ASPEED_TACHO_CTRL_CH(fan_tach_ch),
+ TACHO_ENABLE, TACHO_ENABLE);
+ ret = regmap_read_poll_timeout(
+ priv->regmap, ASPEED_TACHO_STS_CH(fan_tach_ch), val,
+ (val & TACHO_FULL_MEASUREMENT) && (val & TACHO_VALUE_UPDATE),
+ RPM_POLLING_PERIOD_US, usec);
+
+ if (ret) {
+ /* return 0 if we didn't get an answer because of timeout*/
+ if (ret == -ETIMEDOUT)
+ return 0;
+ else
+ return ret;
+ }
+
+ raw_data = val & TACHO_VALUE_MASK;
+ /*
+ * We need the mode to determine if the raw_data is double (from
+ * counting both edges).
+ */
+ if (priv->tacho_channel[fan_tach_ch].tacho_edge == BOTH_EDGES)
+ raw_data <<= 1;
+
+ tach_div = raw_data * (priv->tacho_channel[fan_tach_ch].divide) *
+ (priv->tacho_channel[fan_tach_ch].pulse_pr);
+
+ pr_debug("clk %ld, raw_data %d , tach_div %d\n", priv->clk_freq, raw_data, tach_div);
+
+ clk_source = priv->clk_freq;
+
+ if (tach_div == 0)
+ return -EDOM;
+
+ rpm = (u64)clk_source * 60;
+ do_div(rpm, tach_div);
+
+ return rpm;
+}
+
+static ssize_t show_rpm(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+ int index = sensor_attr->index;
+ int rpm;
+ struct aspeed_tach_data *priv = dev_get_drvdata(dev);
+
+ rpm = aspeed_get_fan_tach_ch_rpm(priv, index);
+ if (rpm < 0)
+ return rpm;
+
+ return sprintf(buf, "%d\n", rpm);
+}
+
+static umode_t fan_dev_is_visible(struct kobject *kobj, struct attribute *a,
+ int index)
+{
+ struct device *dev = container_of(kobj, struct device, kobj);
+ struct aspeed_tach_data *priv = dev_get_drvdata(dev);
+
+ if (!priv->tach_present[index])
+ return 0;
+ return a->mode;
+}
+
+static SENSOR_DEVICE_ATTR(fan1_input, 0444, show_rpm, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan2_input, 0444, show_rpm, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan3_input, 0444, show_rpm, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan4_input, 0444, show_rpm, NULL, 3);
+static SENSOR_DEVICE_ATTR(fan5_input, 0444, show_rpm, NULL, 4);
+static SENSOR_DEVICE_ATTR(fan6_input, 0444, show_rpm, NULL, 5);
+static SENSOR_DEVICE_ATTR(fan7_input, 0444, show_rpm, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan8_input, 0444, show_rpm, NULL, 7);
+static SENSOR_DEVICE_ATTR(fan9_input, 0444, show_rpm, NULL, 8);
+static SENSOR_DEVICE_ATTR(fan10_input, 0444, show_rpm, NULL, 9);
+static SENSOR_DEVICE_ATTR(fan11_input, 0444, show_rpm, NULL, 10);
+static SENSOR_DEVICE_ATTR(fan12_input, 0444, show_rpm, NULL, 11);
+static SENSOR_DEVICE_ATTR(fan13_input, 0444, show_rpm, NULL, 12);
+static SENSOR_DEVICE_ATTR(fan14_input, 0444, show_rpm, NULL, 13);
+static SENSOR_DEVICE_ATTR(fan15_input, 0444, show_rpm, NULL, 14);
+static SENSOR_DEVICE_ATTR(fan16_input, 0444, show_rpm, NULL, 15);
+static struct attribute *fan_dev_attrs[] = {
+ &sensor_dev_attr_fan1_input.dev_attr.attr,
+ &sensor_dev_attr_fan2_input.dev_attr.attr,
+ &sensor_dev_attr_fan3_input.dev_attr.attr,
+ &sensor_dev_attr_fan4_input.dev_attr.attr,
+ &sensor_dev_attr_fan5_input.dev_attr.attr,
+ &sensor_dev_attr_fan6_input.dev_attr.attr,
+ &sensor_dev_attr_fan7_input.dev_attr.attr,
+ &sensor_dev_attr_fan8_input.dev_attr.attr,
+ &sensor_dev_attr_fan9_input.dev_attr.attr,
+ &sensor_dev_attr_fan10_input.dev_attr.attr,
+ &sensor_dev_attr_fan11_input.dev_attr.attr,
+ &sensor_dev_attr_fan12_input.dev_attr.attr,
+ &sensor_dev_attr_fan13_input.dev_attr.attr,
+ &sensor_dev_attr_fan14_input.dev_attr.attr,
+ &sensor_dev_attr_fan15_input.dev_attr.attr,
+ &sensor_dev_attr_fan16_input.dev_attr.attr,
+ NULL
+};
+
+static const struct attribute_group fan_dev_group = {
+ .attrs = fan_dev_attrs,
+ .is_visible = fan_dev_is_visible,
+};
+
+static void aspeed_create_fan_tach_channel(struct aspeed_tach_data *priv,
+ u32 tach_ch, int count,
+ u32 fan_pulse_pr, u32 fan_min_rpm,
+ u32 tacho_div)
+{
+ priv->tach_present[tach_ch] = true;
+ priv->tacho_channel[tach_ch].pulse_pr = fan_pulse_pr;
+ priv->tacho_channel[tach_ch].min_rpm = fan_min_rpm;
+ priv->tacho_channel[tach_ch].limited_inverse = 0;
+ priv->tacho_channel[tach_ch].threshold = 0;
+ priv->tacho_channel[tach_ch].tacho_edge = F2F_EDGES;
+ priv->tacho_channel[tach_ch].tacho_debounce = DEBOUNCE_3_CLK;
+ aspeed_set_fan_tach_ch_enable(priv, tach_ch, true, tacho_div);
+}
+
+static int aspeed_tach_create_fan(struct device *dev, struct device_node *child,
+ struct aspeed_tach_data *priv)
+{
+ u32 fan_pulse_pr, fan_min_rpm;
+ u32 tacho_div;
+ u32 tach_channel;
+ int ret, count;
+
+ ret = of_property_read_u32(child, "reg", &tach_channel);
+ if (ret)
+ return ret;
+
+ ret = of_property_read_u32(child, "aspeed,pulse-pr", &fan_pulse_pr);
+ if (ret)
+ fan_pulse_pr = DEFAULT_FAN_PULSE_PR;
+
+ ret = of_property_read_u32(child, "aspeed,min-rpm", &fan_min_rpm);
+ if (ret)
+ fan_min_rpm = DEFAULT_FAN_MIN_RPM;
+
+ ret = of_property_read_u32(child, "aspeed,tach-div", &tacho_div);
+ if (ret)
+ tacho_div = DEFAULT_TACHO_DIV;
+
+ aspeed_create_fan_tach_channel(priv, tach_channel, count, fan_pulse_pr,
+ fan_min_rpm, tacho_div);
+
+ return 0;
+}
+
+static int aspeed_tach_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct device_node *np, *child;
+ struct aspeed_tach_data *priv;
+ struct device *hwmon;
+ struct clk *clk;
+ int ret;
+
+ np = dev->parent->of_node;
+ dev_info(dev, "tach probe start\n");
+
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ priv->tacho_channel = devm_kzalloc(
+ dev, 16 * sizeof(*priv->tacho_channel), GFP_KERNEL);
+
+ priv->regmap = syscon_node_to_regmap(np);
+ if (IS_ERR(priv->regmap)) {
+ dev_err(dev, "Couldn't get regmap\n");
+ return -ENODEV;
+ }
+
+ clk = of_clk_get(np, 0);
+ if (IS_ERR(clk))
+ return -ENODEV;
+ priv->clk_freq = clk_get_rate(clk);
+
+ priv->reset = of_reset_control_get_shared(np, NULL);
+ if (IS_ERR(priv->reset)) {
+ dev_err(&pdev->dev, "can't get aspeed_pwm_tacho reset\n");
+ return PTR_ERR(priv->reset);
+ }
+
+ //scu init
+ reset_control_deassert(priv->reset);
+
+ for_each_child_of_node(dev->of_node, child) {
+ ret = aspeed_tach_create_fan(dev, child, priv);
+ if (ret) {
+ of_node_put(child);
+ return ret;
+ }
+ }
+
+ priv->groups[0] = &fan_dev_group;
+ priv->groups[1] = NULL;
+ dev_info(dev, "tach probe done\n");
+ hwmon = devm_hwmon_device_register_with_groups(dev, "aspeed_tach", priv,
+ priv->groups);
+
+ return PTR_ERR_OR_ZERO(hwmon);
+}
+
+static const struct of_device_id of_stach_match_table[] = {
+ {
+ .compatible = "aspeed,ast2600-tach",
+ },
+ {},
+};
+MODULE_DEVICE_TABLE(of, of_stach_match_table);
+
+static struct platform_driver aspeed_tach_driver = {
+ .probe = aspeed_tach_probe,
+ .driver = {
+ .name = "aspeed_tach",
+ .of_match_table = of_stach_match_table,
+ },
+};
+
+module_platform_driver(aspeed_tach_driver);
+
+MODULE_AUTHOR("Ryan Chen <ryan_chen@aspeedtech.com>");
+MODULE_DESCRIPTION("ASPEED Fan tach device driver");
+MODULE_LICENSE("GPL");
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux
2021-12-02 2:26 [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux Howard Chiu
@ 2021-12-02 3:59 ` Joel Stanley
2021-12-02 4:28 ` Howard Chiu (邱冠睿)
0 siblings, 1 reply; 7+ messages in thread
From: Joel Stanley @ 2021-12-02 3:59 UTC (permalink / raw)
To: Howard Chiu, Billy Tsai; +Cc: OpenBMC Maillist, Howard Chiu
On Thu, 2 Dec 2021 at 02:28, Howard Chiu <howard10703049@gmail.com> wrote:
>
> Aspeed did not commit tach driver to upstream for ast2600 series yet.
> To support ast26xx on OpenBMC, we need this driver and update the g6 device tree as well.
>
> Change-Id: I1714abf4fd08edead789439e5723b183d1b0d175
> Signed-off-by: Howard Chiu <howard.chiu@quantatw.com>
Thanks for the ptach.
Aspeed are working on a driver for the 2600. You can see v14 here:
https://lore.kernel.org/all/20211130055933.32708-1-billy_tsai@aspeedtech.com/
If you would like this driver to be added we can do so. As long as it
doesn't introduce new userspace ABI, we can carry the work in progress
version. I would ask that you help to update the openbmc version with
any changes Billy makes to the driver between v14 and the version that
gets accepted.
Let me know how you want to proceed.
Cheers,
Joel
> ---
> arch/arm/boot/dts/aspeed-g6.dtsi | 22 ++
> drivers/hwmon/Kconfig | 8 +
> drivers/hwmon/Makefile | 1 +
> drivers/hwmon/tach-aspeed-ast2600.c | 388 ++++++++++++++++++++++++++++
> 4 files changed, 419 insertions(+)
> create mode 100644 drivers/hwmon/tach-aspeed-ast2600.c
>
> diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
> index 5106a424f1ce..ec249f450552 100644
> --- a/arch/arm/boot/dts/aspeed-g6.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g6.dtsi
> @@ -304,6 +304,28 @@ apb {
> #size-cells = <1>;
> ranges;
>
> + pwm_tach: pwm_tach@1e610000 {
> + compatible = "aspeed,ast2600-pwm-tach", "simple-mfd", "syscon";
> + reg = <0x1e610000 0x100>;
> + clocks = <&syscon ASPEED_CLK_AHB>;
> + resets = <&syscon ASPEED_RESET_PWM>;
> +
> + pwm: pwm {
> + compatible = "aspeed,ast2600-pwm";
> + #pwm-cells = <3>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + status = "disabled";
> + };
> +
> + tach: tach {
> + compatible = "aspeed,ast2600-tach";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + status = "disabled";
> + };
> + };
> +
> syscon: syscon@1e6e2000 {
> compatible = "aspeed,ast2600-scu", "syscon", "simple-mfd";
> reg = <0x1e6e2000 0x1000>;
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index 64bd3dfba2c4..0eb307cb67fc 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -397,6 +397,14 @@ config SENSORS_ASPEED
> This driver can also be built as a module. If so, the module
> will be called aspeed_pwm_tacho.
>
> +config SENSORS_TACH_ASPEED_AST2600
> + tristate "ASPEED ast2600 Tachometer support"
> + help
> + This driver provides support for Aspeed ast2600 Tachometer.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called tach-aspeed-ast2600.
> +
> config SENSORS_ATXP1
> tristate "Attansic ATXP1 VID controller"
> depends on I2C
> diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
> index baee6a8d4dd1..ce66874c8ce2 100644
> --- a/drivers/hwmon/Makefile
> +++ b/drivers/hwmon/Makefile
> @@ -51,6 +51,7 @@ obj-$(CONFIG_SENSORS_ARM_SCMI) += scmi-hwmon.o
> obj-$(CONFIG_SENSORS_ARM_SCPI) += scpi-hwmon.o
> obj-$(CONFIG_SENSORS_AS370) += as370-hwmon.o
> obj-$(CONFIG_SENSORS_ASC7621) += asc7621.o
> +obj-$(CONFIG_SENSORS_TACH_ASPEED_AST2600) += tach-aspeed-ast2600.o
> obj-$(CONFIG_SENSORS_ASPEED) += aspeed-pwm-tacho.o
> obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
> obj-$(CONFIG_SENSORS_AXI_FAN_CONTROL) += axi-fan-control.o
> diff --git a/drivers/hwmon/tach-aspeed-ast2600.c b/drivers/hwmon/tach-aspeed-ast2600.c
> new file mode 100644
> index 000000000000..0b2551fc1711
> --- /dev/null
> +++ b/drivers/hwmon/tach-aspeed-ast2600.c
> @@ -0,0 +1,388 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (C) ASPEED Technology Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 or later as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/errno.h>
> +#include <linux/delay.h>
> +#include <linux/hwmon.h>
> +#include <linux/hwmon-sysfs.h>
> +#include <linux/io.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/of_platform.h>
> +#include <linux/of_device.h>
> +#include <linux/platform_device.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/sysfs.h>
> +#include <linux/reset.h>
> +#include <linux/regmap.h>
> +/* TACH Control Register */
> +#define ASPEED_TACHO_CTRL_CH(ch) ((ch * 0x10) + 0x08)
> +#define TACHO_IER BIT(31) //enable tacho interrupt
> +#define TACHO_INVERS_LIMIT BIT(30) //inverse tacho limit comparison
> +#define TACHO_LOOPBACK BIT(29) //tacho loopback
> +#define TACHO_ENABLE BIT(28) //{enable tacho}
> +#define TACHO_DEBOUNCE_MASK (0x3 << 26) //{tacho de-bounce}
> +#define TACHO_DEBOUNCE_BIT (26) //{tacho de-bounce}
> +#define TECHIO_EDGE_MASK (0x3 << 24) //tacho edge}
> +#define TECHIO_EDGE_BIT (24) //tacho edge}
> +#define TACHO_CLK_DIV_T_MASK (0xf << 20)
> +#define TACHO_CLK_DIV_BIT (20)
> +#define TACHO_THRESHOLD_MASK (0xfffff) //tacho threshold bit
> +/* [27:26] */
> +#define DEBOUNCE_3_CLK 0x00 /* 10b */
> +#define DEBOUNCE_2_CLK 0x01 /* 10b */
> +#define DEBOUNCE_1_CLK 0x02 /* 10b */
> +#define DEBOUNCE_0_CLK 0x03 /* 10b */
> +/* [25:24] */
> +#define F2F_EDGES 0x00 /* 10b */
> +#define R2R_EDGES 0x01 /* 10b */
> +#define BOTH_EDGES 0x02 /* 10b */
> +/* [23:20] */
> +/* Cover rpm range 5~5859375 */
> +#define DEFAULT_TACHO_DIV 5
> +
> +/* TACH Status Register */
> +#define ASPEED_TACHO_STS_CH(x) ((x * 0x10) + 0x0C)
> +
> +/*PWM_TACHO_STS */
> +#define TACHO_ISR BIT(31) //interrupt status and clear
> +#define PWM_OUT BIT(25) //{pwm_out}
> +#define PWM_OEN BIT(24) //{pwm_oeN}
> +#define TACHO_DEB_INPUT BIT(23) //tacho deB input
> +#define TACHO_RAW_INPUT BIT(22) //tacho raw input}
> +#define TACHO_VALUE_UPDATE BIT(21) //tacho value updated since the last read
> +#define TACHO_FULL_MEASUREMENT BIT(20) //{tacho full measurement}
> +#define TACHO_VALUE_MASK 0xfffff //tacho value bit [19:0]}
> +/**********************************************************
> + * Software setting
> + *********************************************************/
> +#define DEFAULT_FAN_MIN_RPM 1000
> +#define DEFAULT_FAN_PULSE_PR 2
> +/*
> + * Add this value to avoid CPU consuming a lot of resources in waiting rpm
> + * updating. Assume the max rpm of fan is 60000, the period of updating tach
> + * value will equal to (1000000 * 2 * 60) / (2 * max_rpm) = 1000.
> + */
> +#define RPM_POLLING_PERIOD_US 1000
> +
> +struct aspeed_tacho_channel_params {
> + int limited_inverse;
> + u16 threshold;
> + u8 tacho_edge;
> + u8 tacho_debounce;
> + u8 pulse_pr;
> + u32 min_rpm;
> + u32 divide;
> + u32 sample_period; /* unit is us */
> +};
> +
> +struct aspeed_tach_data {
> + struct regmap *regmap;
> + unsigned long clk_freq;
> + struct reset_control *reset;
> + bool tach_present[16];
> + struct aspeed_tacho_channel_params *tacho_channel;
> + /* for hwmon */
> + const struct attribute_group *groups[2];
> +};
> +
> +static u32 aspeed_get_fan_tach_sample_period(struct aspeed_tach_data *priv,
> + u8 fan_tach_ch)
> +{
> + u32 tach_period_us;
> + u8 pulse_pr = priv->tacho_channel[fan_tach_ch].pulse_pr;
> + u32 min_rpm = priv->tacho_channel[fan_tach_ch].min_rpm;
> + /*
> + * min(Tach input clock) = (PulsePR * minRPM) / 60
> + * max(Tach input period) = 60 / (PulsePR * minRPM)
> + * Tach sample period > 2 * max(Tach input period) = (2*60) / (PulsePR * minRPM)
> + */
> + tach_period_us = (1000000 * 2 * 60) / (pulse_pr * min_rpm);
> + /* Add the margin (about 1.2) of tach sample period to avoid sample miss */
> + tach_period_us = (tach_period_us * 1200) >> 10;
> + pr_debug("tach%d sample period = %dus", fan_tach_ch, tach_period_us);
> + return tach_period_us;
> +}
> +
> +static void aspeed_set_fan_tach_ch_enable(struct aspeed_tach_data *priv,
> + u8 fan_tach_ch, bool enable,
> + u32 tacho_div)
> +{
> + u32 reg_value = 0;
> +
> + if (enable) {
> + /* divide = 2^(tacho_div*2) */
> + priv->tacho_channel[fan_tach_ch].divide = 1 << (tacho_div << 1);
> +
> + reg_value = TACHO_ENABLE |
> + (priv->tacho_channel[fan_tach_ch].tacho_edge
> + << TECHIO_EDGE_BIT) |
> + (tacho_div << TACHO_CLK_DIV_BIT) |
> + (priv->tacho_channel[fan_tach_ch].tacho_debounce
> + << TACHO_DEBOUNCE_BIT);
> +
> + if (priv->tacho_channel[fan_tach_ch].limited_inverse)
> + reg_value |= TACHO_INVERS_LIMIT;
> +
> + if (priv->tacho_channel[fan_tach_ch].threshold)
> + reg_value |=
> + (TACHO_IER |
> + priv->tacho_channel[fan_tach_ch].threshold);
> +
> + regmap_write(priv->regmap, ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> + reg_value);
> +
> + priv->tacho_channel[fan_tach_ch].sample_period =
> + aspeed_get_fan_tach_sample_period(priv, fan_tach_ch);
> + } else
> + regmap_update_bits(priv->regmap,
> + ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> + TACHO_ENABLE, 0);
> +}
> +
> +static int aspeed_get_fan_tach_ch_rpm(struct aspeed_tach_data *priv,
> + u8 fan_tach_ch)
> +{
> + u32 raw_data, tach_div, clk_source, usec, val;
> + u64 rpm;
> + int ret;
> +
> + usec = priv->tacho_channel[fan_tach_ch].sample_period;
> + /* Restart the Tach channel to guarantee the value is fresh */
> + regmap_update_bits(priv->regmap, ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> + TACHO_ENABLE, 0);
> + regmap_update_bits(priv->regmap, ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> + TACHO_ENABLE, TACHO_ENABLE);
> + ret = regmap_read_poll_timeout(
> + priv->regmap, ASPEED_TACHO_STS_CH(fan_tach_ch), val,
> + (val & TACHO_FULL_MEASUREMENT) && (val & TACHO_VALUE_UPDATE),
> + RPM_POLLING_PERIOD_US, usec);
> +
> + if (ret) {
> + /* return 0 if we didn't get an answer because of timeout*/
> + if (ret == -ETIMEDOUT)
> + return 0;
> + else
> + return ret;
> + }
> +
> + raw_data = val & TACHO_VALUE_MASK;
> + /*
> + * We need the mode to determine if the raw_data is double (from
> + * counting both edges).
> + */
> + if (priv->tacho_channel[fan_tach_ch].tacho_edge == BOTH_EDGES)
> + raw_data <<= 1;
> +
> + tach_div = raw_data * (priv->tacho_channel[fan_tach_ch].divide) *
> + (priv->tacho_channel[fan_tach_ch].pulse_pr);
> +
> + pr_debug("clk %ld, raw_data %d , tach_div %d\n", priv->clk_freq, raw_data, tach_div);
> +
> + clk_source = priv->clk_freq;
> +
> + if (tach_div == 0)
> + return -EDOM;
> +
> + rpm = (u64)clk_source * 60;
> + do_div(rpm, tach_div);
> +
> + return rpm;
> +}
> +
> +static ssize_t show_rpm(struct device *dev, struct device_attribute *attr,
> + char *buf)
> +{
> + struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
> + int index = sensor_attr->index;
> + int rpm;
> + struct aspeed_tach_data *priv = dev_get_drvdata(dev);
> +
> + rpm = aspeed_get_fan_tach_ch_rpm(priv, index);
> + if (rpm < 0)
> + return rpm;
> +
> + return sprintf(buf, "%d\n", rpm);
> +}
> +
> +static umode_t fan_dev_is_visible(struct kobject *kobj, struct attribute *a,
> + int index)
> +{
> + struct device *dev = container_of(kobj, struct device, kobj);
> + struct aspeed_tach_data *priv = dev_get_drvdata(dev);
> +
> + if (!priv->tach_present[index])
> + return 0;
> + return a->mode;
> +}
> +
> +static SENSOR_DEVICE_ATTR(fan1_input, 0444, show_rpm, NULL, 0);
> +static SENSOR_DEVICE_ATTR(fan2_input, 0444, show_rpm, NULL, 1);
> +static SENSOR_DEVICE_ATTR(fan3_input, 0444, show_rpm, NULL, 2);
> +static SENSOR_DEVICE_ATTR(fan4_input, 0444, show_rpm, NULL, 3);
> +static SENSOR_DEVICE_ATTR(fan5_input, 0444, show_rpm, NULL, 4);
> +static SENSOR_DEVICE_ATTR(fan6_input, 0444, show_rpm, NULL, 5);
> +static SENSOR_DEVICE_ATTR(fan7_input, 0444, show_rpm, NULL, 6);
> +static SENSOR_DEVICE_ATTR(fan8_input, 0444, show_rpm, NULL, 7);
> +static SENSOR_DEVICE_ATTR(fan9_input, 0444, show_rpm, NULL, 8);
> +static SENSOR_DEVICE_ATTR(fan10_input, 0444, show_rpm, NULL, 9);
> +static SENSOR_DEVICE_ATTR(fan11_input, 0444, show_rpm, NULL, 10);
> +static SENSOR_DEVICE_ATTR(fan12_input, 0444, show_rpm, NULL, 11);
> +static SENSOR_DEVICE_ATTR(fan13_input, 0444, show_rpm, NULL, 12);
> +static SENSOR_DEVICE_ATTR(fan14_input, 0444, show_rpm, NULL, 13);
> +static SENSOR_DEVICE_ATTR(fan15_input, 0444, show_rpm, NULL, 14);
> +static SENSOR_DEVICE_ATTR(fan16_input, 0444, show_rpm, NULL, 15);
> +static struct attribute *fan_dev_attrs[] = {
> + &sensor_dev_attr_fan1_input.dev_attr.attr,
> + &sensor_dev_attr_fan2_input.dev_attr.attr,
> + &sensor_dev_attr_fan3_input.dev_attr.attr,
> + &sensor_dev_attr_fan4_input.dev_attr.attr,
> + &sensor_dev_attr_fan5_input.dev_attr.attr,
> + &sensor_dev_attr_fan6_input.dev_attr.attr,
> + &sensor_dev_attr_fan7_input.dev_attr.attr,
> + &sensor_dev_attr_fan8_input.dev_attr.attr,
> + &sensor_dev_attr_fan9_input.dev_attr.attr,
> + &sensor_dev_attr_fan10_input.dev_attr.attr,
> + &sensor_dev_attr_fan11_input.dev_attr.attr,
> + &sensor_dev_attr_fan12_input.dev_attr.attr,
> + &sensor_dev_attr_fan13_input.dev_attr.attr,
> + &sensor_dev_attr_fan14_input.dev_attr.attr,
> + &sensor_dev_attr_fan15_input.dev_attr.attr,
> + &sensor_dev_attr_fan16_input.dev_attr.attr,
> + NULL
> +};
> +
> +static const struct attribute_group fan_dev_group = {
> + .attrs = fan_dev_attrs,
> + .is_visible = fan_dev_is_visible,
> +};
> +
> +static void aspeed_create_fan_tach_channel(struct aspeed_tach_data *priv,
> + u32 tach_ch, int count,
> + u32 fan_pulse_pr, u32 fan_min_rpm,
> + u32 tacho_div)
> +{
> + priv->tach_present[tach_ch] = true;
> + priv->tacho_channel[tach_ch].pulse_pr = fan_pulse_pr;
> + priv->tacho_channel[tach_ch].min_rpm = fan_min_rpm;
> + priv->tacho_channel[tach_ch].limited_inverse = 0;
> + priv->tacho_channel[tach_ch].threshold = 0;
> + priv->tacho_channel[tach_ch].tacho_edge = F2F_EDGES;
> + priv->tacho_channel[tach_ch].tacho_debounce = DEBOUNCE_3_CLK;
> + aspeed_set_fan_tach_ch_enable(priv, tach_ch, true, tacho_div);
> +}
> +
> +static int aspeed_tach_create_fan(struct device *dev, struct device_node *child,
> + struct aspeed_tach_data *priv)
> +{
> + u32 fan_pulse_pr, fan_min_rpm;
> + u32 tacho_div;
> + u32 tach_channel;
> + int ret, count;
> +
> + ret = of_property_read_u32(child, "reg", &tach_channel);
> + if (ret)
> + return ret;
> +
> + ret = of_property_read_u32(child, "aspeed,pulse-pr", &fan_pulse_pr);
> + if (ret)
> + fan_pulse_pr = DEFAULT_FAN_PULSE_PR;
> +
> + ret = of_property_read_u32(child, "aspeed,min-rpm", &fan_min_rpm);
> + if (ret)
> + fan_min_rpm = DEFAULT_FAN_MIN_RPM;
> +
> + ret = of_property_read_u32(child, "aspeed,tach-div", &tacho_div);
> + if (ret)
> + tacho_div = DEFAULT_TACHO_DIV;
> +
> + aspeed_create_fan_tach_channel(priv, tach_channel, count, fan_pulse_pr,
> + fan_min_rpm, tacho_div);
> +
> + return 0;
> +}
> +
> +static int aspeed_tach_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct device_node *np, *child;
> + struct aspeed_tach_data *priv;
> + struct device *hwmon;
> + struct clk *clk;
> + int ret;
> +
> + np = dev->parent->of_node;
> + dev_info(dev, "tach probe start\n");
> +
> + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> +
> + priv->tacho_channel = devm_kzalloc(
> + dev, 16 * sizeof(*priv->tacho_channel), GFP_KERNEL);
> +
> + priv->regmap = syscon_node_to_regmap(np);
> + if (IS_ERR(priv->regmap)) {
> + dev_err(dev, "Couldn't get regmap\n");
> + return -ENODEV;
> + }
> +
> + clk = of_clk_get(np, 0);
> + if (IS_ERR(clk))
> + return -ENODEV;
> + priv->clk_freq = clk_get_rate(clk);
> +
> + priv->reset = of_reset_control_get_shared(np, NULL);
> + if (IS_ERR(priv->reset)) {
> + dev_err(&pdev->dev, "can't get aspeed_pwm_tacho reset\n");
> + return PTR_ERR(priv->reset);
> + }
> +
> + //scu init
> + reset_control_deassert(priv->reset);
> +
> + for_each_child_of_node(dev->of_node, child) {
> + ret = aspeed_tach_create_fan(dev, child, priv);
> + if (ret) {
> + of_node_put(child);
> + return ret;
> + }
> + }
> +
> + priv->groups[0] = &fan_dev_group;
> + priv->groups[1] = NULL;
> + dev_info(dev, "tach probe done\n");
> + hwmon = devm_hwmon_device_register_with_groups(dev, "aspeed_tach", priv,
> + priv->groups);
> +
> + return PTR_ERR_OR_ZERO(hwmon);
> +}
> +
> +static const struct of_device_id of_stach_match_table[] = {
> + {
> + .compatible = "aspeed,ast2600-tach",
> + },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, of_stach_match_table);
> +
> +static struct platform_driver aspeed_tach_driver = {
> + .probe = aspeed_tach_probe,
> + .driver = {
> + .name = "aspeed_tach",
> + .of_match_table = of_stach_match_table,
> + },
> +};
> +
> +module_platform_driver(aspeed_tach_driver);
> +
> +MODULE_AUTHOR("Ryan Chen <ryan_chen@aspeedtech.com>");
> +MODULE_DESCRIPTION("ASPEED Fan tach device driver");
> +MODULE_LICENSE("GPL");
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux
2021-12-02 3:59 ` Joel Stanley
@ 2021-12-02 4:28 ` Howard Chiu (邱冠睿)
2021-12-02 4:32 ` Joel Stanley
0 siblings, 1 reply; 7+ messages in thread
From: Howard Chiu (邱冠睿) @ 2021-12-02 4:28 UTC (permalink / raw)
To: Joel Stanley, Howard Chiu, Billy Tsai
Cc: OpenBMC Maillist, Potin Lai (賴柏廷)
Hi Joel
Yes, this patch is v14 I just downloaded from patchwork and tested it with Facebook Bletchley platform.
I am not sure if there would be further revision of this driver, but my platform needs ast26xx PWM/Tach driver.
I will sync this driver with Billy's work.
If I am not available, Potin Lai will take over this task.
Howard
> -----Original Message-----
> From: Joel Stanley <joel@jms.id.au>
> Sent: Thursday, December 2, 2021 12:00 PM
> To: Howard Chiu <howard10703049@gmail.com>; Billy Tsai
> <billy_tsai@aspeedtech.com>
> Cc: OpenBMC Maillist <openbmc@lists.ozlabs.org>; Howard Chiu (邱冠睿)
> <Howard.Chiu@quantatw.com>
> Subject: Re: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed
> linux
>
> On Thu, 2 Dec 2021 at 02:28, Howard Chiu <howard10703049@gmail.com>
> wrote:
> >
> > Aspeed did not commit tach driver to upstream for ast2600 series yet.
> > To support ast26xx on OpenBMC, we need this driver and update the g6
> device tree as well.
> >
> > Change-Id: I1714abf4fd08edead789439e5723b183d1b0d175
> > Signed-off-by: Howard Chiu <howard.chiu@quantatw.com>
>
> Thanks for the ptach.
>
> Aspeed are working on a driver for the 2600. You can see v14 here:
>
>
> https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.ker
> nel.org%2Fall%2F20211130055933.32708-1-billy_tsai%40aspeedtech.com%2F
> &data=04%7C01%7Choward.chiu%40quantatw.com%7C7b8f545f7b514ac
> beb1608d9b5483bcc%7C179b032707fc4973ac738de7313561b2%7C1%7C0%7
> C637740144119019839%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAw
> MDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdat
> a=h6kuSxA7q7FUXorYyqPqYFnvcWq9DJRkm1CycyhdYFY%3D&reserved=0
>
> If you would like this driver to be added we can do so. As long as it
> doesn't introduce new userspace ABI, we can carry the work in progress
> version. I would ask that you help to update the openbmc version with
> any changes Billy makes to the driver between v14 and the version that
> gets accepted.
>
> Let me know how you want to proceed.
>
> Cheers,
>
> Joel
>
> > ---
> > arch/arm/boot/dts/aspeed-g6.dtsi | 22 ++
> > drivers/hwmon/Kconfig | 8 +
> > drivers/hwmon/Makefile | 1 +
> > drivers/hwmon/tach-aspeed-ast2600.c | 388
> ++++++++++++++++++++++++++++
> > 4 files changed, 419 insertions(+)
> > create mode 100644 drivers/hwmon/tach-aspeed-ast2600.c
> >
> > diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi
> b/arch/arm/boot/dts/aspeed-g6.dtsi
> > index 5106a424f1ce..ec249f450552 100644
> > --- a/arch/arm/boot/dts/aspeed-g6.dtsi
> > +++ b/arch/arm/boot/dts/aspeed-g6.dtsi
> > @@ -304,6 +304,28 @@ apb {
> > #size-cells = <1>;
> > ranges;
> >
> > + pwm_tach: pwm_tach@1e610000 {
> > + compatible =
> "aspeed,ast2600-pwm-tach", "simple-mfd", "syscon";
> > + reg = <0x1e610000 0x100>;
> > + clocks = <&syscon
> ASPEED_CLK_AHB>;
> > + resets = <&syscon
> ASPEED_RESET_PWM>;
> > +
> > + pwm: pwm {
> > + compatible =
> "aspeed,ast2600-pwm";
> > + #pwm-cells = <3>;
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + status = "disabled";
> > + };
> > +
> > + tach: tach {
> > + compatible =
> "aspeed,ast2600-tach";
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + status = "disabled";
> > + };
> > + };
> > +
> > syscon: syscon@1e6e2000 {
> > compatible = "aspeed,ast2600-scu",
> "syscon", "simple-mfd";
> > reg = <0x1e6e2000 0x1000>;
> > diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> > index 64bd3dfba2c4..0eb307cb67fc 100644
> > --- a/drivers/hwmon/Kconfig
> > +++ b/drivers/hwmon/Kconfig
> > @@ -397,6 +397,14 @@ config SENSORS_ASPEED
> > This driver can also be built as a module. If so, the module
> > will be called aspeed_pwm_tacho.
> >
> > +config SENSORS_TACH_ASPEED_AST2600
> > + tristate "ASPEED ast2600 Tachometer support"
> > + help
> > + This driver provides support for Aspeed ast2600 Tachometer.
> > +
> > + To compile this driver as a module, choose M here: the module
> > + will be called tach-aspeed-ast2600.
> > +
> > config SENSORS_ATXP1
> > tristate "Attansic ATXP1 VID controller"
> > depends on I2C
> > diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
> > index baee6a8d4dd1..ce66874c8ce2 100644
> > --- a/drivers/hwmon/Makefile
> > +++ b/drivers/hwmon/Makefile
> > @@ -51,6 +51,7 @@ obj-$(CONFIG_SENSORS_ARM_SCMI) +=
> scmi-hwmon.o
> > obj-$(CONFIG_SENSORS_ARM_SCPI) += scpi-hwmon.o
> > obj-$(CONFIG_SENSORS_AS370) += as370-hwmon.o
> > obj-$(CONFIG_SENSORS_ASC7621) += asc7621.o
> > +obj-$(CONFIG_SENSORS_TACH_ASPEED_AST2600) +=
> tach-aspeed-ast2600.o
> > obj-$(CONFIG_SENSORS_ASPEED) += aspeed-pwm-tacho.o
> > obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
> > obj-$(CONFIG_SENSORS_AXI_FAN_CONTROL) += axi-fan-control.o
> > diff --git a/drivers/hwmon/tach-aspeed-ast2600.c
> b/drivers/hwmon/tach-aspeed-ast2600.c
> > new file mode 100644
> > index 000000000000..0b2551fc1711
> > --- /dev/null
> > +++ b/drivers/hwmon/tach-aspeed-ast2600.c
> > @@ -0,0 +1,388 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +/*
> > + * Copyright (C) ASPEED Technology Inc.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 or later as
> > + * published by the Free Software Foundation.
> > + */
> > +
> > +#include <linux/clk.h>
> > +#include <linux/errno.h>
> > +#include <linux/delay.h>
> > +#include <linux/hwmon.h>
> > +#include <linux/hwmon-sysfs.h>
> > +#include <linux/io.h>
> > +#include <linux/kernel.h>
> > +#include <linux/module.h>
> > +#include <linux/of_platform.h>
> > +#include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/sysfs.h>
> > +#include <linux/reset.h>
> > +#include <linux/regmap.h>
> > +/* TACH Control Register */
> > +#define ASPEED_TACHO_CTRL_CH(ch) ((ch * 0x10) + 0x08)
> > +#define TACHO_IER BIT(31) //enable tacho interrupt
> > +#define TACHO_INVERS_LIMIT BIT(30) //inverse tacho limit comparison
> > +#define TACHO_LOOPBACK BIT(29) //tacho loopback
> > +#define TACHO_ENABLE BIT(28) //{enable tacho}
> > +#define TACHO_DEBOUNCE_MASK (0x3 << 26) //{tacho de-bounce}
> > +#define TACHO_DEBOUNCE_BIT (26) //{tacho de-bounce}
> > +#define TECHIO_EDGE_MASK (0x3 << 24) //tacho edge}
> > +#define TECHIO_EDGE_BIT (24) //tacho edge}
> > +#define TACHO_CLK_DIV_T_MASK (0xf << 20)
> > +#define TACHO_CLK_DIV_BIT (20)
> > +#define TACHO_THRESHOLD_MASK (0xfffff) //tacho threshold bit
> > +/* [27:26] */
> > +#define DEBOUNCE_3_CLK 0x00 /* 10b */
> > +#define DEBOUNCE_2_CLK 0x01 /* 10b */
> > +#define DEBOUNCE_1_CLK 0x02 /* 10b */
> > +#define DEBOUNCE_0_CLK 0x03 /* 10b */
> > +/* [25:24] */
> > +#define F2F_EDGES 0x00 /* 10b */
> > +#define R2R_EDGES 0x01 /* 10b */
> > +#define BOTH_EDGES 0x02 /* 10b */
> > +/* [23:20] */
> > +/* Cover rpm range 5~5859375 */
> > +#define DEFAULT_TACHO_DIV 5
> > +
> > +/* TACH Status Register */
> > +#define ASPEED_TACHO_STS_CH(x) ((x * 0x10) + 0x0C)
> > +
> > +/*PWM_TACHO_STS */
> > +#define TACHO_ISR BIT(31) //interrupt status and clear
> > +#define PWM_OUT BIT(25) //{pwm_out}
> > +#define PWM_OEN BIT(24) //{pwm_oeN}
> > +#define TACHO_DEB_INPUT BIT(23) //tacho deB input
> > +#define TACHO_RAW_INPUT BIT(22) //tacho raw input}
> > +#define TACHO_VALUE_UPDATE BIT(21) //tacho value updated since the
> last read
> > +#define TACHO_FULL_MEASUREMENT BIT(20) //{tacho full measurement}
> > +#define TACHO_VALUE_MASK 0xfffff //tacho value bit [19:0]}
> > +/**********************************************************
> > + * Software setting
> > + *********************************************************/
> > +#define DEFAULT_FAN_MIN_RPM 1000
> > +#define DEFAULT_FAN_PULSE_PR 2
> > +/*
> > + * Add this value to avoid CPU consuming a lot of resources in waiting rpm
> > + * updating. Assume the max rpm of fan is 60000, the period of updating
> tach
> > + * value will equal to (1000000 * 2 * 60) / (2 * max_rpm) = 1000.
> > + */
> > +#define RPM_POLLING_PERIOD_US 1000
> > +
> > +struct aspeed_tacho_channel_params {
> > + int limited_inverse;
> > + u16 threshold;
> > + u8 tacho_edge;
> > + u8 tacho_debounce;
> > + u8 pulse_pr;
> > + u32 min_rpm;
> > + u32 divide;
> > + u32 sample_period; /* unit is us */
> > +};
> > +
> > +struct aspeed_tach_data {
> > + struct regmap *regmap;
> > + unsigned long clk_freq;
> > + struct reset_control *reset;
> > + bool tach_present[16];
> > + struct aspeed_tacho_channel_params *tacho_channel;
> > + /* for hwmon */
> > + const struct attribute_group *groups[2];
> > +};
> > +
> > +static u32 aspeed_get_fan_tach_sample_period(struct aspeed_tach_data
> *priv,
> > + u8 fan_tach_ch)
> > +{
> > + u32 tach_period_us;
> > + u8 pulse_pr = priv->tacho_channel[fan_tach_ch].pulse_pr;
> > + u32 min_rpm = priv->tacho_channel[fan_tach_ch].min_rpm;
> > + /*
> > + * min(Tach input clock) = (PulsePR * minRPM) / 60
> > + * max(Tach input period) = 60 / (PulsePR * minRPM)
> > + * Tach sample period > 2 * max(Tach input period) = (2*60) /
> (PulsePR * minRPM)
> > + */
> > + tach_period_us = (1000000 * 2 * 60) / (pulse_pr * min_rpm);
> > + /* Add the margin (about 1.2) of tach sample period to avoid
> sample miss */
> > + tach_period_us = (tach_period_us * 1200) >> 10;
> > + pr_debug("tach%d sample period = %dus", fan_tach_ch,
> tach_period_us);
> > + return tach_period_us;
> > +}
> > +
> > +static void aspeed_set_fan_tach_ch_enable(struct aspeed_tach_data *priv,
> > + u8 fan_tach_ch, bool
> enable,
> > + u32 tacho_div)
> > +{
> > + u32 reg_value = 0;
> > +
> > + if (enable) {
> > + /* divide = 2^(tacho_div*2) */
> > + priv->tacho_channel[fan_tach_ch].divide = 1 <<
> (tacho_div << 1);
> > +
> > + reg_value = TACHO_ENABLE |
> > +
> (priv->tacho_channel[fan_tach_ch].tacho_edge
> > + << TECHIO_EDGE_BIT) |
> > + (tacho_div << TACHO_CLK_DIV_BIT) |
> > +
> (priv->tacho_channel[fan_tach_ch].tacho_debounce
> > + << TACHO_DEBOUNCE_BIT);
> > +
> > + if (priv->tacho_channel[fan_tach_ch].limited_inverse)
> > + reg_value |= TACHO_INVERS_LIMIT;
> > +
> > + if (priv->tacho_channel[fan_tach_ch].threshold)
> > + reg_value |=
> > + (TACHO_IER |
> > +
> priv->tacho_channel[fan_tach_ch].threshold);
> > +
> > + regmap_write(priv->regmap,
> ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> > + reg_value);
> > +
> > + priv->tacho_channel[fan_tach_ch].sample_period =
> > + aspeed_get_fan_tach_sample_period(priv,
> fan_tach_ch);
> > + } else
> > + regmap_update_bits(priv->regmap,
> > +
> ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> > + TACHO_ENABLE, 0);
> > +}
> > +
> > +static int aspeed_get_fan_tach_ch_rpm(struct aspeed_tach_data *priv,
> > + u8 fan_tach_ch)
> > +{
> > + u32 raw_data, tach_div, clk_source, usec, val;
> > + u64 rpm;
> > + int ret;
> > +
> > + usec = priv->tacho_channel[fan_tach_ch].sample_period;
> > + /* Restart the Tach channel to guarantee the value is fresh */
> > + regmap_update_bits(priv->regmap,
> ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> > + TACHO_ENABLE, 0);
> > + regmap_update_bits(priv->regmap,
> ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> > + TACHO_ENABLE, TACHO_ENABLE);
> > + ret = regmap_read_poll_timeout(
> > + priv->regmap, ASPEED_TACHO_STS_CH(fan_tach_ch),
> val,
> > + (val & TACHO_FULL_MEASUREMENT) && (val &
> TACHO_VALUE_UPDATE),
> > + RPM_POLLING_PERIOD_US, usec);
> > +
> > + if (ret) {
> > + /* return 0 if we didn't get an answer because of
> timeout*/
> > + if (ret == -ETIMEDOUT)
> > + return 0;
> > + else
> > + return ret;
> > + }
> > +
> > + raw_data = val & TACHO_VALUE_MASK;
> > + /*
> > + * We need the mode to determine if the raw_data is double
> (from
> > + * counting both edges).
> > + */
> > + if (priv->tacho_channel[fan_tach_ch].tacho_edge == BOTH_EDGES)
> > + raw_data <<= 1;
> > +
> > + tach_div = raw_data * (priv->tacho_channel[fan_tach_ch].divide) *
> > + (priv->tacho_channel[fan_tach_ch].pulse_pr);
> > +
> > + pr_debug("clk %ld, raw_data %d , tach_div %d\n", priv->clk_freq,
> raw_data, tach_div);
> > +
> > + clk_source = priv->clk_freq;
> > +
> > + if (tach_div == 0)
> > + return -EDOM;
> > +
> > + rpm = (u64)clk_source * 60;
> > + do_div(rpm, tach_div);
> > +
> > + return rpm;
> > +}
> > +
> > +static ssize_t show_rpm(struct device *dev, struct device_attribute *attr,
> > + char *buf)
> > +{
> > + struct sensor_device_attribute *sensor_attr =
> to_sensor_dev_attr(attr);
> > + int index = sensor_attr->index;
> > + int rpm;
> > + struct aspeed_tach_data *priv = dev_get_drvdata(dev);
> > +
> > + rpm = aspeed_get_fan_tach_ch_rpm(priv, index);
> > + if (rpm < 0)
> > + return rpm;
> > +
> > + return sprintf(buf, "%d\n", rpm);
> > +}
> > +
> > +static umode_t fan_dev_is_visible(struct kobject *kobj, struct attribute *a,
> > + int index)
> > +{
> > + struct device *dev = container_of(kobj, struct device, kobj);
> > + struct aspeed_tach_data *priv = dev_get_drvdata(dev);
> > +
> > + if (!priv->tach_present[index])
> > + return 0;
> > + return a->mode;
> > +}
> > +
> > +static SENSOR_DEVICE_ATTR(fan1_input, 0444, show_rpm, NULL, 0);
> > +static SENSOR_DEVICE_ATTR(fan2_input, 0444, show_rpm, NULL, 1);
> > +static SENSOR_DEVICE_ATTR(fan3_input, 0444, show_rpm, NULL, 2);
> > +static SENSOR_DEVICE_ATTR(fan4_input, 0444, show_rpm, NULL, 3);
> > +static SENSOR_DEVICE_ATTR(fan5_input, 0444, show_rpm, NULL, 4);
> > +static SENSOR_DEVICE_ATTR(fan6_input, 0444, show_rpm, NULL, 5);
> > +static SENSOR_DEVICE_ATTR(fan7_input, 0444, show_rpm, NULL, 6);
> > +static SENSOR_DEVICE_ATTR(fan8_input, 0444, show_rpm, NULL, 7);
> > +static SENSOR_DEVICE_ATTR(fan9_input, 0444, show_rpm, NULL, 8);
> > +static SENSOR_DEVICE_ATTR(fan10_input, 0444, show_rpm, NULL, 9);
> > +static SENSOR_DEVICE_ATTR(fan11_input, 0444, show_rpm, NULL, 10);
> > +static SENSOR_DEVICE_ATTR(fan12_input, 0444, show_rpm, NULL, 11);
> > +static SENSOR_DEVICE_ATTR(fan13_input, 0444, show_rpm, NULL, 12);
> > +static SENSOR_DEVICE_ATTR(fan14_input, 0444, show_rpm, NULL, 13);
> > +static SENSOR_DEVICE_ATTR(fan15_input, 0444, show_rpm, NULL, 14);
> > +static SENSOR_DEVICE_ATTR(fan16_input, 0444, show_rpm, NULL, 15);
> > +static struct attribute *fan_dev_attrs[] = {
> > + &sensor_dev_attr_fan1_input.dev_attr.attr,
> > + &sensor_dev_attr_fan2_input.dev_attr.attr,
> > + &sensor_dev_attr_fan3_input.dev_attr.attr,
> > + &sensor_dev_attr_fan4_input.dev_attr.attr,
> > + &sensor_dev_attr_fan5_input.dev_attr.attr,
> > + &sensor_dev_attr_fan6_input.dev_attr.attr,
> > + &sensor_dev_attr_fan7_input.dev_attr.attr,
> > + &sensor_dev_attr_fan8_input.dev_attr.attr,
> > + &sensor_dev_attr_fan9_input.dev_attr.attr,
> > + &sensor_dev_attr_fan10_input.dev_attr.attr,
> > + &sensor_dev_attr_fan11_input.dev_attr.attr,
> > + &sensor_dev_attr_fan12_input.dev_attr.attr,
> > + &sensor_dev_attr_fan13_input.dev_attr.attr,
> > + &sensor_dev_attr_fan14_input.dev_attr.attr,
> > + &sensor_dev_attr_fan15_input.dev_attr.attr,
> > + &sensor_dev_attr_fan16_input.dev_attr.attr,
> > + NULL
> > +};
> > +
> > +static const struct attribute_group fan_dev_group = {
> > + .attrs = fan_dev_attrs,
> > + .is_visible = fan_dev_is_visible,
> > +};
> > +
> > +static void aspeed_create_fan_tach_channel(struct aspeed_tach_data *priv,
> > + u32 tach_ch, int count,
> > + u32 fan_pulse_pr, u32
> fan_min_rpm,
> > + u32 tacho_div)
> > +{
> > + priv->tach_present[tach_ch] = true;
> > + priv->tacho_channel[tach_ch].pulse_pr = fan_pulse_pr;
> > + priv->tacho_channel[tach_ch].min_rpm = fan_min_rpm;
> > + priv->tacho_channel[tach_ch].limited_inverse = 0;
> > + priv->tacho_channel[tach_ch].threshold = 0;
> > + priv->tacho_channel[tach_ch].tacho_edge = F2F_EDGES;
> > + priv->tacho_channel[tach_ch].tacho_debounce =
> DEBOUNCE_3_CLK;
> > + aspeed_set_fan_tach_ch_enable(priv, tach_ch, true, tacho_div);
> > +}
> > +
> > +static int aspeed_tach_create_fan(struct device *dev, struct device_node
> *child,
> > + struct aspeed_tach_data *priv)
> > +{
> > + u32 fan_pulse_pr, fan_min_rpm;
> > + u32 tacho_div;
> > + u32 tach_channel;
> > + int ret, count;
> > +
> > + ret = of_property_read_u32(child, "reg", &tach_channel);
> > + if (ret)
> > + return ret;
> > +
> > + ret = of_property_read_u32(child, "aspeed,pulse-pr",
> &fan_pulse_pr);
> > + if (ret)
> > + fan_pulse_pr = DEFAULT_FAN_PULSE_PR;
> > +
> > + ret = of_property_read_u32(child, "aspeed,min-rpm",
> &fan_min_rpm);
> > + if (ret)
> > + fan_min_rpm = DEFAULT_FAN_MIN_RPM;
> > +
> > + ret = of_property_read_u32(child, "aspeed,tach-div", &tacho_div);
> > + if (ret)
> > + tacho_div = DEFAULT_TACHO_DIV;
> > +
> > + aspeed_create_fan_tach_channel(priv, tach_channel, count,
> fan_pulse_pr,
> > + fan_min_rpm, tacho_div);
> > +
> > + return 0;
> > +}
> > +
> > +static int aspeed_tach_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct device_node *np, *child;
> > + struct aspeed_tach_data *priv;
> > + struct device *hwmon;
> > + struct clk *clk;
> > + int ret;
> > +
> > + np = dev->parent->of_node;
> > + dev_info(dev, "tach probe start\n");
> > +
> > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> > + if (!priv)
> > + return -ENOMEM;
> > +
> > + priv->tacho_channel = devm_kzalloc(
> > + dev, 16 * sizeof(*priv->tacho_channel), GFP_KERNEL);
> > +
> > + priv->regmap = syscon_node_to_regmap(np);
> > + if (IS_ERR(priv->regmap)) {
> > + dev_err(dev, "Couldn't get regmap\n");
> > + return -ENODEV;
> > + }
> > +
> > + clk = of_clk_get(np, 0);
> > + if (IS_ERR(clk))
> > + return -ENODEV;
> > + priv->clk_freq = clk_get_rate(clk);
> > +
> > + priv->reset = of_reset_control_get_shared(np, NULL);
> > + if (IS_ERR(priv->reset)) {
> > + dev_err(&pdev->dev, "can't get aspeed_pwm_tacho
> reset\n");
> > + return PTR_ERR(priv->reset);
> > + }
> > +
> > + //scu init
> > + reset_control_deassert(priv->reset);
> > +
> > + for_each_child_of_node(dev->of_node, child) {
> > + ret = aspeed_tach_create_fan(dev, child, priv);
> > + if (ret) {
> > + of_node_put(child);
> > + return ret;
> > + }
> > + }
> > +
> > + priv->groups[0] = &fan_dev_group;
> > + priv->groups[1] = NULL;
> > + dev_info(dev, "tach probe done\n");
> > + hwmon = devm_hwmon_device_register_with_groups(dev,
> "aspeed_tach", priv,
> > +
> priv->groups);
> > +
> > + return PTR_ERR_OR_ZERO(hwmon);
> > +}
> > +
> > +static const struct of_device_id of_stach_match_table[] = {
> > + {
> > + .compatible = "aspeed,ast2600-tach",
> > + },
> > + {},
> > +};
> > +MODULE_DEVICE_TABLE(of, of_stach_match_table);
> > +
> > +static struct platform_driver aspeed_tach_driver = {
> > + .probe = aspeed_tach_probe,
> > + .driver = {
> > + .name = "aspeed_tach",
> > + .of_match_table = of_stach_match_table,
> > + },
> > +};
> > +
> > +module_platform_driver(aspeed_tach_driver);
> > +
> > +MODULE_AUTHOR("Ryan Chen <ryan_chen@aspeedtech.com>");
> > +MODULE_DESCRIPTION("ASPEED Fan tach device driver");
> > +MODULE_LICENSE("GPL");
> > --
> > 2.25.1
> >
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux
2021-12-02 4:28 ` Howard Chiu (邱冠睿)
@ 2021-12-02 4:32 ` Joel Stanley
2021-12-02 4:58 ` Billy Tsai
0 siblings, 1 reply; 7+ messages in thread
From: Joel Stanley @ 2021-12-02 4:32 UTC (permalink / raw)
To: Howard Chiu (邱冠睿)
Cc: Howard Chiu, Billy Tsai, OpenBMC Maillist,
Potin Lai (賴柏廷)
On Thu, 2 Dec 2021 at 04:29, Howard Chiu (邱冠睿) <Howard.Chiu@quantatw.com> wrote:
>
> Hi Joel
>
> Yes, this patch is v14 I just downloaded from patchwork and tested it with Facebook Bletchley platform.
> I am not sure if there would be further revision of this driver, but my platform needs ast26xx PWM/Tach driver.
> I will sync this driver with Billy's work.
Thanks for the explanation. In the future, it would pay to reference
the work you've based your patch on, and keep the ownership
information in the patch.
Billy, are you happy with us putting v14 into the openbmc tree?
> If I am not available, Potin Lai will take over this task.
That's great, thank you both.
Once we have heard from Billy I'll grab the patches from the mailing
list and apply them to dev-5.15.
>
> Howard
>
> > -----Original Message-----
> > From: Joel Stanley <joel@jms.id.au>
> > Sent: Thursday, December 2, 2021 12:00 PM
> > To: Howard Chiu <howard10703049@gmail.com>; Billy Tsai
> > <billy_tsai@aspeedtech.com>
> > Cc: OpenBMC Maillist <openbmc@lists.ozlabs.org>; Howard Chiu (邱冠睿)
> > <Howard.Chiu@quantatw.com>
> > Subject: Re: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed
> > linux
> >
> > On Thu, 2 Dec 2021 at 02:28, Howard Chiu <howard10703049@gmail.com>
> > wrote:
> > >
> > > Aspeed did not commit tach driver to upstream for ast2600 series yet.
> > > To support ast26xx on OpenBMC, we need this driver and update the g6
> > device tree as well.
> > >
> > > Change-Id: I1714abf4fd08edead789439e5723b183d1b0d175
> > > Signed-off-by: Howard Chiu <howard.chiu@quantatw.com>
> >
> > Thanks for the ptach.
> >
> > Aspeed are working on a driver for the 2600. You can see v14 here:
> >
> >
> > https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.ker
> > nel.org%2Fall%2F20211130055933.32708-1-billy_tsai%40aspeedtech.com%2F
> > &data=04%7C01%7Choward.chiu%40quantatw.com%7C7b8f545f7b514ac
> > beb1608d9b5483bcc%7C179b032707fc4973ac738de7313561b2%7C1%7C0%7
> > C637740144119019839%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAw
> > MDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdat
> > a=h6kuSxA7q7FUXorYyqPqYFnvcWq9DJRkm1CycyhdYFY%3D&reserved=0
> >
> > If you would like this driver to be added we can do so. As long as it
> > doesn't introduce new userspace ABI, we can carry the work in progress
> > version. I would ask that you help to update the openbmc version with
> > any changes Billy makes to the driver between v14 and the version that
> > gets accepted.
> >
> > Let me know how you want to proceed.
> >
> > Cheers,
> >
> > Joel
> >
> > > ---
> > > arch/arm/boot/dts/aspeed-g6.dtsi | 22 ++
> > > drivers/hwmon/Kconfig | 8 +
> > > drivers/hwmon/Makefile | 1 +
> > > drivers/hwmon/tach-aspeed-ast2600.c | 388
> > ++++++++++++++++++++++++++++
> > > 4 files changed, 419 insertions(+)
> > > create mode 100644 drivers/hwmon/tach-aspeed-ast2600.c
> > >
> > > diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi
> > b/arch/arm/boot/dts/aspeed-g6.dtsi
> > > index 5106a424f1ce..ec249f450552 100644
> > > --- a/arch/arm/boot/dts/aspeed-g6.dtsi
> > > +++ b/arch/arm/boot/dts/aspeed-g6.dtsi
> > > @@ -304,6 +304,28 @@ apb {
> > > #size-cells = <1>;
> > > ranges;
> > >
> > > + pwm_tach: pwm_tach@1e610000 {
> > > + compatible =
> > "aspeed,ast2600-pwm-tach", "simple-mfd", "syscon";
> > > + reg = <0x1e610000 0x100>;
> > > + clocks = <&syscon
> > ASPEED_CLK_AHB>;
> > > + resets = <&syscon
> > ASPEED_RESET_PWM>;
> > > +
> > > + pwm: pwm {
> > > + compatible =
> > "aspeed,ast2600-pwm";
> > > + #pwm-cells = <3>;
> > > + #address-cells = <1>;
> > > + #size-cells = <0>;
> > > + status = "disabled";
> > > + };
> > > +
> > > + tach: tach {
> > > + compatible =
> > "aspeed,ast2600-tach";
> > > + #address-cells = <1>;
> > > + #size-cells = <0>;
> > > + status = "disabled";
> > > + };
> > > + };
> > > +
> > > syscon: syscon@1e6e2000 {
> > > compatible = "aspeed,ast2600-scu",
> > "syscon", "simple-mfd";
> > > reg = <0x1e6e2000 0x1000>;
> > > diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> > > index 64bd3dfba2c4..0eb307cb67fc 100644
> > > --- a/drivers/hwmon/Kconfig
> > > +++ b/drivers/hwmon/Kconfig
> > > @@ -397,6 +397,14 @@ config SENSORS_ASPEED
> > > This driver can also be built as a module. If so, the module
> > > will be called aspeed_pwm_tacho.
> > >
> > > +config SENSORS_TACH_ASPEED_AST2600
> > > + tristate "ASPEED ast2600 Tachometer support"
> > > + help
> > > + This driver provides support for Aspeed ast2600 Tachometer.
> > > +
> > > + To compile this driver as a module, choose M here: the module
> > > + will be called tach-aspeed-ast2600.
> > > +
> > > config SENSORS_ATXP1
> > > tristate "Attansic ATXP1 VID controller"
> > > depends on I2C
> > > diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
> > > index baee6a8d4dd1..ce66874c8ce2 100644
> > > --- a/drivers/hwmon/Makefile
> > > +++ b/drivers/hwmon/Makefile
> > > @@ -51,6 +51,7 @@ obj-$(CONFIG_SENSORS_ARM_SCMI) +=
> > scmi-hwmon.o
> > > obj-$(CONFIG_SENSORS_ARM_SCPI) += scpi-hwmon.o
> > > obj-$(CONFIG_SENSORS_AS370) += as370-hwmon.o
> > > obj-$(CONFIG_SENSORS_ASC7621) += asc7621.o
> > > +obj-$(CONFIG_SENSORS_TACH_ASPEED_AST2600) +=
> > tach-aspeed-ast2600.o
> > > obj-$(CONFIG_SENSORS_ASPEED) += aspeed-pwm-tacho.o
> > > obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
> > > obj-$(CONFIG_SENSORS_AXI_FAN_CONTROL) += axi-fan-control.o
> > > diff --git a/drivers/hwmon/tach-aspeed-ast2600.c
> > b/drivers/hwmon/tach-aspeed-ast2600.c
> > > new file mode 100644
> > > index 000000000000..0b2551fc1711
> > > --- /dev/null
> > > +++ b/drivers/hwmon/tach-aspeed-ast2600.c
> > > @@ -0,0 +1,388 @@
> > > +// SPDX-License-Identifier: GPL-2.0-only
> > > +/*
> > > + * Copyright (C) ASPEED Technology Inc.
> > > + *
> > > + * This program is free software; you can redistribute it and/or modify
> > > + * it under the terms of the GNU General Public License version 2 or later as
> > > + * published by the Free Software Foundation.
> > > + */
> > > +
> > > +#include <linux/clk.h>
> > > +#include <linux/errno.h>
> > > +#include <linux/delay.h>
> > > +#include <linux/hwmon.h>
> > > +#include <linux/hwmon-sysfs.h>
> > > +#include <linux/io.h>
> > > +#include <linux/kernel.h>
> > > +#include <linux/module.h>
> > > +#include <linux/of_platform.h>
> > > +#include <linux/of_device.h>
> > > +#include <linux/platform_device.h>
> > > +#include <linux/mfd/syscon.h>
> > > +#include <linux/sysfs.h>
> > > +#include <linux/reset.h>
> > > +#include <linux/regmap.h>
> > > +/* TACH Control Register */
> > > +#define ASPEED_TACHO_CTRL_CH(ch) ((ch * 0x10) + 0x08)
> > > +#define TACHO_IER BIT(31) //enable tacho interrupt
> > > +#define TACHO_INVERS_LIMIT BIT(30) //inverse tacho limit comparison
> > > +#define TACHO_LOOPBACK BIT(29) //tacho loopback
> > > +#define TACHO_ENABLE BIT(28) //{enable tacho}
> > > +#define TACHO_DEBOUNCE_MASK (0x3 << 26) //{tacho de-bounce}
> > > +#define TACHO_DEBOUNCE_BIT (26) //{tacho de-bounce}
> > > +#define TECHIO_EDGE_MASK (0x3 << 24) //tacho edge}
> > > +#define TECHIO_EDGE_BIT (24) //tacho edge}
> > > +#define TACHO_CLK_DIV_T_MASK (0xf << 20)
> > > +#define TACHO_CLK_DIV_BIT (20)
> > > +#define TACHO_THRESHOLD_MASK (0xfffff) //tacho threshold bit
> > > +/* [27:26] */
> > > +#define DEBOUNCE_3_CLK 0x00 /* 10b */
> > > +#define DEBOUNCE_2_CLK 0x01 /* 10b */
> > > +#define DEBOUNCE_1_CLK 0x02 /* 10b */
> > > +#define DEBOUNCE_0_CLK 0x03 /* 10b */
> > > +/* [25:24] */
> > > +#define F2F_EDGES 0x00 /* 10b */
> > > +#define R2R_EDGES 0x01 /* 10b */
> > > +#define BOTH_EDGES 0x02 /* 10b */
> > > +/* [23:20] */
> > > +/* Cover rpm range 5~5859375 */
> > > +#define DEFAULT_TACHO_DIV 5
> > > +
> > > +/* TACH Status Register */
> > > +#define ASPEED_TACHO_STS_CH(x) ((x * 0x10) + 0x0C)
> > > +
> > > +/*PWM_TACHO_STS */
> > > +#define TACHO_ISR BIT(31) //interrupt status and clear
> > > +#define PWM_OUT BIT(25) //{pwm_out}
> > > +#define PWM_OEN BIT(24) //{pwm_oeN}
> > > +#define TACHO_DEB_INPUT BIT(23) //tacho deB input
> > > +#define TACHO_RAW_INPUT BIT(22) //tacho raw input}
> > > +#define TACHO_VALUE_UPDATE BIT(21) //tacho value updated since the
> > last read
> > > +#define TACHO_FULL_MEASUREMENT BIT(20) //{tacho full measurement}
> > > +#define TACHO_VALUE_MASK 0xfffff //tacho value bit [19:0]}
> > > +/**********************************************************
> > > + * Software setting
> > > + *********************************************************/
> > > +#define DEFAULT_FAN_MIN_RPM 1000
> > > +#define DEFAULT_FAN_PULSE_PR 2
> > > +/*
> > > + * Add this value to avoid CPU consuming a lot of resources in waiting rpm
> > > + * updating. Assume the max rpm of fan is 60000, the period of updating
> > tach
> > > + * value will equal to (1000000 * 2 * 60) / (2 * max_rpm) = 1000.
> > > + */
> > > +#define RPM_POLLING_PERIOD_US 1000
> > > +
> > > +struct aspeed_tacho_channel_params {
> > > + int limited_inverse;
> > > + u16 threshold;
> > > + u8 tacho_edge;
> > > + u8 tacho_debounce;
> > > + u8 pulse_pr;
> > > + u32 min_rpm;
> > > + u32 divide;
> > > + u32 sample_period; /* unit is us */
> > > +};
> > > +
> > > +struct aspeed_tach_data {
> > > + struct regmap *regmap;
> > > + unsigned long clk_freq;
> > > + struct reset_control *reset;
> > > + bool tach_present[16];
> > > + struct aspeed_tacho_channel_params *tacho_channel;
> > > + /* for hwmon */
> > > + const struct attribute_group *groups[2];
> > > +};
> > > +
> > > +static u32 aspeed_get_fan_tach_sample_period(struct aspeed_tach_data
> > *priv,
> > > + u8 fan_tach_ch)
> > > +{
> > > + u32 tach_period_us;
> > > + u8 pulse_pr = priv->tacho_channel[fan_tach_ch].pulse_pr;
> > > + u32 min_rpm = priv->tacho_channel[fan_tach_ch].min_rpm;
> > > + /*
> > > + * min(Tach input clock) = (PulsePR * minRPM) / 60
> > > + * max(Tach input period) = 60 / (PulsePR * minRPM)
> > > + * Tach sample period > 2 * max(Tach input period) = (2*60) /
> > (PulsePR * minRPM)
> > > + */
> > > + tach_period_us = (1000000 * 2 * 60) / (pulse_pr * min_rpm);
> > > + /* Add the margin (about 1.2) of tach sample period to avoid
> > sample miss */
> > > + tach_period_us = (tach_period_us * 1200) >> 10;
> > > + pr_debug("tach%d sample period = %dus", fan_tach_ch,
> > tach_period_us);
> > > + return tach_period_us;
> > > +}
> > > +
> > > +static void aspeed_set_fan_tach_ch_enable(struct aspeed_tach_data *priv,
> > > + u8 fan_tach_ch, bool
> > enable,
> > > + u32 tacho_div)
> > > +{
> > > + u32 reg_value = 0;
> > > +
> > > + if (enable) {
> > > + /* divide = 2^(tacho_div*2) */
> > > + priv->tacho_channel[fan_tach_ch].divide = 1 <<
> > (tacho_div << 1);
> > > +
> > > + reg_value = TACHO_ENABLE |
> > > +
> > (priv->tacho_channel[fan_tach_ch].tacho_edge
> > > + << TECHIO_EDGE_BIT) |
> > > + (tacho_div << TACHO_CLK_DIV_BIT) |
> > > +
> > (priv->tacho_channel[fan_tach_ch].tacho_debounce
> > > + << TACHO_DEBOUNCE_BIT);
> > > +
> > > + if (priv->tacho_channel[fan_tach_ch].limited_inverse)
> > > + reg_value |= TACHO_INVERS_LIMIT;
> > > +
> > > + if (priv->tacho_channel[fan_tach_ch].threshold)
> > > + reg_value |=
> > > + (TACHO_IER |
> > > +
> > priv->tacho_channel[fan_tach_ch].threshold);
> > > +
> > > + regmap_write(priv->regmap,
> > ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> > > + reg_value);
> > > +
> > > + priv->tacho_channel[fan_tach_ch].sample_period =
> > > + aspeed_get_fan_tach_sample_period(priv,
> > fan_tach_ch);
> > > + } else
> > > + regmap_update_bits(priv->regmap,
> > > +
> > ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> > > + TACHO_ENABLE, 0);
> > > +}
> > > +
> > > +static int aspeed_get_fan_tach_ch_rpm(struct aspeed_tach_data *priv,
> > > + u8 fan_tach_ch)
> > > +{
> > > + u32 raw_data, tach_div, clk_source, usec, val;
> > > + u64 rpm;
> > > + int ret;
> > > +
> > > + usec = priv->tacho_channel[fan_tach_ch].sample_period;
> > > + /* Restart the Tach channel to guarantee the value is fresh */
> > > + regmap_update_bits(priv->regmap,
> > ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> > > + TACHO_ENABLE, 0);
> > > + regmap_update_bits(priv->regmap,
> > ASPEED_TACHO_CTRL_CH(fan_tach_ch),
> > > + TACHO_ENABLE, TACHO_ENABLE);
> > > + ret = regmap_read_poll_timeout(
> > > + priv->regmap, ASPEED_TACHO_STS_CH(fan_tach_ch),
> > val,
> > > + (val & TACHO_FULL_MEASUREMENT) && (val &
> > TACHO_VALUE_UPDATE),
> > > + RPM_POLLING_PERIOD_US, usec);
> > > +
> > > + if (ret) {
> > > + /* return 0 if we didn't get an answer because of
> > timeout*/
> > > + if (ret == -ETIMEDOUT)
> > > + return 0;
> > > + else
> > > + return ret;
> > > + }
> > > +
> > > + raw_data = val & TACHO_VALUE_MASK;
> > > + /*
> > > + * We need the mode to determine if the raw_data is double
> > (from
> > > + * counting both edges).
> > > + */
> > > + if (priv->tacho_channel[fan_tach_ch].tacho_edge == BOTH_EDGES)
> > > + raw_data <<= 1;
> > > +
> > > + tach_div = raw_data * (priv->tacho_channel[fan_tach_ch].divide) *
> > > + (priv->tacho_channel[fan_tach_ch].pulse_pr);
> > > +
> > > + pr_debug("clk %ld, raw_data %d , tach_div %d\n", priv->clk_freq,
> > raw_data, tach_div);
> > > +
> > > + clk_source = priv->clk_freq;
> > > +
> > > + if (tach_div == 0)
> > > + return -EDOM;
> > > +
> > > + rpm = (u64)clk_source * 60;
> > > + do_div(rpm, tach_div);
> > > +
> > > + return rpm;
> > > +}
> > > +
> > > +static ssize_t show_rpm(struct device *dev, struct device_attribute *attr,
> > > + char *buf)
> > > +{
> > > + struct sensor_device_attribute *sensor_attr =
> > to_sensor_dev_attr(attr);
> > > + int index = sensor_attr->index;
> > > + int rpm;
> > > + struct aspeed_tach_data *priv = dev_get_drvdata(dev);
> > > +
> > > + rpm = aspeed_get_fan_tach_ch_rpm(priv, index);
> > > + if (rpm < 0)
> > > + return rpm;
> > > +
> > > + return sprintf(buf, "%d\n", rpm);
> > > +}
> > > +
> > > +static umode_t fan_dev_is_visible(struct kobject *kobj, struct attribute *a,
> > > + int index)
> > > +{
> > > + struct device *dev = container_of(kobj, struct device, kobj);
> > > + struct aspeed_tach_data *priv = dev_get_drvdata(dev);
> > > +
> > > + if (!priv->tach_present[index])
> > > + return 0;
> > > + return a->mode;
> > > +}
> > > +
> > > +static SENSOR_DEVICE_ATTR(fan1_input, 0444, show_rpm, NULL, 0);
> > > +static SENSOR_DEVICE_ATTR(fan2_input, 0444, show_rpm, NULL, 1);
> > > +static SENSOR_DEVICE_ATTR(fan3_input, 0444, show_rpm, NULL, 2);
> > > +static SENSOR_DEVICE_ATTR(fan4_input, 0444, show_rpm, NULL, 3);
> > > +static SENSOR_DEVICE_ATTR(fan5_input, 0444, show_rpm, NULL, 4);
> > > +static SENSOR_DEVICE_ATTR(fan6_input, 0444, show_rpm, NULL, 5);
> > > +static SENSOR_DEVICE_ATTR(fan7_input, 0444, show_rpm, NULL, 6);
> > > +static SENSOR_DEVICE_ATTR(fan8_input, 0444, show_rpm, NULL, 7);
> > > +static SENSOR_DEVICE_ATTR(fan9_input, 0444, show_rpm, NULL, 8);
> > > +static SENSOR_DEVICE_ATTR(fan10_input, 0444, show_rpm, NULL, 9);
> > > +static SENSOR_DEVICE_ATTR(fan11_input, 0444, show_rpm, NULL, 10);
> > > +static SENSOR_DEVICE_ATTR(fan12_input, 0444, show_rpm, NULL, 11);
> > > +static SENSOR_DEVICE_ATTR(fan13_input, 0444, show_rpm, NULL, 12);
> > > +static SENSOR_DEVICE_ATTR(fan14_input, 0444, show_rpm, NULL, 13);
> > > +static SENSOR_DEVICE_ATTR(fan15_input, 0444, show_rpm, NULL, 14);
> > > +static SENSOR_DEVICE_ATTR(fan16_input, 0444, show_rpm, NULL, 15);
> > > +static struct attribute *fan_dev_attrs[] = {
> > > + &sensor_dev_attr_fan1_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan2_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan3_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan4_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan5_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan6_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan7_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan8_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan9_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan10_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan11_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan12_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan13_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan14_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan15_input.dev_attr.attr,
> > > + &sensor_dev_attr_fan16_input.dev_attr.attr,
> > > + NULL
> > > +};
> > > +
> > > +static const struct attribute_group fan_dev_group = {
> > > + .attrs = fan_dev_attrs,
> > > + .is_visible = fan_dev_is_visible,
> > > +};
> > > +
> > > +static void aspeed_create_fan_tach_channel(struct aspeed_tach_data *priv,
> > > + u32 tach_ch, int count,
> > > + u32 fan_pulse_pr, u32
> > fan_min_rpm,
> > > + u32 tacho_div)
> > > +{
> > > + priv->tach_present[tach_ch] = true;
> > > + priv->tacho_channel[tach_ch].pulse_pr = fan_pulse_pr;
> > > + priv->tacho_channel[tach_ch].min_rpm = fan_min_rpm;
> > > + priv->tacho_channel[tach_ch].limited_inverse = 0;
> > > + priv->tacho_channel[tach_ch].threshold = 0;
> > > + priv->tacho_channel[tach_ch].tacho_edge = F2F_EDGES;
> > > + priv->tacho_channel[tach_ch].tacho_debounce =
> > DEBOUNCE_3_CLK;
> > > + aspeed_set_fan_tach_ch_enable(priv, tach_ch, true, tacho_div);
> > > +}
> > > +
> > > +static int aspeed_tach_create_fan(struct device *dev, struct device_node
> > *child,
> > > + struct aspeed_tach_data *priv)
> > > +{
> > > + u32 fan_pulse_pr, fan_min_rpm;
> > > + u32 tacho_div;
> > > + u32 tach_channel;
> > > + int ret, count;
> > > +
> > > + ret = of_property_read_u32(child, "reg", &tach_channel);
> > > + if (ret)
> > > + return ret;
> > > +
> > > + ret = of_property_read_u32(child, "aspeed,pulse-pr",
> > &fan_pulse_pr);
> > > + if (ret)
> > > + fan_pulse_pr = DEFAULT_FAN_PULSE_PR;
> > > +
> > > + ret = of_property_read_u32(child, "aspeed,min-rpm",
> > &fan_min_rpm);
> > > + if (ret)
> > > + fan_min_rpm = DEFAULT_FAN_MIN_RPM;
> > > +
> > > + ret = of_property_read_u32(child, "aspeed,tach-div", &tacho_div);
> > > + if (ret)
> > > + tacho_div = DEFAULT_TACHO_DIV;
> > > +
> > > + aspeed_create_fan_tach_channel(priv, tach_channel, count,
> > fan_pulse_pr,
> > > + fan_min_rpm, tacho_div);
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static int aspeed_tach_probe(struct platform_device *pdev)
> > > +{
> > > + struct device *dev = &pdev->dev;
> > > + struct device_node *np, *child;
> > > + struct aspeed_tach_data *priv;
> > > + struct device *hwmon;
> > > + struct clk *clk;
> > > + int ret;
> > > +
> > > + np = dev->parent->of_node;
> > > + dev_info(dev, "tach probe start\n");
> > > +
> > > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> > > + if (!priv)
> > > + return -ENOMEM;
> > > +
> > > + priv->tacho_channel = devm_kzalloc(
> > > + dev, 16 * sizeof(*priv->tacho_channel), GFP_KERNEL);
> > > +
> > > + priv->regmap = syscon_node_to_regmap(np);
> > > + if (IS_ERR(priv->regmap)) {
> > > + dev_err(dev, "Couldn't get regmap\n");
> > > + return -ENODEV;
> > > + }
> > > +
> > > + clk = of_clk_get(np, 0);
> > > + if (IS_ERR(clk))
> > > + return -ENODEV;
> > > + priv->clk_freq = clk_get_rate(clk);
> > > +
> > > + priv->reset = of_reset_control_get_shared(np, NULL);
> > > + if (IS_ERR(priv->reset)) {
> > > + dev_err(&pdev->dev, "can't get aspeed_pwm_tacho
> > reset\n");
> > > + return PTR_ERR(priv->reset);
> > > + }
> > > +
> > > + //scu init
> > > + reset_control_deassert(priv->reset);
> > > +
> > > + for_each_child_of_node(dev->of_node, child) {
> > > + ret = aspeed_tach_create_fan(dev, child, priv);
> > > + if (ret) {
> > > + of_node_put(child);
> > > + return ret;
> > > + }
> > > + }
> > > +
> > > + priv->groups[0] = &fan_dev_group;
> > > + priv->groups[1] = NULL;
> > > + dev_info(dev, "tach probe done\n");
> > > + hwmon = devm_hwmon_device_register_with_groups(dev,
> > "aspeed_tach", priv,
> > > +
> > priv->groups);
> > > +
> > > + return PTR_ERR_OR_ZERO(hwmon);
> > > +}
> > > +
> > > +static const struct of_device_id of_stach_match_table[] = {
> > > + {
> > > + .compatible = "aspeed,ast2600-tach",
> > > + },
> > > + {},
> > > +};
> > > +MODULE_DEVICE_TABLE(of, of_stach_match_table);
> > > +
> > > +static struct platform_driver aspeed_tach_driver = {
> > > + .probe = aspeed_tach_probe,
> > > + .driver = {
> > > + .name = "aspeed_tach",
> > > + .of_match_table = of_stach_match_table,
> > > + },
> > > +};
> > > +
> > > +module_platform_driver(aspeed_tach_driver);
> > > +
> > > +MODULE_AUTHOR("Ryan Chen <ryan_chen@aspeedtech.com>");
> > > +MODULE_DESCRIPTION("ASPEED Fan tach device driver");
> > > +MODULE_LICENSE("GPL");
> > > --
> > > 2.25.1
> > >
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux
2021-12-02 4:32 ` Joel Stanley
@ 2021-12-02 4:58 ` Billy Tsai
2022-01-07 9:08 ` Potin Lai (賴柏廷)
0 siblings, 1 reply; 7+ messages in thread
From: Billy Tsai @ 2021-12-02 4:58 UTC (permalink / raw)
To: Joel Stanley, Howard Chiu (邱冠睿)
Cc: Howard Chiu, OpenBMC Maillist, Potin Lai (賴柏廷)
Hi Joel,
On 2021/12/2, 12:32 PM, "Joel Stanley" <joel@jms.id.au> wrote:
On Thu, 2 Dec 2021 at 04:29, Howard Chiu (邱冠睿) <Howard.Chiu@quantatw.com> wrote:
> >
> > Hi Joel
> >
> > Yes, this patch is v14 I just downloaded from patchwork and tested it with Facebook Bletchley platform.
> > I am not sure if there would be further revision of this driver, but my platform needs ast26xx PWM/Tach driver.
> > I will sync this driver with Billy's work.
> >Thanks for the explanation. In the future, it would pay to reference
> >the work you've based your patch on, and keep the ownership
> >information in the patch.
> Billy, are you happy with us putting v14 into the openbmc tree?
Sure. Do I need to send another patch for the openbmc or you will apply the v14 into the openbmc tree?
Best Regards,
Billy Tsai
^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux
2021-12-02 4:58 ` Billy Tsai
@ 2022-01-07 9:08 ` Potin Lai (賴柏廷)
2022-01-10 2:08 ` Billy Tsai
0 siblings, 1 reply; 7+ messages in thread
From: Potin Lai (賴柏廷) @ 2022-01-07 9:08 UTC (permalink / raw)
To: Billy Tsai, Joel Stanley, Howard Chiu (邱冠睿)
Cc: Howard Chiu, OpenBMC Maillist
Hi Billy,
Just wondering that are there any plan or date for ast26xx Pwm/Tach drivers.
As Howard mentioned earlier, Our platform will needs the drivers ready.
Best regards,
Potin
-----Original Message-----
From: Billy Tsai <billy_tsai@aspeedtech.com>
Sent: Thursday, December 2, 2021 12:59 PM
To: Joel Stanley <joel@jms.id.au>; Howard Chiu (邱冠睿) <Howard.Chiu@quantatw.com>
Cc: Howard Chiu <howard10703049@gmail.com>; OpenBMC Maillist <openbmc@lists.ozlabs.org>; Potin Lai (賴柏廷) <Potin.Lai@quantatw.com>
Subject: Re: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux
Hi Joel,
On 2021/12/2, 12:32 PM, "Joel Stanley" <joel@jms.id.au> wrote:
On Thu, 2 Dec 2021 at 04:29, Howard Chiu (邱冠睿) <Howard.Chiu@quantatw.com> wrote:
> >
> > Hi Joel
> >
> > Yes, this patch is v14 I just downloaded from patchwork and tested it with Facebook Bletchley platform.
> > I am not sure if there would be further revision of this driver, but my platform needs ast26xx PWM/Tach driver.
> > I will sync this driver with Billy's work.
> >Thanks for the explanation. In the future, it would pay to reference
> >the work you've based your patch on, and keep the ownership
> >information in the patch.
> Billy, are you happy with us putting v14 into the openbmc tree?
Sure. Do I need to send another patch for the openbmc or you will apply the v14 into the openbmc tree?
Best Regards,
Billy Tsai
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux
2022-01-07 9:08 ` Potin Lai (賴柏廷)
@ 2022-01-10 2:08 ` Billy Tsai
0 siblings, 0 replies; 7+ messages in thread
From: Billy Tsai @ 2022-01-10 2:08 UTC (permalink / raw)
To: Potin Lai (賴柏廷),
Joel Stanley, Howard Chiu (邱冠睿)
Cc: Howard Chiu, OpenBMC Maillist
Hi Potin,
I am waiting for Joel and Rob's comment.
https://patchwork.ozlabs.org/project/linux-pwm/cover/20211130055933.32708-1-billy_tsai@aspeedtech.com/
Can you use the driver on our github first?
https://github.com/AspeedTech-BMC/linux
Thanks
Best Regards,
Billy Tsai
On 2022/1/7, 5:08 PM, "Potin Lai (賴柏廷)" <Potin.Lai@quantatw.com> wrote:
Hi Billy,
Just wondering that are there any plan or date for ast26xx Pwm/Tach drivers.
As Howard mentioned earlier, Our platform will needs the drivers ready.
Best regards,
Potin
-----Original Message-----
From: Billy Tsai <billy_tsai@aspeedtech.com>
Sent: Thursday, December 2, 2021 12:59 PM
To: Joel Stanley <joel@jms.id.au>; Howard Chiu (邱冠睿) <Howard.Chiu@quantatw.com>
Cc: Howard Chiu <howard10703049@gmail.com>; OpenBMC Maillist <openbmc@lists.ozlabs.org>; Potin Lai (賴柏廷) <Potin.Lai@quantatw.com>
Subject: Re: [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux
Hi Joel,
On 2021/12/2, 12:32 PM, "Joel Stanley" <joel@jms.id.au> wrote:
On Thu, 2 Dec 2021 at 04:29, Howard Chiu (邱冠睿) <Howard.Chiu@quantatw.com> wrote:
> >
> > Hi Joel
> >
> > Yes, this patch is v14 I just downloaded from patchwork and tested it with Facebook Bletchley platform.
> > I am not sure if there would be further revision of this driver, but my platform needs ast26xx PWM/Tach driver.
> > I will sync this driver with Billy's work.
> >Thanks for the explanation. In the future, it would pay to reference
> >the work you've based your patch on, and keep the ownership
> >information in the patch.
> Billy, are you happy with us putting v14 into the openbmc tree?
Sure. Do I need to send another patch for the openbmc or you will apply the v14 into the openbmc tree?
Best Regards,
Billy Tsai
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-10 2:09 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-02 2:26 [PATCH linux dev-4.7] Porting tach driver for ast26xx from Aspeed linux Howard Chiu
2021-12-02 3:59 ` Joel Stanley
2021-12-02 4:28 ` Howard Chiu (邱冠睿)
2021-12-02 4:32 ` Joel Stanley
2021-12-02 4:58 ` Billy Tsai
2022-01-07 9:08 ` Potin Lai (賴柏廷)
2022-01-10 2:08 ` Billy Tsai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).