Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp6873398rwd; Tue, 6 Jun 2023 03:15:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40jRvcBKkeFYY0LNonZ6CpCjjKdoY0NENtkS3x4BowFM/Dc4QGCsWqA+0COzCDHVW7WgtI X-Received: by 2002:a05:620a:2622:b0:75b:23a0:e7ab with SMTP id z34-20020a05620a262200b0075b23a0e7abmr1498667qko.12.1686046532002; Tue, 06 Jun 2023 03:15:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686046531; cv=none; d=google.com; s=arc-20160816; b=HtX8FqlgfBedqhZLzDeNjxsnOovFN1PbAoh3rM40p9UyGKUlwsoDTw8UeF8EzKyxdg xYXoOLZSoXgWE4A94I+q3wUWhVjz3Rb/yKM9lDmafVc75LHMu1BoKCbBnMxM6z4EjrRD kfRuamzLrs7dtOV1jFlbwUjdD8JVFPaUu70mnpD/woC0E06gV7+U9lRuoekx74h+fRqU JnIDcgtk8oJEMZNkhrQv3PbuCZucJCG3eJrYTxygMiVWIfGe/CKG05xtROUH0Mqc6ThU vpl7ooqcHPo12U7MMudBX7KzBkWSk2S11ySxavL0dY8TW36x/QHc9zHsLkNK9w/S3huU 8m2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=Z7/OTgNA5rHbUB1FsdrV7/lEaROPjDW6LCOakp13Wns=; b=uB6dPI07vbDSEkm1/3diZRZkIIllWIhLsNalQ8khUMPRsQ7/CQnp+srbYu7zMZ007k 11HnmvX3Wc407IURhyX5PhVHDQQWwMLLboXWjcINhOfDwOL/cHHXmV4rQ+ZFV1YFWsUR 0XUzGtWDkW0TL3foesxBObnT7NLpd4uRgo6AKxj2uzSetCKHa4/Oo+ofmbFNK4/V6Ro1 8vSSkg4SlU0qsFW/1xhEdYnX7kDz0Cha1lKDs+bo3j6v5QwEe9G/IFzwF5PyhWjedkMc nUep1XpJANmzCOdu5kFzZMIBZs8NhcsaNH2vbV9dd8BSYcv+DZSAfBDKfu4OVM3TduUv Ukbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c11-20020a05620a11ab00b0075df649017dsi2688544qkk.127.2023.06.06.03.15.17; Tue, 06 Jun 2023 03:15:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237492AbjFFJ7s (ORCPT + 99 others); Tue, 6 Jun 2023 05:59:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237631AbjFFJ7a (ORCPT ); Tue, 6 Jun 2023 05:59:30 -0400 Received: from mail.aspeedtech.com (mail.aspeedtech.com [211.20.114.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC9951707; Tue, 6 Jun 2023 02:59:04 -0700 (PDT) Received: from BillyTsai-pc.aspeed.com (192.168.1.221) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 6 Jun 2023 17:43:42 +0800 From: Billy Tsai To: , , , , , , , , , , , , , , , , , , , Subject: [v5 5/5] hwmon: Add Aspeed ast2600 TACH support Date: Tue, 6 Jun 2023 17:45:35 +0800 Message-ID: <20230606094535.5388-6-billy_tsai@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230606094535.5388-1-billy_tsai@aspeedtech.com> References: <20230606094535.5388-1-billy_tsai@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [192.168.1.221] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the support of Tachometer which can use to monitor the frequency of the input. The tach supports up to 16 channels and it's part function of multi-function device "pwm-tach controller". Signed-off-by: Billy Tsai --- Documentation/hwmon/index.rst | 1 + Documentation/hwmon/tach-aspeed-ast2600.rst | 25 ++ drivers/hwmon/Kconfig | 9 + drivers/hwmon/Makefile | 1 + drivers/hwmon/tach-aspeed-ast2600.c | 367 ++++++++++++++++++++ 5 files changed, 403 insertions(+) create mode 100644 Documentation/hwmon/tach-aspeed-ast2600.rst create mode 100644 drivers/hwmon/tach-aspeed-ast2600.c diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst index ddff3c5713d7..4c3dd74675ef 100644 --- a/Documentation/hwmon/index.rst +++ b/Documentation/hwmon/index.rst @@ -194,6 +194,7 @@ Hardware Monitoring Kernel Drivers sparx5-temp stpddc60 sy7636a-hwmon + tach-aspeed-ast2600 tc654 tc74 thmc50 diff --git a/Documentation/hwmon/tach-aspeed-ast2600.rst b/Documentation/hwmon/tach-aspeed-ast2600.rst new file mode 100644 index 000000000000..8faa00f6ad47 --- /dev/null +++ b/Documentation/hwmon/tach-aspeed-ast2600.rst @@ -0,0 +1,25 @@ +Kernel driver tach-aspeed-ast2600 +================================= + +Supported chips: + ASPEED AST2600 + +Authors: + + +Description: +------------ +This driver implements support for ASPEED AST2600 Fan Tacho controller. +The controller supports up to 16 tachometer inputs. + +The driver provides the following sensor accesses in sysfs: + +=============== ======= ====================================================== +fanX_input ro provide current fan rotation value in RPM as reported + by the fan to the device. +fanX_div rw Fan divisor: Supported value are power of 4 (1, 4, 16 + 64, ... 4194304) + The larger divisor, the less rpm accuracy and the less + affected by fan signal glitch. +fanX_pulses rw Fan pulses per resolution. +=============== ======= ====================================================== diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index a5253abb7ea7..5fba87d46b7f 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -411,6 +411,15 @@ 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" + select REGMAP + 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 c5cd7e3a67ff..a3bf5b438e0f 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -53,6 +53,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..ee63844aa3a1 --- /dev/null +++ b/drivers/hwmon/tach-aspeed-ast2600.c @@ -0,0 +1,367 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) ASPEED Technology Inc. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* The channel number of Aspeed tach controller */ +#define TACH_ASPEED_NR_TACHS 16 +/* TACH Control Register */ +#define TACH_ASPEED_CTRL(ch) (((ch) * 0x10) + 0x08) +#define TACH_ASPEED_IER BIT(31) +#define TACH_ASPEED_INVERS_LIMIT BIT(30) +#define TACH_ASPEED_LOOPBACK BIT(29) +#define TACH_ASPEED_ENABLE BIT(28) +#define TACH_ASPEED_DEBOUNCE_MASK GENMASK(27, 26) +#define TACH_ASPEED_DEBOUNCE_BIT 26 +#define TACH_ASPEED_IO_EDGE_MASK GENMASK(25, 24) +#define TACH_ASPEED_IO_EDGE_BIT 24 +#define TACH_ASPEED_CLK_DIV_T_MASK GENMASK(23, 20) +#define TACH_ASPEED_CLK_DIV_BIT 20 +#define TACH_ASPEED_THRESHOLD_MASK GENMASK(19, 0) +/* [27:26] */ +#define DEBOUNCE_3_CLK 0x00 +#define DEBOUNCE_2_CLK 0x01 +#define DEBOUNCE_1_CLK 0x02 +#define DEBOUNCE_0_CLK 0x03 +/* [25:24] */ +#define F2F_EDGES 0x00 +#define R2R_EDGES 0x01 +#define BOTH_EDGES 0x02 +/* [23:20] */ +/* divisor = 4 to the nth power, n = register value */ +#define DEFAULT_TACH_DIV 1024 +#define DIV_TO_REG(divisor) (ilog2(divisor) >> 1) + +/* TACH Status Register */ +#define TACH_ASPEED_STS(ch) (((ch) * 0x10) + 0x0C) + +/*PWM_TACH_STS */ +#define TACH_ASPEED_ISR BIT(31) +#define TACH_ASPEED_PWM_OUT BIT(25) +#define TACH_ASPEED_PWM_OEN BIT(24) +#define TACH_ASPEED_DEB_INPUT BIT(23) +#define TACH_ASPEED_RAW_INPUT BIT(22) +#define TACH_ASPEED_VALUE_UPDATE BIT(21) +#define TACH_ASPEED_FULL_MEASUREMENT BIT(20) +#define TACH_ASPEED_VALUE_MASK GENMASK(19, 0) +/********************************************************** + * Software setting + *********************************************************/ +#define DEFAULT_FAN_PULSE_PR 2 +struct aspeed_tach_channel_params { + u8 pulse_pr; + u32 divisor; +}; + +struct aspeed_tach_data { + struct device *dev; + struct regmap *regmap; + struct clk *clk; + struct reset_control *reset; + bool tach_present[TACH_ASPEED_NR_TACHS]; + struct aspeed_tach_channel_params tach_channel[TACH_ASPEED_NR_TACHS]; + unsigned long clk_source; +}; + +static void aspeed_tach_ch_enable(struct aspeed_tach_data *priv, u8 tach_ch, + bool enable) +{ + if (enable) + regmap_set_bits(priv->regmap, TACH_ASPEED_CTRL(tach_ch), + TACH_ASPEED_ENABLE); + else + regmap_clear_bits(priv->regmap, TACH_ASPEED_CTRL(tach_ch), + TACH_ASPEED_ENABLE); +} + +static u64 aspeed_tach_val_to_rpm(struct aspeed_tach_data *priv, u8 fan_tach_ch, + u32 tach_val) +{ + u64 rpm; + u32 tach_div; + + tach_div = tach_val * (priv->tach_channel[fan_tach_ch].divisor) * + (priv->tach_channel[fan_tach_ch].pulse_pr); + + dev_dbg(priv->dev, "clk %ld, tach_val %d , tach_div %d\n", + priv->clk_source, tach_val, tach_div); + + rpm = (u64)priv->clk_source * 60; + do_div(rpm, tach_div); + + return rpm; +} + +static int aspeed_get_fan_tach_ch_rpm(struct aspeed_tach_data *priv, + u8 fan_tach_ch) +{ + u32 val; + u64 rpm; + int ret; + + ret = regmap_read(priv->regmap, TACH_ASPEED_STS(fan_tach_ch), &val); + if (ret) + return ret; + + if (!(val & TACH_ASPEED_FULL_MEASUREMENT)) + return 0; + rpm = aspeed_tach_val_to_rpm(priv, fan_tach_ch, + val & TACH_ASPEED_VALUE_MASK); + + return rpm; +} + +static int aspeed_tach_hwmon_read(struct device *dev, + enum hwmon_sensor_types type, u32 attr, + int channel, long *val) +{ + struct aspeed_tach_data *priv = dev_get_drvdata(dev); + u32 reg_val; + int ret; + + switch (attr) { + case hwmon_fan_input: + ret = aspeed_get_fan_tach_ch_rpm(priv, channel); + if (ret < 0) + return ret; + *val = ret; + break; + case hwmon_fan_div: + regmap_read(priv->regmap, TACH_ASPEED_CTRL(channel), ®_val); + reg_val = FIELD_GET(TACH_ASPEED_CLK_DIV_T_MASK, reg_val); + *val = BIT(reg_val << 1); + break; + case hwmon_fan_pulses: + *val = priv->tach_channel[channel].pulse_pr; + break; + default: + return -EOPNOTSUPP; + } + return 0; +} + +static int aspeed_tach_hwmon_write(struct device *dev, + enum hwmon_sensor_types type, u32 attr, + int channel, long val) +{ + struct aspeed_tach_data *priv = dev_get_drvdata(dev); + + switch (attr) { + case hwmon_fan_div: + if (!is_power_of_2(val) || (ilog2(val) % 2)) + return -EINVAL; + else if (DIV_TO_REG(val) > 0xb) + return -ERANGE; + priv->tach_channel[channel].divisor = val; + regmap_write_bits(priv->regmap, TACH_ASPEED_CTRL(channel), + TACH_ASPEED_CLK_DIV_T_MASK, + DIV_TO_REG(priv->tach_channel[channel].divisor) + << TACH_ASPEED_CLK_DIV_BIT); + break; + case hwmon_fan_pulses: + priv->tach_channel[channel].pulse_pr = val; + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static umode_t aspeed_tach_dev_is_visible(const void *drvdata, + enum hwmon_sensor_types type, + u32 attr, int channel) +{ + const struct aspeed_tach_data *priv = drvdata; + + if (!priv->tach_present[channel]) + return 0; + switch (attr) { + case hwmon_fan_input: + return 0444; + case hwmon_fan_div: + case hwmon_fan_pulses: + return 0644; + } + return 0; +} + +static const struct hwmon_ops aspeed_tach_ops = { + .is_visible = aspeed_tach_dev_is_visible, + .read = aspeed_tach_hwmon_read, + .write = aspeed_tach_hwmon_write, +}; + +static const struct hwmon_channel_info *aspeed_tach_info[] = { + HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES, + HWMON_F_INPUT | HWMON_F_DIV | HWMON_F_PULSES), + NULL +}; + +static const struct hwmon_chip_info aspeed_tach_chip_info = { + .ops = &aspeed_tach_ops, + .info = aspeed_tach_info, +}; + +static void aspeed_create_fan_tach_channel(struct aspeed_tach_data *priv, + u32 tach_ch) +{ + priv->tach_present[tach_ch] = true; + regmap_write_bits(priv->regmap, TACH_ASPEED_CTRL(tach_ch), + TACH_ASPEED_INVERS_LIMIT, 0); + + regmap_write_bits(priv->regmap, TACH_ASPEED_CTRL(tach_ch), + TACH_ASPEED_DEBOUNCE_MASK, + DEBOUNCE_3_CLK << TACH_ASPEED_DEBOUNCE_BIT); + + regmap_write_bits(priv->regmap, TACH_ASPEED_CTRL(tach_ch), + TACH_ASPEED_IO_EDGE_MASK, F2F_EDGES); + + priv->tach_channel[tach_ch].divisor = DEFAULT_TACH_DIV; + regmap_write_bits(priv->regmap, TACH_ASPEED_CTRL(tach_ch), + TACH_ASPEED_CLK_DIV_T_MASK, + DIV_TO_REG(priv->tach_channel[tach_ch].divisor) + << TACH_ASPEED_CLK_DIV_BIT); + + regmap_write_bits(priv->regmap, TACH_ASPEED_CTRL(tach_ch), + TACH_ASPEED_THRESHOLD_MASK, 0); + + priv->tach_channel[tach_ch].pulse_pr = DEFAULT_FAN_PULSE_PR; + + aspeed_tach_ch_enable(priv, tach_ch, true); +} + +static int aspeed_tach_create_fan(struct device *dev, struct device_node *child, + struct aspeed_tach_data *priv) +{ + u32 tach_channel; + int ret; + + ret = of_property_read_u32(child, "reg", &tach_channel); + if (ret) + return ret; + + aspeed_create_fan_tach_channel(priv, tach_channel); + + return 0; +} + +static void aspeed_tach_reset_assert(void *data) +{ + struct reset_control *rst = data; + + reset_control_assert(rst); +} + +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; + int ret; + + np = dev->parent->of_node; + if (!of_device_is_compatible(np, "aspeed,ast2600-pwm-tach")) + return dev_err_probe(dev, -ENODEV, + "Unsupported tach device binding\n"); + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + priv->dev = &pdev->dev; + + priv->regmap = syscon_node_to_regmap(np); + if (IS_ERR(priv->regmap)) + return dev_err_probe(dev, PTR_ERR(priv->regmap), + "Couldn't get regmap\n"); + + priv->clk = devm_clk_get_enabled(dev->parent, NULL); + if (IS_ERR(priv->clk)) + return dev_err_probe(dev, PTR_ERR(priv->clk), + "Couldn't get clock\n"); + + priv->clk_source = clk_get_rate(priv->clk); + + priv->reset = devm_reset_control_get_shared(dev->parent, NULL); + if (IS_ERR(priv->reset)) + return dev_err_probe(dev, PTR_ERR(priv->reset), + "Couldn't get reset control\n"); + + ret = reset_control_deassert(priv->reset); + if (ret) + return dev_err_probe(dev, ret, + "Couldn't deassert reset control\n"); + + ret = devm_add_action_or_reset(dev, aspeed_tach_reset_assert, + priv->reset); + if (ret) + return ret; + + 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; + } + } + + hwmon = devm_hwmon_device_register_with_info(dev, "aspeed_tach", priv, + &aspeed_tach_chip_info, NULL); + ret = PTR_ERR_OR_ZERO(hwmon); + if (ret) + return dev_err_probe(dev, ret, + "Failed to register hwmon device\n"); + return 0; +} + +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("Billy Tsai "); +MODULE_DESCRIPTION("Aspeed ast2600 TACH device driver"); +MODULE_LICENSE("GPL"); -- 2.25.1