Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp394811rwr; Thu, 27 Apr 2023 02:58:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7NGFfeNz63ZXBMoT4NlQhozT9AJQ1KSvsybQwUEDalJs7RwWW3EXuozawP4A57pW9xLWwt X-Received: by 2002:a17:90a:1a01:b0:247:9e56:d895 with SMTP id 1-20020a17090a1a0100b002479e56d895mr1280400pjk.1.1682589481227; Thu, 27 Apr 2023 02:58:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682589481; cv=none; d=google.com; s=arc-20160816; b=FtDy0QvgYrYBFMmMsA9fa9umJBrn4fHC82guNz94abMgiwTX/lMU2Qed/+inqeudTO t0htUEZPxMd0EH5OxTurUrlkHT5sc1szlwhjAqvd0Lj1McFQGSCLftEUGdz9kTOYBRIc V6Xu/JAyGXybpWgR7SqTxwOhvIWP+BLdvzxmdzhBa3qrk7ktxQzve9rSA91BLekMlnD2 bUXU6V+P32kqHRAGIr8nTzIM6A47v84cuPtBcBdiDTDyiAqTo8X0bPqp3qLk0af0226X JhxUM0lOrFbWGCEH4ATA02pl4KwAhGXn2eGQYk9H4xmAQEa2sKv1GpnyRlMx6FJizlH2 HcHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=i1lRzLm8Q5sT0hR8L3YXnSXK7CGkudYt3w4gK1q1ZY0=; b=bI3Jth4cq6QCH1MBScA9mUul8lbowkLI7UmSW9UYrt1eba4NMXbWsvY+7hqOx8/H6O B2oCMFpVWOaRLI+uo4aVfOSLCXt7Z2IlY98KpP+UtVl74i6KQx1q8NjY6coWGo6Rk38h 0DIoCUirvfTiy4rSYAij3HkDamA4OQpXl/DSP7nZHmNtnwFB1o8MzCozKYn3i9UUMRp7 IikIl3OZv8GrfyVkjkRtGBiGwkyEkDA2adJEWGdni1oL93QZyUsIyPQhR/BW71MNJYzc o234pmGsYgtM7z6gYi3YFbX3qHc0inONBBya5wSk50vpaV8OBwZqYzUltigcQSPuycx6 Q0QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=CmIwa7tF; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020a17090a7b8a00b00247268002b5si17306811pjc.177.2023.04.27.02.57.47; Thu, 27 Apr 2023 02:58:01 -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; dkim=pass header.i=@9elements.com header.s=google header.b=CmIwa7tF; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243269AbjD0Juz (ORCPT + 99 others); Thu, 27 Apr 2023 05:50:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243393AbjD0Jun (ORCPT ); Thu, 27 Apr 2023 05:50:43 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE61C199C for ; Thu, 27 Apr 2023 02:50:41 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1a920d484bdso64852435ad.1 for ; Thu, 27 Apr 2023 02:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1682589041; x=1685181041; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=i1lRzLm8Q5sT0hR8L3YXnSXK7CGkudYt3w4gK1q1ZY0=; b=CmIwa7tF9W6qmkdbD0Vs0Y72MhX/jM+6ZqVK0/25t9jeNfAHLZ/e582aFEvPQvFNY7 XgHoAPLvYl9gdKjYnNTTIPBgimI2NHiYE8JJYNRwCWxyHQUvel+7Pt2I+011N6MpGhtN rawN3tP9WwD0T6O9xEQLeMkBW0BEBKtIXQKHj/+GzrUA57YI4KB3vY+HzKAVQrNXsGtB vPkYhdfDqJUY0sZ4HCmu4n6cMm9kbqdYidYv+i8on/Rh5N8NVi683M4q/xwdrLRjpR9W 8yKHC51BrIeVk0Gosa6YlgZuK3ziXDLT85uA43+bi58xYdorj4bkeCkQ90H9HNfJPhvd qwJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682589041; x=1685181041; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=i1lRzLm8Q5sT0hR8L3YXnSXK7CGkudYt3w4gK1q1ZY0=; b=J3+VU25u8879xEnGkSSrknoFCvQAW3gGpJrVykINtG3HNckg+7SSNvAeMv2qqcbWf3 PPNbOuEMjrzzswC9euSO1ixntCklVrS7i9FeOODGOznsH8v8iBx1peIswKMyLTAtIkLq 7WMse9+Zx1t+hwloGRH0zWsuVyt6RYAaBb1qma9I4QE40xfIYxggSnunirv1CJswRcXs wbJ0FTO2KMxigxHryr/APIpC5p94hUhDq0Z7cpP3dc2wSkmiZSUatr8O3RoqmyTCHBwJ D1xU1w+mUq7KQIykkhh7canpBB6R1Bv8HEDOI7K949DQaBtTW5EbseCCO/an24M/qL7G zz4w== X-Gm-Message-State: AC+VfDxWgNN+K3G7JvOzqj8w0wjsYDfb/TAbIAIosA1zdTXHlkZEFyju FQFcwcn4/1XJiuS1XbyvWA354A== X-Received: by 2002:a17:902:e5c9:b0:1a9:91d7:ba2 with SMTP id u9-20020a170902e5c900b001a991d70ba2mr1047373plf.48.1682589011131; Thu, 27 Apr 2023 02:50:11 -0700 (PDT) Received: from ?IPV6:2405:201:d02f:d855:461d:14be:2cce:b776? ([2405:201:d02f:d855:461d:14be:2cce:b776]) by smtp.gmail.com with ESMTPSA id t4-20020a170902b20400b001a96496f250sm7680896plr.34.2023.04.27.02.50.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 27 Apr 2023 02:50:10 -0700 (PDT) Message-ID: <5104bcd2-4203-e4f3-ac58-310fa4d45c7b@9elements.com> Date: Thu, 27 Apr 2023 15:20:09 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH] hwmon: (max597x) Add Maxim Max597x To: Guenter Roeck Cc: Jean Delvare , Patrick Rudolph , linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org References: <20230426090356.745979-1-Naresh.Solanki@9elements.com> <2579ed08-b21d-489e-8a40-8310efdfa1c4@roeck-us.net> Content-Language: en-US From: Naresh Solanki In-Reply-To: <2579ed08-b21d-489e-8a40-8310efdfa1c4@roeck-us.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE, 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 Hi Guenter, On 26-04-2023 08:05 pm, Guenter Roeck wrote: > On Wed, Apr 26, 2023 at 11:03:55AM +0200, Naresh Solanki wrote: >> From: Patrick Rudolph >> >> Add support for the Maxim Max59x power switch with current/voltage >> monitor. >> >> Signed-off-by: Patrick Rudolph >> Signed-off-by: Naresh Solanki > > Please no wildcards in file names or descriptions for hwmon drivers, > much less dual-digit wildcards. > > This patch does not add support for MAX597{0..9} (and much less for > MAX59{00..99}), only for MAX5970 and MAX5978. For example, it does not > and never will support MAX5977 because that chip does not have an I2C > interface, or MAX5974 which happens to be a PWM controller. > > Pick one of {5970,5978} for the file name, and mention both in > descriptions. Yes, I understand, this was accepted with wildcard > in mfd and regulator subsystems, but that doesn't make it acceptable > here. > > Either case, what does this driver provide that isn't already > available through drivers/regulator/max597x-regulator.c ? > As written, the driver doesn't support any of the limit or alarm > registers, and there seems to be quite some overlap with the regulator > driver in terms of functionality. Please explore if that is acceptable > for the regulator subsystem. If it is not, come back and we can continue > discussing feasibility as separate hwmon driver.Thanks for your feedback. I agree that file name wildcard doesn't makes sense here & there are other chips that aren't related to this driver. Hence will work on it to get it fixed for sure. Will check with regulator subsystem maintainers & based on feedback will proceed. Thanks :) > >> --- >> drivers/hwmon/Kconfig | 9 ++ >> drivers/hwmon/Makefile | 1 + >> drivers/hwmon/max597x.c | 212 ++++++++++++++++++++++++++++++++++++++++ > > Documentation missing. > >> 3 files changed, 222 insertions(+) >> create mode 100644 drivers/hwmon/max597x.c >> >> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig >> index 5b3b76477b0e..164d980d9de2 100644 >> --- a/drivers/hwmon/Kconfig >> +++ b/drivers/hwmon/Kconfig >> @@ -1097,6 +1097,15 @@ config SENSORS_MAX31760 >> This driver can also be built as a module. If so, the module >> will be called max31760. >> >> +config SENSORS_MAX597X >> + tristate "Maxim 597x power switch and monitor" >> + depends on I2C >> + depends on OF >> + select MFD_MAX597X > > That should be "depends on". Ack > >> + help >> + This driver exposes Maxim 5970/5978 voltage/current monitoring >> + interface. >> + >> config SENSORS_MAX6620 >> tristate "Maxim MAX6620 fan controller" >> depends on I2C >> diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile >> index 88712b5031c8..720eb7d5fe46 100644 >> --- a/drivers/hwmon/Makefile >> +++ b/drivers/hwmon/Makefile >> @@ -142,6 +142,7 @@ obj-$(CONFIG_SENSORS_MAX197) += max197.o >> obj-$(CONFIG_SENSORS_MAX31722) += max31722.o >> obj-$(CONFIG_SENSORS_MAX31730) += max31730.o >> obj-$(CONFIG_SENSORS_MAX31760) += max31760.o >> +obj-$(CONFIG_SENSORS_MAX597X) += max597x.o >> obj-$(CONFIG_SENSORS_MAX6620) += max6620.o >> obj-$(CONFIG_SENSORS_MAX6621) += max6621.o >> obj-$(CONFIG_SENSORS_MAX6639) += max6639.o >> diff --git a/drivers/hwmon/max597x.c b/drivers/hwmon/max597x.c >> new file mode 100644 >> index 000000000000..d4d8c2faf55c >> --- /dev/null >> +++ b/drivers/hwmon/max597x.c >> @@ -0,0 +1,212 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> +/* >> + * Device driver for regulators in MAX5970 and MAX5978 IC >> + * >> + * Copyright (c) 2022 9elements GmbH >> + * >> + * Author: Patrick Rudolph >> + */ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +struct max597x_hwmon { >> + int num_switches, irng[MAX5970_NUM_SWITCHES], mon_rng[MAX5970_NUM_SWITCHES]; >> + struct regmap *regmap; >> +}; >> + >> +static int max597x_read_reg(struct max597x_hwmon *ddata, int reg, int range, long *val) >> +{ >> + u8 reg_data[2]; >> + int ret; >> + >> + ret = regmap_bulk_read(ddata->regmap, reg, ®_data[0], 2); >> + if (ret < 0) >> + return ret; >> + >> + *val = (reg_data[0] << 2) | (reg_data[1] & 3); >> + *val = *val * range; >> + /* >> + * From datasheet, the range is fractionally less. >> + * To compensate that, divide with 1033 number. >> + */ >> + *val = *val / 1033; > > Where in the datasheet, and why is this conversion not needed in the > regulator driver ? This is taken from the typical value mentioned in table containing MON_ LSB Voltage in datasheet. i.e., divide typical value with corresponding range. This is applicable for use in hwmon driver to accurate report readings from device. > >> + >> + return 0; >> +} >> + >> +static int max597x_read(struct device *dev, enum hwmon_sensor_types type, >> + u32 attr, int channel, long *val) >> +{ >> + struct max597x_hwmon *ddata = dev_get_drvdata(dev); >> + int ret; >> + >> + switch (type) { >> + case hwmon_curr: >> + switch (attr) { >> + case hwmon_curr_input: >> + ret = max597x_read_reg(ddata, MAX5970_REG_CURRENT_H(channel), >> + ddata->irng[channel], val); >> + if (ret < 0) >> + return ret; >> + >> + return 0; > > max597x_read_reg() returns a negative value or 0. Why not just return it ? Ack. > > The regulator driver takes shunt resistor values into account. Agree. The shunt resistor value should be accounted for correct current measurement. This driver lacks that. This needs to be fixed. Will post new patch revision to address that. > > Again, I think it would make much more sense to add hwmon support > to the regulator driver than having a separate driver since there > is lots of overlap. For example, the regulator driver already > sets and monitors limits. I agree. But the chip also has led functionality. I got review feedback to make it MFD. So when rewriting as MFD driver made separate driver based on subsystem. I'm not sure if it is ok to use hwmon subsytem in regulator driver. Will once check with maintainer on this. > >> + default: >> + return -EOPNOTSUPP; >> + } >> + >> + case hwmon_in: >> + switch (attr) { >> + case hwmon_in_input: >> + ret = max597x_read_reg(ddata, MAX5970_REG_VOLTAGE_H(channel), >> + ddata->mon_rng[channel], val); >> + if (ret < 0) >> + return ret; >> + return 0; >> + default: >> + return -EOPNOTSUPP; >> + } >> + } > > Please add missing default: cases as reported by 0-day. Ack > >> + return -EOPNOTSUPP; >> +} >> + >> +static umode_t max597x_is_visible(const void *data, >> + enum hwmon_sensor_types type, >> + u32 attr, int channel) >> +{ >> + struct max597x_hwmon *ddata = (struct max597x_hwmon *)data; >> + >> + if (channel >= ddata->num_switches) >> + return 0; >> + >> + switch (type) { >> + case hwmon_in: >> + switch (attr) { >> + case hwmon_in_input: >> + return 0444; >> + } >> + break; >> + case hwmon_curr: >> + switch (attr) { >> + case hwmon_curr_input: >> + return 0444; >> + } >> + break; >> + default: >> + break; >> + } >> + return 0; >> +} >> + >> +static const struct hwmon_ops max597x_hwmon_ops = { >> + .is_visible = max597x_is_visible, >> + .read = max597x_read, >> +}; >> + >> +#define HWMON_CURRENT HWMON_C_INPUT >> +#define HWMON_VOLTAGE HWMON_I_INPUT > > Please drop and use HWMON_C_INPUT as well as HWMON_I_INPUT > directly. Ack. > >> + >> +static const struct hwmon_channel_info *max597x_info[] = { >> + HWMON_CHANNEL_INFO(in, HWMON_VOLTAGE, HWMON_VOLTAGE), >> + HWMON_CHANNEL_INFO(curr, HWMON_CURRENT, HWMON_CURRENT), >> + NULL >> +}; >> + >> +static const struct hwmon_chip_info max597x_chip_info = { >> + .ops = &max597x_hwmon_ops, >> + .info = max597x_info, >> +}; >> + >> +static int max597x_adc_range(struct regmap *regmap, const int ch, >> + u32 *irng, u32 *mon_rng) >> +{ > > That function also exists on the regulator driver. Yes. This is to read setting from chip. Added this to avoid dependency & race condition with regulator driver. > >> + unsigned int reg; >> + int ret; >> + >> + /* Decode current ADC range */ >> + ret = regmap_read(regmap, MAX5970_REG_STATUS2, ®); >> + if (ret) >> + return ret; >> + switch (MAX5970_IRNG(reg, ch)) { >> + case 0: >> + *irng = 100000; /* 100 mV */ >> + break; >> + case 1: >> + *irng = 50000; /* 50 mV */ >> + break; >> + case 2: >> + *irng = 25000; /* 25 mV */ >> + break; >> + default: >> + return -EINVAL; >> + } >> + >> + /* Decode current voltage monitor range */ >> + ret = regmap_read(regmap, MAX5970_REG_MON_RANGE, ®); >> + if (ret) >> + return ret; >> + >> + *mon_rng = MAX5970_MON_MAX_RANGE_UV >> MAX5970_MON(reg, ch); >> + *mon_rng /= 1000; /* uV to mV */ >> + >> + return 0; >> +} >> + >> +static int max597x_sensor_probe(struct platform_device *pdev) >> +{ >> + struct device *dev = &pdev->dev; >> + struct i2c_client *i2c = to_i2c_client(pdev->dev.parent); >> + struct max597x_hwmon *ddata; >> + struct regmap *regmap = dev_get_regmap(pdev->dev.parent, NULL); >> + struct device *hwmon_dev; >> + int err; >> + >> + if (!regmap) >> + return -EPROBE_DEFER; > > Since the parent driver is a mfd driver, I'd assume that this driver > should be instantiated from there, and I don't see why probe would ever > have to be deferred. Please explain how that can happen. I agree with you but this implementation is referenced from other MFD leaf driver. Example: "drivers/hwmon/sy7636a-hwmon.c" > >> + >> + ddata = devm_kzalloc(dev, sizeof(struct max597x_hwmon), GFP_KERNEL); >> + if (!ddata) >> + return -ENOMEM; >> + >> + if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5978")) >> + ddata->num_switches = MAX597x_TYPE_MAX5978; >> + else if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5970")) >> + ddata->num_switches = MAX597x_TYPE_MAX5970; > > Uuh, no. That is just accidentally correct, based on > > enum max597x_chip_type { > MAX597x_TYPE_MAX5978 = 1, > MAX597x_TYPE_MAX5970, > }; > > The assumption that the numeric chip type matches the number of channels > it supports is as wrong as it can be. There are defines for the number > of channels. I am pretty much completely at loss why they are not used. > Tha same applies for the regulator driver, of course. Ack. Will use defines. > >> + else >> + return -ENODEV; >> + >> + ddata->regmap = regmap; >> + >> + for (int i = 0; i < ddata->num_switches; i++) { >> + err = max597x_adc_range(regmap, i, &ddata->irng[i], &ddata->mon_rng[i]); >> + if (err < 0) >> + return err; > > Why no error message here but one below ? I am not in favor of error > messages in the probe function, but if you use them please be consistent. Ack. > >> + } >> + >> + hwmon_dev = devm_hwmon_device_register_with_info(dev, >> + "max597x_hwmon", ddata, >> + &max597x_chip_info, NULL); >> + >> + if (IS_ERR(hwmon_dev)) { >> + err = PTR_ERR(hwmon_dev); >> + dev_err(dev, "Unable to register hwmon device, returned %d\n", err); > > Use dev_err_probe() Ack > >> + return err; >> + } >> + >> + return 0; >> +} >> + >> +static struct platform_driver max597x_sensor_driver = { >> + .probe = max597x_sensor_probe, >> + .driver = { >> + .name = "max597x-hwmon", >> + }, >> +}; >> +module_platform_driver(max597x_sensor_driver); >> + >> +MODULE_AUTHOR("Patrick Rudolph "); >> +MODULE_DESCRIPTION("MAX5970_hot-swap controller driver"); >> +MODULE_LICENSE("GPL v2"); >> >> base-commit: b4c288cfd2f84c44994330c408e14645d45dee5b >> -- >> 2.39.1 >> Regards, Naresh