From patchwork Sat Nov 28 17:49:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Barker X-Patchwork-Id: 11937821 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16C31C63777 for ; Sat, 28 Nov 2020 18:00:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF907246E2 for ; Sat, 28 Nov 2020 18:00:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=konsulko.com header.i=@konsulko.com header.b="iYhPCMnM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726428AbgK1R76 (ORCPT ); Sat, 28 Nov 2020 12:59:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733041AbgK1R56 (ORCPT ); Sat, 28 Nov 2020 12:57:58 -0500 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE5A5C0A3BE1 for ; Sat, 28 Nov 2020 09:49:14 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id i2so9088762wrs.4 for ; Sat, 28 Nov 2020 09:49:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OWJXix7etR7ol53lyfN4QIUMtYkbtgEfChWSHg07ktY=; b=iYhPCMnMdlVRhexYkd0/KP72eUm5RdgTEGFH1v985ukMif/uQdPo/8mVjRhSErj0YS j7mCwlyDiRI1pUFcAd9u1RX7+hxYGdV937CflKZwlnlWylyY1wsyP/lnicxVYxEJnz7i 7y6XcnR6vNgpTYx1NBGP34nW2CVOLz2EFbZt0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OWJXix7etR7ol53lyfN4QIUMtYkbtgEfChWSHg07ktY=; b=nFsgMF/vZZkZKORHK0QirlrIe6xulPxMPgt7p3MzxEuwZsHz/FVsVUu6X+wM4XV+k4 mgSiplZkXoiI0khmH0cAN2blJHQpZb3MWVb4FLgUoNTZVBOSLYP87lmj2S6QmQHOsYa1 IjdB2nSPCYqO5wpAuXss7mp0wt5Q4ZtszAOV2WYIh+ZYMbeMm6XPsah8cRaTqjWcErg1 vRP6vksIwK3B+ke2hoYqPD6u67V99hKBNqhn67XjQOYQ+WBJpBPzUxh4A/JDmFyyLbo/ xiLmZ4Lq1rIvujfCLaLDdK7CuOJCPzDAoiqdW7ffI3xqPoM9S+NNKnJjyHV9eMhwHQt4 T7JA== X-Gm-Message-State: AOAM53114aaTjML2JZMcKFIZdAy6UZ1FI7c0gC5QGmoSOrKB0xvR1jUT eNvKChq1ibmXyDa5yipv+1nkHw== X-Google-Smtp-Source: ABdhPJyDX2d7BqdCwbUplmhK34PZyJU6RoJc8Rk9rsdget8jgjgJTGIQvxAhDoxRBpBdz98t177YbA== X-Received: by 2002:adf:ed12:: with SMTP id a18mr18762767wro.5.1606585753319; Sat, 28 Nov 2020 09:49:13 -0800 (PST) Received: from alpha.home.b5net.uk (cpc76148-clif11-2-0-cust524.12-4.cable.virginm.net. [82.1.54.13]) by smtp.gmail.com with ESMTPSA id s133sm17991481wmf.38.2020.11.28.09.49.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 09:49:12 -0800 (PST) From: Paul Barker To: Kamil Debski , Bartlomiej Zolnierkiewicz , Jean Delvare , Guenter Roeck Cc: Paul Barker , linux-hwmon@vger.kernel.org Subject: [PATCH v2 1/2] hwmon: pwm-fan: Refactor pwm_fan_probe Date: Sat, 28 Nov 2020 17:49:08 +0000 Message-Id: <20201128174909.26687-2-pbarker@konsulko.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201128174909.26687-1-pbarker@konsulko.com> References: <20201128174909.26687-1-pbarker@konsulko.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org Use platform_irq_count to determine the number of fan tachometer inputs configured in the device tree. At this stage we support either 0 or 1 inputs. Once we have this information we only need to read the pulses-per-revolution value if a fan tachometer is actually configured via an IRQ value. Also add a debug print of the IRQ number and the pulses-per-revolution value to aid in investigating issues. Signed-off-by: Paul Barker Reviewed-by: Guenter Roeck --- drivers/hwmon/pwm-fan.c | 50 +++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index 1f63807c0399..efe2764f42d3 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -286,7 +286,7 @@ static int pwm_fan_probe(struct platform_device *pdev) struct device *hwmon; int ret; struct pwm_state state = { }; - u32 ppr = 2; + int tach_count; ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -300,10 +300,6 @@ static int pwm_fan_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); - ctx->irq = platform_get_irq_optional(pdev, 0); - if (ctx->irq == -EPROBE_DEFER) - return ctx->irq; - ctx->reg_en = devm_regulator_get_optional(dev, "fan"); if (IS_ERR(ctx->reg_en)) { if (PTR_ERR(ctx->reg_en) != -ENODEV) @@ -339,20 +335,40 @@ static int pwm_fan_probe(struct platform_device *pdev) if (ret) return ret; - of_property_read_u32(dev->of_node, "pulses-per-revolution", &ppr); - ctx->pulses_per_revolution = ppr; - if (!ctx->pulses_per_revolution) { - dev_err(dev, "pulses-per-revolution can't be zero.\n"); - return -EINVAL; - } + tach_count = platform_irq_count(pdev); + if (tach_count < 0) + return dev_err_probe(dev, tach_count, + "Could not get number of fan tachometer inputs\n"); + + if (tach_count > 0) { + u32 ppr = 2; + + ctx->irq = platform_get_irq(pdev, 0); + if (ctx->irq == -EPROBE_DEFER) + return ctx->irq; + if (ctx->irq > 0) { + ret = devm_request_irq(dev, ctx->irq, pulse_handler, 0, + pdev->name, ctx); + if (ret) { + dev_err(dev, + "Failed to request interrupt: %d\n", + ret); + return ret; + } + } - if (ctx->irq > 0) { - ret = devm_request_irq(dev, ctx->irq, pulse_handler, 0, - pdev->name, ctx); - if (ret) { - dev_err(dev, "Failed to request interrupt: %d\n", ret); - return ret; + of_property_read_u32(dev->of_node, + "pulses-per-revolution", + &ppr); + ctx->pulses_per_revolution = ppr; + if (!ctx->pulses_per_revolution) { + dev_err(dev, "pulses-per-revolution can't be zero.\n"); + return -EINVAL; } + + dev_dbg(dev, "tach: irq=%d, pulses_per_revolution=%d\n", + ctx->irq, ctx->pulses_per_revolution); + ctx->sample_start = ktime_get(); mod_timer(&ctx->rpm_timer, jiffies + HZ); } From patchwork Sat Nov 28 17:49:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Barker X-Patchwork-Id: 11938401 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 043B3C8302C for ; Sat, 28 Nov 2020 22:18:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9BFC21D40 for ; Sat, 28 Nov 2020 22:17:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=konsulko.com header.i=@konsulko.com header.b="BtQWU9pA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388769AbgK1Vto (ORCPT ); Sat, 28 Nov 2020 16:49:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730463AbgK1SBE (ORCPT ); Sat, 28 Nov 2020 13:01:04 -0500 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B03E1C0A3BE2 for ; Sat, 28 Nov 2020 09:49:15 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id 64so9079101wra.11 for ; Sat, 28 Nov 2020 09:49:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZA+cL4kDe6tWsWvp92DpEef7N1lz6zfAke9oO/x+rFQ=; b=BtQWU9pAj1qeeik0zej2R/e+gKKcGFF6CT1tE4f63wSfFWFzBf1WpSCiAu01PutRX+ qe1JjMUfRWJuo69/cVoKWv0CBRVe1+Yv2cSDu0q97FgpAxjqKLYyPpORUGFqCmBWNFq+ JQPbgmAOa5cYTmyGB3yJ2FuCl0pzpnl6JcLx4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZA+cL4kDe6tWsWvp92DpEef7N1lz6zfAke9oO/x+rFQ=; b=sFCMpCPRzhuhjwiB9s2zkaESw1RCp9tlu9QDiJ8pkbIiqcoQUTRLlo01ZSc26jbxmR KvpNh/kFZtxDmi9TrZsYdNBMg2wKK6JoQ4JXoVia4xOIBUO65VEN/wOjLKNU8HrKWefk jNc5OFkoIgmLalOTQCoPNIIUX9Wq0cNCkg3xrjWNS9JPmRQF4bvPrBV2dLPZh2iHBdiz 5y6LmUfmPfZtmf9EwyBeaSeIuc4dQW10bKML9zX3UUVm2ZC5DaIJ5zsNS/iFpkDbQ/NF gIVOxjVXtVzwiCzFK/6qzeVktInOFulu5Mn53VteVcxP4zjfypeyiqJLYEYeAGg81tbR geUA== X-Gm-Message-State: AOAM533OEq4XlsDGZcS+v4C+p35HLMBbpq98/x+Nq7v1MEFXmVyDQhyh yqYwakS4LgckMBaTDlV2/3SZG9pOXbVkZQ== X-Google-Smtp-Source: ABdhPJwMsMtKM0iy7Nw0X3WnXQhq56gEMCF59JAFtZZxhENLouPwnZ5/FfD7jSA3I4pASOqfMDcTZg== X-Received: by 2002:adf:f1d2:: with SMTP id z18mr19611075wro.244.1606585754474; Sat, 28 Nov 2020 09:49:14 -0800 (PST) Received: from alpha.home.b5net.uk (cpc76148-clif11-2-0-cust524.12-4.cable.virginm.net. [82.1.54.13]) by smtp.gmail.com with ESMTPSA id s133sm17991481wmf.38.2020.11.28.09.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 09:49:13 -0800 (PST) From: Paul Barker To: Kamil Debski , Bartlomiej Zolnierkiewicz , Jean Delvare , Guenter Roeck Cc: Paul Barker , linux-hwmon@vger.kernel.org Subject: [PATCH v2 2/2] hwmon: pwm-fan: Convert to hwmon_device_register_with_info API Date: Sat, 28 Nov 2020 17:49:09 +0000 Message-Id: <20201128174909.26687-3-pbarker@konsulko.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201128174909.26687-1-pbarker@konsulko.com> References: <20201128174909.26687-1-pbarker@konsulko.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org The pwm-fan driver is updated to use the recommended API. Signed-off-by: Paul Barker --- drivers/hwmon/pwm-fan.c | 114 +++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 43 deletions(-) diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index efe2764f42d3..57b574837b58 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -8,7 +8,6 @@ */ #include -#include #include #include #include @@ -39,6 +38,28 @@ struct pwm_fan_ctx { unsigned int pwm_fan_max_state; unsigned int *pwm_fan_cooling_levels; struct thermal_cooling_device *cdev; + + struct hwmon_chip_info info; +}; + +static const u32 pwm_fan_channel_config_pwm[] = { + HWMON_PWM_INPUT, + 0 +}; + +static const struct hwmon_channel_info pwm_fan_channel_pwm = { + .type = hwmon_pwm, + .config = pwm_fan_channel_config_pwm, +}; + +static const u32 pwm_fan_channel_config_fan[] = { + HWMON_F_INPUT, + 0 +}; + +static const struct hwmon_channel_info pwm_fan_channel_fan = { + .type = hwmon_fan, + .config = pwm_fan_channel_config_fan, }; /* This handler assumes self resetting edge triggered interrupt. */ @@ -103,70 +124,64 @@ static void pwm_fan_update_state(struct pwm_fan_ctx *ctx, unsigned long pwm) ctx->pwm_fan_state = i; } -static ssize_t pwm_store(struct device *dev, struct device_attribute *attr, - const char *buf, size_t count) +static int pwm_fan_write(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long val) { struct pwm_fan_ctx *ctx = dev_get_drvdata(dev); - unsigned long pwm; int ret; - if (kstrtoul(buf, 10, &pwm) || pwm > MAX_PWM) + if (val < 0 || val > MAX_PWM) return -EINVAL; - ret = __set_pwm(ctx, pwm); + ret = __set_pwm(ctx, val); if (ret) return ret; - pwm_fan_update_state(ctx, pwm); - return count; + pwm_fan_update_state(ctx, val); + return 0; } -static ssize_t pwm_show(struct device *dev, struct device_attribute *attr, - char *buf) +static int pwm_fan_read(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long *val) { struct pwm_fan_ctx *ctx = dev_get_drvdata(dev); - return sprintf(buf, "%u\n", ctx->pwm_value); -} + switch (type) { + case hwmon_pwm: + *val = ctx->pwm_value; + return 0; -static ssize_t rpm_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct pwm_fan_ctx *ctx = dev_get_drvdata(dev); + case hwmon_fan: + *val = ctx->rpm; + return 0; - return sprintf(buf, "%u\n", ctx->rpm); + default: + return -ENOTSUPP; + } } -static SENSOR_DEVICE_ATTR_RW(pwm1, pwm, 0); -static SENSOR_DEVICE_ATTR_RO(fan1_input, rpm, 0); +static umode_t pwm_fan_is_visible(const void *data, + enum hwmon_sensor_types type, + u32 attr, int channel) +{ + struct pwm_fan_ctx *ctx = (struct pwm_fan_ctx *)data; -static struct attribute *pwm_fan_attrs[] = { - &sensor_dev_attr_pwm1.dev_attr.attr, - &sensor_dev_attr_fan1_input.dev_attr.attr, - NULL, -}; + switch (type) { + case hwmon_pwm: + return 0644; -static umode_t pwm_fan_attrs_visible(struct kobject *kobj, struct attribute *a, - int n) -{ - struct device *dev = container_of(kobj, struct device, kobj); - struct pwm_fan_ctx *ctx = dev_get_drvdata(dev); + case hwmon_fan: + return 0444; - /* Hide fan_input in case no interrupt is available */ - if (n == 1 && ctx->irq <= 0) + default: return 0; - - return a->mode; + } } -static const struct attribute_group pwm_fan_group = { - .attrs = pwm_fan_attrs, - .is_visible = pwm_fan_attrs_visible, -}; - -static const struct attribute_group *pwm_fan_groups[] = { - &pwm_fan_group, - NULL, +static const struct hwmon_ops pwm_fan_hwmon_ops = { + .is_visible = pwm_fan_is_visible, + .read = pwm_fan_read, + .write = pwm_fan_write, }; /* thermal cooling device callbacks */ @@ -287,6 +302,7 @@ static int pwm_fan_probe(struct platform_device *pdev) int ret; struct pwm_state state = { }; int tach_count; + const struct hwmon_channel_info **channels; ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -340,6 +356,13 @@ static int pwm_fan_probe(struct platform_device *pdev) return dev_err_probe(dev, tach_count, "Could not get number of fan tachometer inputs\n"); + channels = devm_kcalloc(dev, tach_count + 2, + sizeof(struct hwmon_channel_info *), GFP_KERNEL); + if (!channels) + return -ENOMEM; + + channels[0] = &pwm_fan_channel_pwm; + if (tach_count > 0) { u32 ppr = 2; @@ -371,10 +394,15 @@ static int pwm_fan_probe(struct platform_device *pdev) ctx->sample_start = ktime_get(); mod_timer(&ctx->rpm_timer, jiffies + HZ); + + channels[1] = &pwm_fan_channel_fan; } - hwmon = devm_hwmon_device_register_with_groups(dev, "pwmfan", - ctx, pwm_fan_groups); + ctx->info.ops = &pwm_fan_hwmon_ops; + ctx->info.info = channels; + + hwmon = devm_hwmon_device_register_with_info(dev, "pwmfan", + ctx, &ctx->info, NULL); if (IS_ERR(hwmon)) { dev_err(dev, "Failed to register hwmon device\n"); return PTR_ERR(hwmon);