From patchwork Thu Aug 17 02:10:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 714953 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8D3FC2FC14 for ; Thu, 17 Aug 2023 02:11:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347604AbjHQCKh (ORCPT ); Wed, 16 Aug 2023 22:10:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347560AbjHQCKa (ORCPT ); Wed, 16 Aug 2023 22:10:30 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CEE2C270D; Wed, 16 Aug 2023 19:10:26 -0700 (PDT) Received: from loongson.cn (unknown [10.20.42.201]) by gateway (Coremail) with SMTP id _____8Cx7+uRgd1ka1YZAA--.50966S3; Thu, 17 Aug 2023 10:10:25 +0800 (CST) Received: from localhost.localdomain (unknown [10.20.42.201]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Dx4eSBgd1kMmpcAA--.30172S2; Thu, 17 Aug 2023 10:10:22 +0800 (CST) From: Yinbo Zhu To: "Rafael J . Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Rob Herring , Krzysztof Kozlowski , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jianmin Lv , wanghongliang@loongson.cn, loongson-kernel@lists.loongnix.cn, Yinbo Zhu , zhanghongchen Subject: [PATCH v16 1/2] thermal: loongson-2: add thermal management support Date: Thu, 17 Aug 2023 10:10:06 +0800 Message-Id: <20230817021007.10350-1-zhuyinbo@loongson.cn> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Dx4eSBgd1kMmpcAA--.30172S2 X-CM-SenderInfo: 52kx5xhqerqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This patch adds the support for Loongson-2 thermal sensor controller, which can support maximum four sensor selectors that corresponding to four sets of thermal control registers and one set of sampling register. The sensor selector can selector a speific thermal sensor as temperature input. The sampling register is used to obtain the temperature in real time, the control register GATE field is used to set the threshold of high or low temperature, when the input temperature is higher than the high temperature threshold or lower than the low temperature threshold, an interrupt will occur. Signed-off-by: zhanghongchen Signed-off-by: Yinbo Zhu --- Change in v16: 1. Remove the test and message in the context of devm_thermal_add_hwmon_sysfs. Change in v15: 1. Remove the unused head file. 2. Remove the invalid conditions that such as (low > high). 3. Use the clamp() to replace max() and min(). 4. Use the macros to replace some constant. 5. Use the struct data point as data field of of_device_id. 6. Use the thermal_sensor_sel to replace the sensor id. 7. Use the thermal_zone_device_priv to replace tz->devdata. 8. Reword the commit log information. Change in v14: 1. Add back depends on COMPILE_TEST. 2. The implementation of devm_thermal_add_hwmon_sysfs has changed in recent community code that cause compile fail issue and this verison add a dev args in devm_thermal_add_hwmon_sysfs to fix compile issue. Change in v13: 1. Add a description about that how works the sensor. 2. Drop the COMPILE_TEST. 3. Rework the help prograph in LOONGSON2_THERMAL Kconfig. 4. Drop the 'tzd' 'irq' and 'pdev' element in loongson2_thermal_data. 5. Drop the reset of variable in loongson2_thermal_set. 6. Drop the function loongson2_thermal_get_sensor_id. 7. Drop the function loongson2_thermal_alarm_irq. 8. Rework the devm_thermal_of_zone_register. 9. Pass 'tzd' instead of 'data' in devm_request_threaded_irq. 10. Drop the "data->tzd->tzp->no_hwmon = false". 11. Drop the loongson2_thermal_remove. 12. Add the sensor id in the of_device_id data field. 13. Drop the save and restore function. Change in v12: 1. Fixup it about min and max. 2. Use dev_err_probe replace dev_err in devm_request_threaded_irq context. Change in v11: 1. Add min() and max() to replace related code in function loongson2_thermal_set. 2. Add dev_err_probe to to replace related code for function return value use devm_thermal_of_zone_register. 3. Replace thermal_add_hwmon_sysfs with devm_thermal_add_hwmon_sysfs and use dev_warn replace dev_err in this context. Change in v10: 1. Add all history change log information. Change in v9: 1. Switch new API that use devm_thermal_of_zone_register to replace previous interfaces. 2. Add depend on LOONGARCH || COMPILE_TEST. Change in v8: 1. Replace string loongson2/Loongson2/LOONGSON2 with loongson-2/ Loongson-2/LOONGSON-2 in Kconfig and commit log and MAINTAINERS files. Change in v7: 1. Split the modification of patch 3 and merge it into this patch. 2. Remove the unless code annotation to fix the compile warning when compile C code with W=1. Change in v6: 1. NO change, but other patch in this series of patches set has changes. Change in v5: 1. NO change, but other patch in this series of patches set has changes. Change in v4: 1. Fixup the compatible. Change in v3: 1. Add a function to gain sensor id an remove dts id. Change in v2: 1. Remove error msg printing when addr ioremap has error. 2. Make loongson2 thermal driver was built-in by default. 3. Replace ls2k with loongson2. 4. Remove CONFIG_PM_SLEEP and set pm function type was __maybe_unused. MAINTAINERS | 7 ++ drivers/thermal/Kconfig | 12 ++ drivers/thermal/Makefile | 1 + drivers/thermal/loongson2_thermal.c | 169 ++++++++++++++++++++++++++++ 4 files changed, 189 insertions(+) create mode 100644 drivers/thermal/loongson2_thermal.c diff --git a/MAINTAINERS b/MAINTAINERS index 1089ef3319f2..f5015f20b0b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12373,6 +12373,13 @@ S: Maintained F: Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml F: drivers/pinctrl/pinctrl-loongson2.c +LOONGSON-2 SOC SERIES THERMAL DRIVER +M: zhanghongchen +M: Yinbo Zhu +L: linux-pm@vger.kernel.org +S: Maintained +F: drivers/thermal/loongson2_thermal.c + LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) M: Sathya Prakash M: Sreekanth Reddy diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 19a4b33cb564..c81a00fbca7d 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -510,4 +510,16 @@ config KHADAS_MCU_FAN_THERMAL If you say yes here you get support for the FAN controlled by the Microcontroller found on the Khadas VIM boards. +config LOONGSON2_THERMAL + tristate "Loongson-2 SoC series thermal driver" + depends on LOONGARCH || COMPILE_TEST + depends on OF + help + Support for Thermal driver found on Loongson-2 SoC series platforms. + The thermal driver realizes get_temp and set_trips function, which + are used to obtain the temperature of the current node and set the + temperature range to trigger the interrupt. When the input temperature + is higher than the high temperature threshold or lower than the low + temperature threshold, the interrupt will occur. + endif diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 058664bc3ec0..c934cab309ae 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -63,3 +63,4 @@ obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o obj-$(CONFIG_AMLOGIC_THERMAL) += amlogic_thermal.o obj-$(CONFIG_SPRD_THERMAL) += sprd_thermal.o obj-$(CONFIG_KHADAS_MCU_FAN_THERMAL) += khadas_mcu_fan.o +obj-$(CONFIG_LOONGSON2_THERMAL) += loongson2_thermal.o diff --git a/drivers/thermal/loongson2_thermal.c b/drivers/thermal/loongson2_thermal.c new file mode 100644 index 000000000000..133098dc0854 --- /dev/null +++ b/drivers/thermal/loongson2_thermal.c @@ -0,0 +1,169 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Author: zhanghongchen + * Yinbo Zhu + * Copyright (C) 2022-2023 Loongson Technology Corporation Limited + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "thermal_hwmon.h" + +#define LOONGSON2_MAX_SENSOR_SEL_NUM 3 + +#define LOONGSON2_THSENS_CTRL_HI_REG 0x0 +#define LOONGSON2_THSENS_CTRL_LOW_REG 0x8 +#define LOONGSON2_THSENS_STATUS_REG 0x10 +#define LOONGSON2_THSENS_OUT_REG 0x14 + +#define LOONGSON2_THSENS_INT_LO BIT(0) +#define LOONGSON2_THSENS_INT_HIGH BIT(1) +#define LOONGSON2_THSENS_OUT_MASK 0xFF + +struct loongson2_thermal_chip_data { + unsigned int thermal_sensor_sel; +}; + +struct loongson2_thermal_data { + void __iomem *regs; + const struct loongson2_thermal_chip_data *chip_data; +}; + +static int loongson2_thermal_set(struct loongson2_thermal_data *data, + int low, int high, bool enable) +{ + u64 reg_ctrl = 0; + int reg_off = data->chip_data->thermal_sensor_sel * 2; + + low = clamp(-40, low, high); + high = clamp(125, low, high); + + low += HECTO; + high += HECTO; + + reg_ctrl = low; + reg_ctrl |= enable ? 0x100 : 0; + writew(reg_ctrl, data->regs + LOONGSON2_THSENS_CTRL_LOW_REG + reg_off); + + reg_ctrl = high; + reg_ctrl |= enable ? 0x100 : 0; + writew(reg_ctrl, data->regs + LOONGSON2_THSENS_CTRL_HI_REG + reg_off); + + return 0; +} + +static int loongson2_thermal_get_temp(struct thermal_zone_device *tz, int *temp) +{ + u32 reg_val; + struct loongson2_thermal_data *data = thermal_zone_device_priv(tz); + + reg_val = readl(data->regs + LOONGSON2_THSENS_OUT_REG); + *temp = ((reg_val & LOONGSON2_THSENS_OUT_MASK) - HECTO) * KILO; + + return 0; +} + +static irqreturn_t loongson2_thermal_irq_thread(int irq, void *dev) +{ + struct thermal_zone_device *tzd = dev; + struct loongson2_thermal_data *data = thermal_zone_device_priv(tzd); + + writeb(LOONGSON2_THSENS_INT_LO | LOONGSON2_THSENS_INT_HIGH, data->regs + + LOONGSON2_THSENS_STATUS_REG); + + thermal_zone_device_update(tzd, THERMAL_EVENT_UNSPECIFIED); + + return IRQ_HANDLED; +} + +static int loongson2_thermal_set_trips(struct thermal_zone_device *tz, int low, int high) +{ + struct loongson2_thermal_data *data = thermal_zone_device_priv(tz); + + return loongson2_thermal_set(data, low/MILLI, high/MILLI, true); +} + +static const struct thermal_zone_device_ops loongson2_of_thermal_ops = { + .get_temp = loongson2_thermal_get_temp, + .set_trips = loongson2_thermal_set_trips, +}; + +static int loongson2_thermal_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct loongson2_thermal_data *data; + struct thermal_zone_device *tzd; + int ret, irq, i; + + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->chip_data = device_get_match_data(dev); + + data->regs = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(data->regs)) + return PTR_ERR(data->regs); + + irq = platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + + writeb(LOONGSON2_THSENS_INT_LO | LOONGSON2_THSENS_INT_HIGH, data->regs + + LOONGSON2_THSENS_STATUS_REG); + + loongson2_thermal_set(data, 0, 0, false); + + for (i = 0; i <= LOONGSON2_MAX_SENSOR_SEL_NUM; i++) { + tzd = devm_thermal_of_zone_register(dev, i, data, + &loongson2_of_thermal_ops); + + if (!IS_ERR(tzd)) + break; + + if (PTR_ERR(tzd) != ENODEV) + continue; + + return dev_err_probe(dev, PTR_ERR(tzd), "failed to register"); + } + + ret = devm_request_threaded_irq(dev, irq, NULL, loongson2_thermal_irq_thread, + IRQF_ONESHOT, "loongson2_thermal", tzd); + if (ret < 0) + return dev_err_probe(dev, ret, "failed to request alarm irq\n"); + + devm_thermal_add_hwmon_sysfs(dev, tzd); + + return 0; +} + +static const struct loongson2_thermal_chip_data loongson2_thermal_ls2k1000_data = { + .thermal_sensor_sel = 0, +}; + +static const struct of_device_id of_loongson2_thermal_match[] = { + { + .compatible = "loongson,ls2k1000-thermal", + .data = &loongson2_thermal_ls2k1000_data, + }, + { /* end */ } +}; +MODULE_DEVICE_TABLE(of, of_loongson2_thermal_match); + +static struct platform_driver loongson2_thermal_driver = { + .driver = { + .name = "loongson2_thermal", + .of_match_table = of_loongson2_thermal_match, + }, + .probe = loongson2_thermal_probe, +}; +module_platform_driver(loongson2_thermal_driver); + +MODULE_DESCRIPTION("Loongson2 thermal driver"); +MODULE_LICENSE("GPL"); From patchwork Thu Aug 17 02:10:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 714526 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7FADC2FC04 for ; Thu, 17 Aug 2023 02:11:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237258AbjHQCKg (ORCPT ); Wed, 16 Aug 2023 22:10:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347580AbjHQCKa (ORCPT ); Wed, 16 Aug 2023 22:10:30 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 152402712; Wed, 16 Aug 2023 19:10:27 -0700 (PDT) Received: from loongson.cn (unknown [10.20.42.201]) by gateway (Coremail) with SMTP id _____8CxLOuSgd1kcFYZAA--.46707S3; Thu, 17 Aug 2023 10:10:26 +0800 (CST) Received: from localhost.localdomain (unknown [10.20.42.201]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Dx4eSBgd1kMmpcAA--.30172S3; Thu, 17 Aug 2023 10:10:23 +0800 (CST) From: Yinbo Zhu To: "Rafael J . Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Rob Herring , Krzysztof Kozlowski , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jianmin Lv , wanghongliang@loongson.cn, loongson-kernel@lists.loongnix.cn, Yinbo Zhu , zhanghongchen , Krzysztof Kozlowski Subject: [PATCH v16 2/2] thermal: dt-bindings: add loongson-2 thermal Date: Thu, 17 Aug 2023 10:10:07 +0800 Message-Id: <20230817021007.10350-2-zhuyinbo@loongson.cn> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230817021007.10350-1-zhuyinbo@loongson.cn> References: <20230817021007.10350-1-zhuyinbo@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Dx4eSBgd1kMmpcAA--.30172S3 X-CM-SenderInfo: 52kx5xhqerqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add the Loongson-2 thermal binding with DT schema format using json-schema. Signed-off-by: Yinbo Zhu Reviewed-by: Krzysztof Kozlowski --- Change in v16: 1. NO change, but other patch in this series of patches set has changes. Change in v15: 1. Use the specific compatible. Change in v14: 1. NO change, but other patch in this series of patches set has changes. Change in v13: 1. Drop the sensor id. Change in v12: 1. NO change, but other patch in this series of patches set has changes. Change in v11: 1. NO change, but other patch in this series of patches set has changes. Change in v10: 1. Add all history change log information. Change in v9: 1. NO change, but other patch in this series of patches set has changes. Change in v8: 1. Replace string Loongson2/loongson2 with Loongson-2/loongson-2. Change in v7: 1. Split the modification of patch 3 and merge it into this patch. Change in v6: 1. Fix the warning "reg: [[0, 534779136], [0, 48]] is too long" when compile the yaml. Change in v5: 1. Keep use same quotes "'" in all places. Change in v4: 1. Fixup the compatible. 2. Update the binding file name. 3. Include irq.h to fix compile issue. Change in v3: 1. Remove the sensor id. 2. Remove the interrupt-parent in thermal required property. 3. Update the thermal binding file name. 4. Fixup the commit log information. Change in v2: 1. Add description and type about the "id". 2. Make the filename was based on compatible. .../thermal/loongson,ls2k-thermal.yaml | 44 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 45 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml diff --git a/Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml b/Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml new file mode 100644 index 000000000000..7538469997f9 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml @@ -0,0 +1,44 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/thermal/loongson,ls2k-thermal.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Thermal sensors on Loongson-2 SoCs + +maintainers: + - zhanghongchen + - Yinbo Zhu + +properties: + compatible: + oneOf: + - enum: + - loongson,ls2k1000-thermal + - items: + - enum: + - loongson,ls2k2000-thermal + - const: loongson,ls2k1000-thermal + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false + +examples: + - | + #include + thermal: thermal-sensor@1fe01500 { + compatible = "loongson,ls2k1000-thermal"; + reg = <0x1fe01500 0x30>; + interrupt-parent = <&liointc0>; + interrupts = <7 IRQ_TYPE_LEVEL_LOW>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index f5015f20b0b3..da97f44b53f0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12378,6 +12378,7 @@ M: zhanghongchen M: Yinbo Zhu L: linux-pm@vger.kernel.org S: Maintained +F: Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml F: drivers/thermal/loongson2_thermal.c LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)