Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp406526pxk; Fri, 11 Sep 2020 10:02:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvd5zlHPAo7mJiIUjLWxz0Rj3EPllNyyXOmEZA/rCrc4IrWbSwfGwFNtmRO3i+VP2qJHVb X-Received: by 2002:a17:906:4e54:: with SMTP id g20mr3057758ejw.252.1599843771041; Fri, 11 Sep 2020 10:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599843771; cv=none; d=google.com; s=arc-20160816; b=AgvCYSH2ij0SFKt7Y3NWqm2ErJGTssgsBYrfXepjlwBrvA3gDP1QG7rWBTNcMLVWNs ColWZVLMflt/N9IsarfrcVYPuXh5Q6wzaNV06sNtV/dSFXEN8Pr7rt6cJvo3gC3KuJsR bghbspYfG/HlxrjeseshSQGbdVc8et7x9T5e24SZUbbQAoP42eZ446FMuEPwbaFdAzQg AYio03F2mTYUiGyGqe98oVQr/9MmnTE+Jri7IlM65pqyVtR/FlP0X+/IeuBkQZ4Zk7QH On8RllFqUuYIKo4PjXfMzImo29Ix7C1pW48dAHUXN0ME1U8RCT8t8vE2ZhYErhb7vJc8 2Nxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent :content-transfer-encoding:references:in-reply-to:date:cc:to:from :subject:message-id; bh=LXeA/a6FzQ0klEt/soKZlUdrjjvY6NZs4q2a4jn6Sjo=; b=Z2NFlq2TKjgAmE8/Jr7E8gHqCWGnst6UA0YUQI5yXd8kLM01kNJNwW6e6zrQGE+MW3 vLdTirVztWWKN/uqHAq6kwp5T/XkSoB1tLamJnu+Pur94rdfhHT/zQrkzDItkJhdcy4D ITBqM3Sac7JF3aviW7Ng4uX3/EsvQSaBn/pJyn+OTjM5GkyR2Ss3d7JygaH+BE93Hzrz mTzAiZfFiVXZLqTIZpJlQUfBBY9lUssEEwTUmk6WecSZinTvZ/9emOax6jHfMXzKj2C9 E6F7oxijiPLiUvKpwHIZP4y1T+en4veTqVEojBdlMnyzdGAy4cQ9R4mABRgdF5KRsTRH yJXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x11si1807252edl.498.2020.09.11.10.02.28; Fri, 11 Sep 2020 10:02:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726327AbgIKRB5 convert rfc822-to-8bit (ORCPT + 99 others); Fri, 11 Sep 2020 13:01:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726084AbgIKPEQ (ORCPT ); Fri, 11 Sep 2020 11:04:16 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B188C06137C for ; Fri, 11 Sep 2020 07:43:39 -0700 (PDT) Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kGkGy-0005we-Oo; Fri, 11 Sep 2020 16:43:32 +0200 Received: from pza by lupine with local (Exim 4.92) (envelope-from ) id 1kGkGw-0004SM-2N; Fri, 11 Sep 2020 16:43:30 +0200 Message-ID: Subject: Re: [PATCH v12 2/2] Add PWM fan controller driver for LGM SoC From: Philipp Zabel To: Rahul Tanwar , u.kleine-koenig@pengutronix.de, linux-pwm@vger.kernel.org, lee.jones@linaro.org Cc: thierry.reding@gmail.com, robh+dt@kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, andriy.shevchenko@intel.com, songjun.Wu@intel.com, cheol.yong.kim@intel.com, qi-ming.wu@intel.com, rahul.tanwar.linux@gmail.com, rtanwar@maxlinear.com Date: Fri, 11 Sep 2020 16:43:30 +0200 In-Reply-To: <300eddab8fef7bbac011638e54099a8c1fc8f62a.1599637734.git.rahul.tanwar@linux.intel.com> References: <300eddab8fef7bbac011638e54099a8c1fc8f62a.1599637734.git.rahul.tanwar@linux.intel.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rahul, I just have some small nitpicks, see below: On Wed, 2020-09-09 at 15:51 +0800, Rahul Tanwar wrote: > Intel Lightning Mountain(LGM) SoC contains a PWM fan controller. > This PWM controller does not have any other consumer, it is a > dedicated PWM controller for fan attached to the system. Add > driver for this PWM fan controller. > > Signed-off-by: Rahul Tanwar > Reviewed-by: Andy Shevchenko > --- > drivers/pwm/Kconfig | 11 ++ > drivers/pwm/Makefile | 1 + > drivers/pwm/pwm-intel-lgm.c | 253 ++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 265 insertions(+) > create mode 100644 drivers/pwm/pwm-intel-lgm.c > > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index 7dbcf6973d33..4949c51fe90b 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -232,6 +232,17 @@ config PWM_IMX_TPM > To compile this driver as a module, choose M here: the module > will be called pwm-imx-tpm. > > +config PWM_INTEL_LGM > + tristate "Intel LGM PWM support" > + depends on HAS_IOMEM > + depends on (OF && X86) || COMPILE_TEST > + select REGMAP_MMIO > + help > + Generic PWM fan controller driver for LGM SoC. > + > + To compile this driver as a module, choose M here: the module > + will be called pwm-intel-lgm. > + > config PWM_IQS620A > tristate "Azoteq IQS620A PWM support" > depends on MFD_IQS62X || COMPILE_TEST > diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile > index 2c2ba0a03557..e9431b151694 100644 > --- a/drivers/pwm/Makefile > +++ b/drivers/pwm/Makefile > @@ -20,6 +20,7 @@ obj-$(CONFIG_PWM_IMG) += pwm-img.o > obj-$(CONFIG_PWM_IMX1) += pwm-imx1.o > obj-$(CONFIG_PWM_IMX27) += pwm-imx27.o > obj-$(CONFIG_PWM_IMX_TPM) += pwm-imx-tpm.o > +obj-$(CONFIG_PWM_INTEL_LGM) += pwm-intel-lgm.o > obj-$(CONFIG_PWM_IQS620A) += pwm-iqs620a.o > obj-$(CONFIG_PWM_JZ4740) += pwm-jz4740.o > obj-$(CONFIG_PWM_LP3943) += pwm-lp3943.o > diff --git a/drivers/pwm/pwm-intel-lgm.c b/drivers/pwm/pwm-intel-lgm.c > new file mode 100644 > index 000000000000..8e9f8cd3b7fb > --- /dev/null > +++ b/drivers/pwm/pwm-intel-lgm.c > @@ -0,0 +1,253 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2020 Intel Corporation. > + * > + * Limitations: > + * - The hardware supports fixed period which is dependent on 2/3 or 4 > + * wire fan mode. > + * - Supports normal polarity. Does not support changing polarity. > + * - When PWM is disabled, output of PWM will become 0(inactive). It doesn't > + * keep track of running period. > + * - When duty cycle is changed, PWM output may be a mix of previous setting > + * and new setting for the first period. From second period, the output is > + * based on new setting. > + * - It is a dedicated PWM fan controller. There are no other consumers for > + * this PWM controller. > + */ > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define LGM_PWM_FAN_CON0 0x0 > +#define LGM_PWM_FAN_EN_EN BIT(0) > +#define LGM_PWM_FAN_EN_DIS 0x0 > +#define LGM_PWM_FAN_EN_MSK BIT(0) > +#define LGM_PWM_FAN_MODE_2WIRE 0x0 > +#define LGM_PWM_FAN_MODE_MSK BIT(1) > +#define LGM_PWM_FAN_DC_MSK GENMASK(23, 16) > + > +#define LGM_PWM_FAN_CON1 0x4 > +#define LGM_PWM_FAN_MAX_RPM_MSK GENMASK(15, 0) > + > +#define LGM_PWM_MAX_RPM (BIT(16) - 1) > +#define LGM_PWM_DEFAULT_RPM 4000 > +#define LGM_PWM_MAX_DUTY_CYCLE (BIT(8) - 1) > + > +#define LGM_PWM_DC_BITS 8 > + > +#define LGM_PWM_PERIOD_2WIRE_NS (40 * NSEC_PER_MSEC) > + > +struct lgm_pwm_chip { > + struct pwm_chip chip; > + struct regmap *regmap; > + struct clk *clk; > + struct reset_control *rst; > + u32 period; > +}; > + > +static inline struct lgm_pwm_chip *to_lgm_pwm_chip(struct pwm_chip *chip) > +{ > + return container_of(chip, struct lgm_pwm_chip, chip); > +} > + > +static int lgm_pwm_enable(struct pwm_chip *chip, bool enable) > +{ > + struct lgm_pwm_chip *pc = to_lgm_pwm_chip(chip); > + struct regmap *regmap = pc->regmap; > + > + return regmap_update_bits(regmap, LGM_PWM_FAN_CON0, LGM_PWM_FAN_EN_MSK, > + enable ? LGM_PWM_FAN_EN_EN : LGM_PWM_FAN_EN_DIS); > +} > + > +static int lgm_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, > + const struct pwm_state *state) > +{ > + struct lgm_pwm_chip *pc = to_lgm_pwm_chip(chip); > + u32 duty_cycle, val; > + int ret; > + > + /* > + * The hardware only supports > + * normal polarity and fixed period. > + */ That comment could be put on a single line. > + if (state->polarity != PWM_POLARITY_NORMAL || state->period < pc->period) > + return -EINVAL; > + > + if (!state->enabled) > + return lgm_pwm_enable(chip, 0); > + > + duty_cycle = min_t(u64, state->duty_cycle, pc->period); > + val = duty_cycle * LGM_PWM_MAX_DUTY_CYCLE / pc->period; > + > + ret = regmap_update_bits(pc->regmap, LGM_PWM_FAN_CON0, LGM_PWM_FAN_DC_MSK, > + FIELD_PREP(LGM_PWM_FAN_DC_MSK, val)); > + if (ret) > + return ret; > + > + return lgm_pwm_enable(chip, 1); > +} > + > +static void lgm_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, > + struct pwm_state *state) > +{ > + struct lgm_pwm_chip *pc = to_lgm_pwm_chip(chip); > + u32 duty, val; > + > + state->enabled = regmap_test_bits(pc->regmap, LGM_PWM_FAN_CON0, > + LGM_PWM_FAN_EN_EN); > + state->polarity = PWM_POLARITY_NORMAL; > + state->period = pc->period; /* fixed period */ > + > + regmap_read(pc->regmap, LGM_PWM_FAN_CON0, &val); > + duty = FIELD_GET(LGM_PWM_FAN_DC_MSK, val); > + state->duty_cycle = DIV_ROUND_UP(duty * pc->period, LGM_PWM_MAX_DUTY_CYCLE); > +} > + > +static const struct pwm_ops lgm_pwm_ops = { > + .get_state = lgm_pwm_get_state, > + .apply = lgm_pwm_apply, > + .owner = THIS_MODULE, > +}; > + > +static void lgm_pwm_init(struct lgm_pwm_chip *pc) > +{ > + struct regmap *regmap = pc->regmap; > + u32 con0_val; > + > + con0_val = FIELD_PREP(LGM_PWM_FAN_MODE_MSK, LGM_PWM_FAN_MODE_2WIRE); > + pc->period = LGM_PWM_PERIOD_2WIRE_NS; > + regmap_update_bits(regmap, LGM_PWM_FAN_CON1, LGM_PWM_FAN_MAX_RPM_MSK, > + LGM_PWM_DEFAULT_RPM); > + regmap_update_bits(regmap, LGM_PWM_FAN_CON0, LGM_PWM_FAN_MODE_MSK, > + con0_val); > +} > + > +static const struct regmap_config lgm_pwm_regmap_config = { > + .reg_bits = 32, > + .reg_stride = 4, > + .val_bits = 32, > +}; > + > +static void lgm_clk_disable(void *data) > +{ > + struct lgm_pwm_chip *pc = data; > + > + clk_disable_unprepare(pc->clk); > +} > + > +static int lgm_clk_enable(struct device *dev, struct lgm_pwm_chip *pc) > +{ > + int ret; > + > + ret = clk_prepare_enable(pc->clk); > + if (ret) > + return ret; > + > + return devm_add_action_or_reset(dev, lgm_clk_disable, pc); > +} > + > +static void lgm_reset_control_assert(void *data) > +{ > + struct lgm_pwm_chip *pc = data; > + > + reset_control_assert(pc->rst); > +} > + > +static int lgm_reset_control_deassert(struct device *dev, struct lgm_pwm_chip *pc) > +{ > + int ret; > + > + ret = reset_control_deassert(pc->rst); > + if (ret) > + return ret; > + > + return devm_add_action_or_reset(dev, lgm_reset_control_assert, pc); > +} > + > +static int lgm_pwm_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct lgm_pwm_chip *pc; > + void __iomem *io_base; > + int ret; > + > + pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL); > + if (!pc) > + return -ENOMEM; > + > + io_base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(io_base)) > + return PTR_ERR(io_base); > + > + pc->regmap = devm_regmap_init_mmio(dev, io_base, &lgm_pwm_regmap_config); > + if (IS_ERR(pc->regmap)) > + return dev_err_probe(dev, PTR_ERR(pc->regmap), > + "failed to init register map\n"); > + > + pc->rst = devm_reset_control_get_exclusive(dev, NULL); > + if (IS_ERR(pc->rst)) > + return dev_err_probe(dev, PTR_ERR(pc->rst), > + "failed to get reset control\n"); > + > + ret = lgm_reset_control_deassert(dev, pc); > + if (ret) > + return dev_err_probe(dev, ret, "cannot deassert reset control\n"); I would request all resources before deasserting the reset, that way -EPROBE_DEFER due to missing clocks would keep the controller in reset. > + pc->clk = devm_clk_get(dev, NULL); > + if (IS_ERR(pc->clk)) > + return dev_err_probe(dev, PTR_ERR(pc->clk), "failed to get clock\n"); > + > + ret = lgm_clk_enable(dev, pc); > + if (ret) { > + dev_err(dev, "failed to enable clock\n"); > + return ret; > + } > + > + pc->chip.dev = dev; > + pc->chip.ops = &lgm_pwm_ops; > + pc->chip.npwm = 1; > + > + lgm_pwm_init(pc); > + > + ret = pwmchip_add(&pc->chip); > + if (ret < 0) { > + dev_err(dev, "failed to add PWM chip: %pe\n", ERR_PTR(ret)); > + return ret; > + } > + > + platform_set_drvdata(pdev, pc); > + return 0; > +} > + > +static int lgm_pwm_remove(struct platform_device *pdev) > +{ > + struct lgm_pwm_chip *pc = platform_get_drvdata(pdev); > + int ret; > + > + ret = pwmchip_remove(&pc->chip); > + if (ret < 0) > + return ret; > + > + return 0; You could just return pwmchip_remove(&pc->chip); here. regards Philipp