* [PATCH v5 0/2] Add Richtek RTQ6056 support @ 2022-07-06 14:11 cy_huang 2022-07-06 14:11 ` [PATCH v5 1/2] dt-bindings: iio: adc: Add rtq6056 adc support cy_huang 2022-07-06 14:11 ` [PATCH v5 2/2] iio: adc: Add rtq6056 support cy_huang 0 siblings, 2 replies; 10+ messages in thread From: cy_huang @ 2022-07-06 14:11 UTC (permalink / raw) To: jic23, robh+dt, krzysztof.kozlowski+dt Cc: lars, cy_huang, linux-iio, linux-kernel, devicetree From: ChiYuan Huang <cy_huang@richtek.com> This patch series is to enable Richtek RTQ6056 support. The RTQ6056 is a high accuracy current-sense monitor with I2C interface, and the device provides full information for system by reading out the load current and power. Since v5 - Fix kernel version text for ABI. Since v4 - Add '__aligned(8)' for timestamp member. - Declare timestamp from 'int64_t' to more unified 's64'. Since v3 - change the node name to be generic 'adc' in binding example. - Refine pm_runtime API calling order in 'read_channel' API. - Fix vshunt wrong scale for divider. - Refine the comment text. - Use 'devm_add_action_or_reset' to decrease the code usage in probe function. - Use RUNTIME_PM_OPS to replace SET_RUNTIME_PM_OPS. - minor fix for the comma. - Use pm_ptr to replace the direct assigned pm_ops. Since v2 - Change the resistor property name to be generic 'shunt-resistor-micro-ohms'. - Rename file from 'rtq6056-adc' to 'rtq6056'. - Refine the ABI, if generic already defined it, remove it and check the channel report unit. - Add copyright text. - include the correct header. - change the property parsing name. - To use iio_chan_spec address field. - Refine each channel separate and shared_by_all. - Use pm_runtime and pm_runtime_autosuspend. - Remove the shutdown callback. From the HW suggestion, it's not recommended to use battery as the power supply. - Check all scale unit (voltage->mV, current->mA, power->milliWatt). - Use the read_avail to provide the interface for attribute value list. - Add comma for the last element in the const integer array. - Refine each ADC label text. - In read_label callback, replace snprintf to sysfs_emit. ChiYuan Huang (2): dt-bindings: iio: adc: Add rtq6056 adc support iio: adc: Add rtq6056 support .../ABI/testing/sysfs-bus-iio-adc-rtq6056 | 6 + .../bindings/iio/adc/richtek,rtq6056.yaml | 56 ++ drivers/iio/adc/Kconfig | 15 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/rtq6056.c | 651 +++++++++++++++++++++ 5 files changed, 729 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 create mode 100644 Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml create mode 100644 drivers/iio/adc/rtq6056.c -- 2.7.4 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v5 1/2] dt-bindings: iio: adc: Add rtq6056 adc support 2022-07-06 14:11 [PATCH v5 0/2] Add Richtek RTQ6056 support cy_huang @ 2022-07-06 14:11 ` cy_huang 2022-07-06 14:11 ` [PATCH v5 2/2] iio: adc: Add rtq6056 support cy_huang 1 sibling, 0 replies; 10+ messages in thread From: cy_huang @ 2022-07-06 14:11 UTC (permalink / raw) To: jic23, robh+dt, krzysztof.kozlowski+dt Cc: lars, cy_huang, linux-iio, linux-kernel, devicetree From: ChiYuan Huang <cy_huang@richtek.com> Add the documentation for Richtek rtq6056. Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Since v3 - change the node name to be generic 'adc' in binding example. Since v2 - Change the resistor property name to be generic 'shunt-resistor-micro-ohms'. --- .../bindings/iio/adc/richtek,rtq6056.yaml | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml diff --git a/Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml b/Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml new file mode 100644 index 00000000..88e0086 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml @@ -0,0 +1,56 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/richtek,rtq6056.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: RTQ6056 Bi-Directional Current and Power Monitor with 16-bit ADC + +maintainers: + - ChiYuan Huang <cy_huang@richtek.com> + +description: | + The RTQ6056 is a high accuracy current-sense monitor with I2C and SMBus + interface, and the device provides full information for system by reading + out the loading current and power. + + The device monitors both of the drops across sense resistor and the BUS + voltage, converts into the current in amperes, and power in watts through + internal analog-to-digital converter ADC. The programmable calibration, + adjustable conversion time, and averaging function are also built in for + more design flexibility. + + Datasheet is available at + https://www.richtek.com/assets/product_file/RTQ6056/DSQ6056-00.pdf + +properties: + compatible: + const: richtek,rtq6056 + + reg: + maxItems: 1 + + "#io-channel-cells": + const: 1 + + shunt-resistor-micro-ohms: + description: Shunt IN+/IN- sensing node resistor + +required: + - compatible + - reg + - "#io-channel-cells" + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + adc@40 { + compatible = "richtek,rtq6056"; + reg = <0x40>; + #io-channel-cells = <1>; + }; + }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v5 2/2] iio: adc: Add rtq6056 support 2022-07-06 14:11 [PATCH v5 0/2] Add Richtek RTQ6056 support cy_huang 2022-07-06 14:11 ` [PATCH v5 1/2] dt-bindings: iio: adc: Add rtq6056 adc support cy_huang @ 2022-07-06 14:11 ` cy_huang 2022-07-07 17:30 ` Jonathan Cameron 1 sibling, 1 reply; 10+ messages in thread From: cy_huang @ 2022-07-06 14:11 UTC (permalink / raw) To: jic23, robh+dt, krzysztof.kozlowski+dt Cc: lars, cy_huang, linux-iio, linux-kernel, devicetree From: ChiYuan Huang <cy_huang@richtek.com> Add Richtek rtq6056 supporting. It can be used for the system to monitor load current and power with 16-bit resolution. Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> --- Since v5 - Fix kernel version text for ABI. Since v4 - Add '__aligned(8)' for timestamp member in buffer_trigger_handler function. - Declare timestamp from 'int64_t' to more unified 's64'. Since v3 - Refine pm_runtime API calling order in 'read_channel' API. - Fix vshunt wrong scale for divider. - Refine the comment text. - Use 'devm_add_action_or_reset' to decrease the code usage in probe function. - Use RUNTIME_PM_OPS to replace SET_RUNTIME_PM_OPS. - minor fix for the comma. - Use pm_ptr to replace the direct assigned pm_ops. Since v2 - Rename file from 'rtq6056-adc' to 'rtq6056'. - Refine the ABI, if generic already defined it, remove it and check the channel report unit. - Add copyright text. - include the correct header. - change the property parsing name. - To use iio_chan_spec address field. - Refine each channel separate and shared_by_all. - Use pm_runtime and pm_runtime_autosuspend. - Remove the shutdown callback. From the HW suggestion, it's not recommended to use battery as the power supply. - Check all scale unit (voltage->mV, current->mA, power->milliWatt). - Use the read_avail to provide the interface for attribute value list. - Add comma for the last element in the const integer array. - Refine each ADC label text. - In read_label callback, replace snprintf to sysfs_emit. --- .../ABI/testing/sysfs-bus-iio-adc-rtq6056 | 6 + drivers/iio/adc/Kconfig | 15 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/rtq6056.c | 651 +++++++++++++++++++++ 4 files changed, 673 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 create mode 100644 drivers/iio/adc/rtq6056.c diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 new file mode 100644 index 00000000..e89d15b --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 @@ -0,0 +1,6 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_voltage0_integration_time +What: /sys/bus/iio/devices/iio:deviceX/in_voltage1_integration_time +KernelVersion: 5.20 +Contact: cy_huang@richtek.com +Description: + Each voltage conversion time in uS diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 48ace74..caebd1a 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -908,6 +908,21 @@ config ROCKCHIP_SARADC To compile this driver as a module, choose M here: the module will be called rockchip_saradc. +config RICHTEK_RTQ6056 + tristate "Richtek RTQ6056 Current and Power Monitor ADC" + depends on I2C + select REGMAP_I2C + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + help + Say yes here to enable RQT6056 ADC support. + RTQ6056 is a high accuracy current-sense monitor with I2C and SMBus + compatible interface, and the device provides full information for + system by reading out the load current and power. + + This driver can also be built as a module. If so, the module will be + called rtq6056. + config RZG2L_ADC tristate "Renesas RZ/G2L ADC driver" depends on ARCH_RZG2L || COMPILE_TEST diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 39d806f..cda7580 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -84,6 +84,7 @@ obj-$(CONFIG_QCOM_PM8XXX_XOADC) += qcom-pm8xxx-xoadc.o obj-$(CONFIG_RCAR_GYRO_ADC) += rcar-gyroadc.o obj-$(CONFIG_RN5T618_ADC) += rn5t618-adc.o obj-$(CONFIG_ROCKCHIP_SARADC) += rockchip_saradc.o +obj-$(CONFIG_RICHTEK_RTQ6056) += rtq6056.o obj-$(CONFIG_RZG2L_ADC) += rzg2l_adc.o obj-$(CONFIG_SC27XX_ADC) += sc27xx_adc.o obj-$(CONFIG_SPEAR_ADC) += spear_adc.o diff --git a/drivers/iio/adc/rtq6056.c b/drivers/iio/adc/rtq6056.c new file mode 100644 index 00000000..64027b1 --- /dev/null +++ b/drivers/iio/adc/rtq6056.c @@ -0,0 +1,651 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2022 Richtek Technology Corp. + * + * ChiYuan Huang <cy_huang@richtek.com> + */ + +#include <linux/bitops.h> +#include <linux/delay.h> +#include <linux/i2c.h> +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/pm_runtime.h> +#include <linux/property.h> +#include <linux/regmap.h> +#include <linux/sysfs.h> +#include <linux/types.h> +#include <linux/util_macros.h> + +#include <linux/iio/buffer.h> +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/trigger_consumer.h> +#include <linux/iio/triggered_buffer.h> + +#define RTQ6056_REG_CONFIG 0x00 +#define RTQ6056_REG_SHUNTVOLT 0x01 +#define RTQ6056_REG_BUSVOLT 0x02 +#define RTQ6056_REG_POWER 0x03 +#define RTQ6056_REG_CURRENT 0x04 +#define RTQ6056_REG_CALIBRATION 0x05 +#define RTQ6056_REG_MASKENABLE 0x06 +#define RTQ6056_REG_ALERTLIMIT 0x07 +#define RTQ6056_REG_MANUFACTID 0xFE +#define RTQ6056_REG_DIEID 0xFF + +#define RTQ6056_VENDOR_ID 0x1214 +#define RTQ6056_DEFAULT_CONFIG 0x4127 +#define RTQ6056_CONT_ALLON 7 + +enum { + RTQ6056_CH_VSHUNT = 0, + RTQ6056_CH_VBUS, + RTQ6056_CH_POWER, + RTQ6056_CH_CURRENT, + RTQ6056_MAX_CHANNEL +}; + +enum { + F_OPMODE = 0, + F_VSHUNTCT, + F_VBUSCT, + F_AVG, + F_RESET, + F_MAX_FIELDS +}; + +struct rtq6056_priv { + struct device *dev; + struct regmap *regmap; + struct regmap_field *rm_fields[F_MAX_FIELDS]; + u32 shunt_resistor_uohm; + int vshuntct_us; + int vbusct_us; + int avg_sample; +}; + +static const struct reg_field rtq6056_reg_fields[F_MAX_FIELDS] = { + [F_OPMODE] = REG_FIELD(RTQ6056_REG_CONFIG, 0, 2), + [F_VSHUNTCT] = REG_FIELD(RTQ6056_REG_CONFIG, 3, 5), + [F_VBUSCT] = REG_FIELD(RTQ6056_REG_CONFIG, 6, 8), + [F_AVG] = REG_FIELD(RTQ6056_REG_CONFIG, 9, 11), + [F_RESET] = REG_FIELD(RTQ6056_REG_CONFIG, 15, 15), +}; + +static const struct iio_chan_spec rtq6056_channels[RTQ6056_MAX_CHANNEL + 1] = { + { + .type = IIO_VOLTAGE, + .indexed = 1, + .channel = 0, + .address = RTQ6056_REG_SHUNTVOLT, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE) | + BIT(IIO_CHAN_INFO_INT_TIME), + .info_mask_separate_available = BIT(IIO_CHAN_INFO_INT_TIME), + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ) | + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .scan_index = 0, + .scan_type = { + .sign = 's', + .realbits = 16, + .storagebits = 16, + .endianness = IIO_CPU, + }, + }, + { + .type = IIO_VOLTAGE, + .indexed = 1, + .channel = 1, + .address = RTQ6056_REG_BUSVOLT, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE) | + BIT(IIO_CHAN_INFO_INT_TIME), + .info_mask_separate_available = BIT(IIO_CHAN_INFO_INT_TIME), + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ) | + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .scan_index = 1, + .scan_type = { + .sign = 'u', + .realbits = 16, + .storagebits = 16, + .endianness = IIO_CPU, + }, + }, + { + .type = IIO_POWER, + .indexed = 1, + .channel = 2, + .address = RTQ6056_REG_POWER, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ) | + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .scan_index = 2, + .scan_type = { + .sign = 'u', + .realbits = 16, + .storagebits = 16, + .endianness = IIO_CPU, + }, + }, + { + .type = IIO_CURRENT, + .indexed = 1, + .channel = 3, + .address = RTQ6056_REG_CURRENT, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ) | + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .scan_index = 3, + .scan_type = { + .sign = 's', + .realbits = 16, + .storagebits = 16, + .endianness = IIO_CPU, + }, + }, + IIO_CHAN_SOFT_TIMESTAMP(RTQ6056_MAX_CHANNEL), +}; + +static int rtq6056_adc_read_channel(struct rtq6056_priv *priv, + struct iio_chan_spec const *ch, + int *val) +{ + struct device *dev = priv->dev; + unsigned int addr = ch->address; + unsigned int regval; + int ret; + + pm_runtime_get_sync(dev); + ret = regmap_read(priv->regmap, addr, ®val); + pm_runtime_mark_last_busy(dev); + pm_runtime_put(dev); + if (ret) + return ret; + + /* Power and VBUS is unsigned 16-bit, others are signed 16-bit */ + if (addr == RTQ6056_REG_BUSVOLT || addr == RTQ6056_REG_POWER) + *val = regval; + else + *val = sign_extend32(regval, 16); + + + return IIO_VAL_INT; +} + +static int rtq6056_adc_read_scale(struct iio_chan_spec const *ch, int *val, + int *val2) +{ + switch (ch->address) { + case RTQ6056_REG_SHUNTVOLT: + /* VSHUNT lsb 2.5uV */ + *val = 2500; + *val2 = 1000000; + return IIO_VAL_FRACTIONAL; + case RTQ6056_REG_BUSVOLT: + /* VBUS lsb 1.25mV */ + *val = 1250; + *val2 = 1000; + return IIO_VAL_FRACTIONAL; + case RTQ6056_REG_POWER: + /* Power lsb 25mW */ + *val = 25; + return IIO_VAL_INT; + default: + return -EINVAL; + } +} + +/* + * Conversion time in uS for channel VSHUNT and VBUS. The indices correspond + * with the bit value expected by the chip. And it can be found at + * https://www.richtek.com/assets/product_file/RTQ6056/DSQ6056-00.pdf + */ +static const int rtq6056_conv_time_list[] = { + 139, 203, 269, 525, 1037, 2061, 4109, 8205, +}; + +static int rtq6056_adc_set_conv_time(struct rtq6056_priv *priv, + struct iio_chan_spec const *ch, + int val) +{ + struct regmap_field *rm_field; + unsigned int selector; + int *ct, ret; + + if (val > 8205 || val < 139) + return -EINVAL; + + if (ch->address == RTQ6056_REG_SHUNTVOLT) { + rm_field = priv->rm_fields[F_VSHUNTCT]; + ct = &priv->vshuntct_us; + } else { + rm_field = priv->rm_fields[F_VBUSCT]; + ct = &priv->vbusct_us; + } + + selector = find_closest(val, rtq6056_conv_time_list, + ARRAY_SIZE(rtq6056_conv_time_list)); + + ret = regmap_field_write(rm_field, selector); + if (ret) + return ret; + + *ct = rtq6056_conv_time_list[selector]; + + return 0; +} + +/* + * Available averaging rate for rtq6056. The indices correspond with the bit + * value expected by the chip. And it can be found at + * https://www.richtek.com/assets/product_file/RTQ6056/DSQ6056-00.pdf + */ +static const int rtq6056_avg_sample_list[] = { + 1, 4, 16, 64, 128, 256, 512, 1024, +}; + +static int rtq6056_adc_set_average(struct rtq6056_priv *priv, int val) +{ + unsigned int selector; + int ret; + + if (val > 1024 || val < 1) + return -EINVAL; + + selector = find_closest(val, rtq6056_avg_sample_list, + ARRAY_SIZE(rtq6056_avg_sample_list)); + + ret = regmap_field_write(priv->rm_fields[F_AVG], selector); + if (ret) + return ret; + + priv->avg_sample = rtq6056_avg_sample_list[selector]; + + return 0; +} + +static int rtq6056_adc_get_sample_freq(struct rtq6056_priv *priv, int *val) +{ + int sample_time; + + sample_time = priv->vshuntct_us + priv->vbusct_us; + sample_time *= priv->avg_sample; + + *val = DIV_ROUND_UP(1000000, sample_time); + + return IIO_VAL_INT; +} + +static int rtq6056_adc_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, int *val, + int *val2, long mask) +{ + struct rtq6056_priv *priv = iio_priv(indio_dev); + + switch (mask) { + case IIO_CHAN_INFO_RAW: + return rtq6056_adc_read_channel(priv, chan, val); + case IIO_CHAN_INFO_SCALE: + return rtq6056_adc_read_scale(chan, val, val2); + case IIO_CHAN_INFO_INT_TIME: + if (chan->address == RTQ6056_REG_SHUNTVOLT) + *val = priv->vshuntct_us; + else + *val = priv->vbusct_us; + + return IIO_VAL_INT; + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + *val = priv->avg_sample; + return IIO_VAL_INT; + case IIO_CHAN_INFO_SAMP_FREQ: + return rtq6056_adc_get_sample_freq(priv, val); + default: + return -EINVAL; + } +} + +static int rtq6056_adc_read_avail(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + const int **vals, int *type, int *length, + long mask) +{ + switch (mask) { + case IIO_CHAN_INFO_INT_TIME: + *vals = rtq6056_conv_time_list; + *type = IIO_VAL_INT; + *length = ARRAY_SIZE(rtq6056_conv_time_list); + return IIO_AVAIL_LIST; + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + *vals = rtq6056_avg_sample_list; + *type = IIO_VAL_INT; + *length = ARRAY_SIZE(rtq6056_avg_sample_list); + return IIO_AVAIL_LIST; + default: + return -EINVAL; + } +} + +static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, int val, + int val2, long mask) +{ + struct rtq6056_priv *priv = iio_priv(indio_dev); + + if (iio_buffer_enabled(indio_dev)) + return -EBUSY; + + switch (mask) { + case IIO_CHAN_INFO_INT_TIME: + return rtq6056_adc_set_conv_time(priv, chan, val); + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: + return rtq6056_adc_set_average(priv, val); + default: + return -EINVAL; + } +} + +static const char *rtq6056_channel_labels[RTQ6056_MAX_CHANNEL] = { + [RTQ6056_CH_VSHUNT] = "Vshunt", + [RTQ6056_CH_VBUS] = "Vbus", + [RTQ6056_CH_POWER] = "Power", + [RTQ6056_CH_CURRENT] = "Current", +}; + +static int rtq6056_adc_read_label(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + char *label) +{ + return sysfs_emit(label, "%s\n", rtq6056_channel_labels[chan->channel]); +} + +static int rtq6056_set_shunt_resistor(struct rtq6056_priv *priv, + int resistor_uohm) +{ + unsigned int calib_val; + int ret; + + if (resistor_uohm <= 0) { + dev_err(priv->dev, "Invalid resistor [%d]\n", resistor_uohm); + return -EINVAL; + } + + /* calibration = 5120000 / (Rshunt (uOhm) * current lsb (1mA)) */ + calib_val = 5120000 / resistor_uohm; + ret = regmap_write(priv->regmap, RTQ6056_REG_CALIBRATION, calib_val); + if (ret) + return ret; + + priv->shunt_resistor_uohm = resistor_uohm; + + return 0; +} + +static ssize_t shunt_resistor_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct rtq6056_priv *priv = iio_priv(dev_to_iio_dev(dev)); + int vals[2] = { priv->shunt_resistor_uohm, 1000000 }; + + return iio_format_value(buf, IIO_VAL_FRACTIONAL, 1, vals); +} + +static ssize_t shunt_resistor_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct rtq6056_priv *priv = iio_priv(indio_dev); + int val, val_fract, ret; + + if (iio_buffer_enabled(indio_dev)) + return -EBUSY; + + ret = iio_str_to_fixpoint(buf, 100000, &val, &val_fract); + if (ret) + return ret; + + ret = rtq6056_set_shunt_resistor(priv, val * 1000000 + val_fract); + if (ret) + return ret; + + return len; +} + +static IIO_DEVICE_ATTR_RW(shunt_resistor, 0); + +static struct attribute *rtq6056_attributes[] = { + &iio_dev_attr_shunt_resistor.dev_attr.attr, + NULL +}; + +static const struct attribute_group rtq6056_attribute_group = { + .attrs = rtq6056_attributes, +}; + +static const struct iio_info rtq6056_info = { + .attrs = &rtq6056_attribute_group, + .read_raw = rtq6056_adc_read_raw, + .read_avail = rtq6056_adc_read_avail, + .write_raw = rtq6056_adc_write_raw, + .read_label = rtq6056_adc_read_label, +}; + +static irqreturn_t rtq6056_buffer_trigger_handler(int irq, void *p) +{ + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->indio_dev; + struct rtq6056_priv *priv = iio_priv(indio_dev); + struct device *dev = priv->dev; + struct { + u16 vals[RTQ6056_MAX_CHANNEL]; + s64 timestamp __aligned(8); + } data; + unsigned int raw; + int i = 0, bit, ret; + + memset(&data, 0, sizeof(data)); + + pm_runtime_get_sync(dev); + + for_each_set_bit(bit, indio_dev->active_scan_mask, indio_dev->masklength) { + unsigned int addr = rtq6056_channels[bit].address; + + ret = regmap_read(priv->regmap, addr, &raw); + if (ret) + goto out; + + data.vals[i++] = raw; + } + + iio_push_to_buffers_with_timestamp(indio_dev, &data, iio_get_time_ns(indio_dev)); + +out: + pm_runtime_mark_last_busy(dev); + pm_runtime_put(dev); + + iio_trigger_notify_done(indio_dev->trig); + + return IRQ_HANDLED; +} + +static void rtq6056_remove(void *dev) +{ + pm_runtime_dont_use_autosuspend(dev); + pm_runtime_disable(dev); + pm_runtime_set_suspended(dev); +} + +static bool rtq6056_is_readable_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case RTQ6056_REG_CONFIG ... RTQ6056_REG_ALERTLIMIT: + case RTQ6056_REG_MANUFACTID ... RTQ6056_REG_DIEID: + return true; + default: + return false; + } +} + +static bool rtq6056_is_writeable_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case RTQ6056_REG_CONFIG: + case RTQ6056_REG_CALIBRATION ... RTQ6056_REG_ALERTLIMIT: + return true; + default: + return false; + } +} + +static const struct regmap_config rtq6056_regmap_config = { + .reg_bits = 8, + .val_bits = 16, + .val_format_endian = REGMAP_ENDIAN_BIG, + .max_register = RTQ6056_REG_DIEID, + .readable_reg = rtq6056_is_readable_reg, + .writeable_reg = rtq6056_is_writeable_reg, +}; + +static int rtq6056_probe(struct i2c_client *i2c) +{ + struct iio_dev *indio_dev; + struct rtq6056_priv *priv; + struct device *dev = &i2c->dev; + struct regmap *regmap; + unsigned int vendor_id, shunt_resistor_uohm; + int ret; + + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_WORD_DATA)) + return -EOPNOTSUPP; + + indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); + if (!indio_dev) + return -ENOMEM; + + priv = iio_priv(indio_dev); + priv->dev = dev; + priv->vshuntct_us = priv->vbusct_us = 1037; + priv->avg_sample = 1; + i2c_set_clientdata(i2c, priv); + + regmap = devm_regmap_init_i2c(i2c, &rtq6056_regmap_config); + if (IS_ERR(regmap)) + return dev_err_probe(dev, PTR_ERR(regmap), + "Failed to init regmap\n"); + + priv->regmap = regmap; + + ret = regmap_read(regmap, RTQ6056_REG_MANUFACTID, &vendor_id); + if (ret) + return dev_err_probe(dev, ret, + "Failed to get manufacturer info\n"); + + if (vendor_id != RTQ6056_VENDOR_ID) + return dev_err_probe(dev, -ENODEV, + "Invalid vendor id 0x%04x\n", vendor_id); + + ret = devm_regmap_field_bulk_alloc(dev, regmap, priv->rm_fields, + rtq6056_reg_fields, F_MAX_FIELDS); + if (ret) + return dev_err_probe(dev, ret, "Failed to init regmap field\n"); + + /* + * By default, configure average sample as 1, bus and shunt conversion + * timea as 1037 microsecond, and operating mode to all on. + */ + ret = regmap_write(regmap, RTQ6056_REG_CONFIG, RTQ6056_DEFAULT_CONFIG); + if (ret) + return dev_err_probe(dev, ret, + "Failed to enable continuous sensing\n"); + + pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); + pm_runtime_use_autosuspend(dev); + pm_runtime_set_active(dev); + pm_runtime_mark_last_busy(dev); + pm_runtime_enable(dev); + + ret = devm_add_action_or_reset(dev, rtq6056_remove, dev); + if (ret) + return ret; + + /* By default, use 2000 micro-ohm resistor */ + shunt_resistor_uohm = 2000; + device_property_read_u32(dev, "shunt-resistor-micro-ohms", + &shunt_resistor_uohm); + + ret = rtq6056_set_shunt_resistor(priv, shunt_resistor_uohm); + if (ret) + return dev_err_probe(dev, ret, + "Failed to init shunt resistor\n"); + + indio_dev->name = "rtq6056"; + indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->channels = rtq6056_channels; + indio_dev->num_channels = ARRAY_SIZE(rtq6056_channels); + indio_dev->info = &rtq6056_info; + + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, + rtq6056_buffer_trigger_handler, + NULL); + if (ret) + return dev_err_probe(dev, ret, + "Failed to allocate iio trigger buffer\n"); + + return devm_iio_device_register(dev, indio_dev); +} + +static int rtq6056_runtime_suspend(struct device *dev) +{ + struct rtq6056_priv *priv = dev_get_drvdata(dev); + + /* Configure to shutdown mode */ + return regmap_field_write(priv->rm_fields[F_OPMODE], 0); +} + +static int rtq6056_runtime_resume(struct device *dev) +{ + struct rtq6056_priv *priv = dev_get_drvdata(dev); + int sample_rdy_time_us, ret; + + ret = regmap_field_write(priv->rm_fields[F_OPMODE], RTQ6056_CONT_ALLON); + if (ret) + return ret; + + sample_rdy_time_us = priv->vbusct_us + priv->vshuntct_us; + sample_rdy_time_us *= priv->avg_sample; + + usleep_range(sample_rdy_time_us, sample_rdy_time_us + 100); + + return 0; +} + +static const struct dev_pm_ops rtq6056_pm_ops = { + RUNTIME_PM_OPS(rtq6056_runtime_suspend, rtq6056_runtime_resume, NULL) +}; + +static const struct of_device_id rtq6056_device_match[] = { + { .compatible = "richtek,rtq6056" }, + {} +}; +MODULE_DEVICE_TABLE(of, rtq6056_device_match); + +static struct i2c_driver rtq6056_driver = { + .driver = { + .name = "rtq6056", + .of_match_table = rtq6056_device_match, + .pm = pm_ptr(&rtq6056_pm_ops), + }, + .probe_new = rtq6056_probe, +}; +module_i2c_driver(rtq6056_driver); + +MODULE_AUTHOR("ChiYuan Huang <cy_huang@richtek.com>"); +MODULE_DESCRIPTION("Richtek RTQ6056 Driver"); +MODULE_LICENSE("GPL v2"); -- 2.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v5 2/2] iio: adc: Add rtq6056 support 2022-07-06 14:11 ` [PATCH v5 2/2] iio: adc: Add rtq6056 support cy_huang @ 2022-07-07 17:30 ` Jonathan Cameron 2022-07-11 2:48 ` ChiYuan Huang 0 siblings, 1 reply; 10+ messages in thread From: Jonathan Cameron @ 2022-07-07 17:30 UTC (permalink / raw) To: cy_huang Cc: robh+dt, krzysztof.kozlowski+dt, lars, cy_huang, linux-iio, linux-kernel, devicetree On Wed, 6 Jul 2022 22:11:42 +0800 cy_huang <u0084500@gmail.com> wrote: > From: ChiYuan Huang <cy_huang@richtek.com> > > Add Richtek rtq6056 supporting. > > It can be used for the system to monitor load current and power with 16-bit > resolution. > > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Various feedback inline. Thanks, Jonathan > --- > Since v5 > - Fix kernel version text for ABI. > > Since v4 > - Add '__aligned(8)' for timestamp member in buffer_trigger_handler function. > - Declare timestamp from 'int64_t' to more unified 's64'. > > Since v3 > - Refine pm_runtime API calling order in 'read_channel' API. > - Fix vshunt wrong scale for divider. > - Refine the comment text. > - Use 'devm_add_action_or_reset' to decrease the code usage in probe > function. > - Use RUNTIME_PM_OPS to replace SET_RUNTIME_PM_OPS. > - minor fix for the comma. > - Use pm_ptr to replace the direct assigned pm_ops. > > Since v2 > - Rename file from 'rtq6056-adc' to 'rtq6056'. > - Refine the ABI, if generic already defined it, remove it and check the channel > report unit. > - Add copyright text. > - include the correct header. > - change the property parsing name. > - To use iio_chan_spec address field. > - Refine each channel separate and shared_by_all. > - Use pm_runtime and pm_runtime_autosuspend. > - Remove the shutdown callback. From the HW suggestion, it's not recommended to > use battery as the power supply. > - Check all scale unit (voltage->mV, current->mA, power->milliWatt). > - Use the read_avail to provide the interface for attribute value list. > - Add comma for the last element in the const integer array. > - Refine each ADC label text. > - In read_label callback, replace snprintf to sysfs_emit. > > --- > .../ABI/testing/sysfs-bus-iio-adc-rtq6056 | 6 + > drivers/iio/adc/Kconfig | 15 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/rtq6056.c | 651 +++++++++++++++++++++ > 4 files changed, 673 insertions(+) > create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > create mode 100644 drivers/iio/adc/rtq6056.c > > diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > new file mode 100644 > index 00000000..e89d15b > --- /dev/null > +++ b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > @@ -0,0 +1,6 @@ > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage0_integration_time > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage1_integration_time > +KernelVersion: 5.20 > +Contact: cy_huang@richtek.com > +Description: > + Each voltage conversion time in uS Please move this entry to sysfs-bus-iio It's a natural extension of existing standard ABI so doesn't need to be in a driver specific documentation file. However, way back in patch 1 I gave feedback on why we don't normally use integration time for voltage channels and I thought you were changing this... ... > +static int rtq6056_adc_read_channel(struct rtq6056_priv *priv, > + struct iio_chan_spec const *ch, > + int *val) > +{ > + struct device *dev = priv->dev; > + unsigned int addr = ch->address; > + unsigned int regval; > + int ret; > + > + pm_runtime_get_sync(dev); > + ret = regmap_read(priv->regmap, addr, ®val); > + pm_runtime_mark_last_busy(dev); > + pm_runtime_put(dev); > + if (ret) > + return ret; > + > + /* Power and VBUS is unsigned 16-bit, others are signed 16-bit */ > + if (addr == RTQ6056_REG_BUSVOLT || addr == RTQ6056_REG_POWER) > + *val = regval; > + else > + *val = sign_extend32(regval, 16); > + One blank line only. > + > + return IIO_VAL_INT; > +} > + ... > + > +static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, int val, > + int val2, long mask) > +{ > + struct rtq6056_priv *priv = iio_priv(indio_dev); > + > + if (iio_buffer_enabled(indio_dev)) This is racy as can enter buffered mode immediately after this check. Use iio_device_claim_direct_mode() to avoid any races around this. > + return -EBUSY; > + > + switch (mask) { > + case IIO_CHAN_INFO_INT_TIME: > + return rtq6056_adc_set_conv_time(priv, chan, val); > + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: > + return rtq6056_adc_set_average(priv, val); > + default: > + return -EINVAL; > + } > +} > + > +static void rtq6056_remove(void *dev) > +{ > + pm_runtime_dont_use_autosuspend(dev); > + pm_runtime_disable(dev); > + pm_runtime_set_suspended(dev); There isn't anything here to push the device into a suspend state, so why does calling pm_runtime_set_suspended() make sense? > +} > + > > + > +static int rtq6056_probe(struct i2c_client *i2c) > +{ > + struct iio_dev *indio_dev; > + struct rtq6056_priv *priv; > + struct device *dev = &i2c->dev; > + struct regmap *regmap; > + unsigned int vendor_id, shunt_resistor_uohm; > + int ret; > + > + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > + return -EOPNOTSUPP; > + > + indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); > + if (!indio_dev) > + return -ENOMEM; > + > + priv = iio_priv(indio_dev); > + priv->dev = dev; > + priv->vshuntct_us = priv->vbusct_us = 1037; > + priv->avg_sample = 1; > + i2c_set_clientdata(i2c, priv); > + > + regmap = devm_regmap_init_i2c(i2c, &rtq6056_regmap_config); > + if (IS_ERR(regmap)) > + return dev_err_probe(dev, PTR_ERR(regmap), > + "Failed to init regmap\n"); > + > + priv->regmap = regmap; > + > + ret = regmap_read(regmap, RTQ6056_REG_MANUFACTID, &vendor_id); > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to get manufacturer info\n"); > + > + if (vendor_id != RTQ6056_VENDOR_ID) > + return dev_err_probe(dev, -ENODEV, > + "Invalid vendor id 0x%04x\n", vendor_id); > + > + ret = devm_regmap_field_bulk_alloc(dev, regmap, priv->rm_fields, > + rtq6056_reg_fields, F_MAX_FIELDS); > + if (ret) > + return dev_err_probe(dev, ret, "Failed to init regmap field\n"); > + > + /* > + * By default, configure average sample as 1, bus and shunt conversion > + * timea as 1037 microsecond, and operating mode to all on. > + */ > + ret = regmap_write(regmap, RTQ6056_REG_CONFIG, RTQ6056_DEFAULT_CONFIG); > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to enable continuous sensing\n"); > + > + pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); > + pm_runtime_use_autosuspend(dev); > + pm_runtime_set_active(dev); > + pm_runtime_mark_last_busy(dev); > + pm_runtime_enable(dev); Look at whether you can use devm_pm_runtime_enable() Note it handles disabling autosuspend for you. When using runtime_pm() you want to ensure that the device works without runtime pm support being enabled. As such, you turn the device on before enabling runtime_pm() and (this is missing I think) turn it off after disabling runtime pm. So I'd expect a devm_add_action_or_reset() call to unwind setting the device into continuous sending above. > + > + ret = devm_add_action_or_reset(dev, rtq6056_remove, dev); The callback naming is too generic. It should give some indication of what it is undoing (much of probe is handled by other devm_ callbacks). > + if (ret) > + return ret; > + > + /* By default, use 2000 micro-ohm resistor */ > + shunt_resistor_uohm = 2000; > + device_property_read_u32(dev, "shunt-resistor-micro-ohms", > + &shunt_resistor_uohm); > + > + ret = rtq6056_set_shunt_resistor(priv, shunt_resistor_uohm); > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to init shunt resistor\n"); > + > + indio_dev->name = "rtq6056"; > + indio_dev->modes = INDIO_DIRECT_MODE; > + indio_dev->channels = rtq6056_channels; > + indio_dev->num_channels = ARRAY_SIZE(rtq6056_channels); > + indio_dev->info = &rtq6056_info; > + > + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, > + rtq6056_buffer_trigger_handler, > + NULL); > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to allocate iio trigger buffer\n"); > + > + return devm_iio_device_register(dev, indio_dev); > +} > + > +static const struct dev_pm_ops rtq6056_pm_ops = { > + RUNTIME_PM_OPS(rtq6056_runtime_suspend, rtq6056_runtime_resume, NULL) Is there any reason we can't use these same ops to achieve at least some power saving in suspend? i.e. use DEFINE_RUNTIME_PM_OPS() I have tidying this up in existing drivers on my todo list as I think it is almost always a good idea. Note this is why there isn't a define to create the particular combination you have here. > +}; > + ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 2/2] iio: adc: Add rtq6056 support 2022-07-07 17:30 ` Jonathan Cameron @ 2022-07-11 2:48 ` ChiYuan Huang 2022-07-11 3:16 ` ChiYuan Huang 2022-07-16 17:37 ` Jonathan Cameron 0 siblings, 2 replies; 10+ messages in thread From: ChiYuan Huang @ 2022-07-11 2:48 UTC (permalink / raw) To: Jonathan Cameron Cc: Rob Herring, Krzysztof Kozlowski, Lars-Peter Clausen, cy_huang, linux-iio, lkml, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS Jonathan Cameron <jic23@kernel.org> 於 2022年7月8日 週五 凌晨1:20寫道： > > On Wed, 6 Jul 2022 22:11:42 +0800 > cy_huang <u0084500@gmail.com> wrote: > > > From: ChiYuan Huang <cy_huang@richtek.com> > > > > Add Richtek rtq6056 supporting. > > > > It can be used for the system to monitor load current and power with 16-bit > > resolution. > > > > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > > Various feedback inline. > > Thanks, > > Jonathan > > > --- > > Since v5 > > - Fix kernel version text for ABI. > > > > Since v4 > > - Add '__aligned(8)' for timestamp member in buffer_trigger_handler function. > > - Declare timestamp from 'int64_t' to more unified 's64'. > > > > Since v3 > > - Refine pm_runtime API calling order in 'read_channel' API. > > - Fix vshunt wrong scale for divider. > > - Refine the comment text. > > - Use 'devm_add_action_or_reset' to decrease the code usage in probe > > function. > > - Use RUNTIME_PM_OPS to replace SET_RUNTIME_PM_OPS. > > - minor fix for the comma. > > - Use pm_ptr to replace the direct assigned pm_ops. > > > > Since v2 > > - Rename file from 'rtq6056-adc' to 'rtq6056'. > > - Refine the ABI, if generic already defined it, remove it and check the channel > > report unit. > > - Add copyright text. > > - include the correct header. > > - change the property parsing name. > > - To use iio_chan_spec address field. > > - Refine each channel separate and shared_by_all. > > - Use pm_runtime and pm_runtime_autosuspend. > > - Remove the shutdown callback. From the HW suggestion, it's not recommended to > > use battery as the power supply. > > - Check all scale unit (voltage->mV, current->mA, power->milliWatt). > > - Use the read_avail to provide the interface for attribute value list. > > - Add comma for the last element in the const integer array. > > - Refine each ADC label text. > > - In read_label callback, replace snprintf to sysfs_emit. > > > > --- > > .../ABI/testing/sysfs-bus-iio-adc-rtq6056 | 6 + > > drivers/iio/adc/Kconfig | 15 + > > drivers/iio/adc/Makefile | 1 + > > drivers/iio/adc/rtq6056.c | 651 +++++++++++++++++++++ > > 4 files changed, 673 insertions(+) > > create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > create mode 100644 drivers/iio/adc/rtq6056.c > > > > diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > new file mode 100644 > > index 00000000..e89d15b > > --- /dev/null > > +++ b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > @@ -0,0 +1,6 @@ > > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage0_integration_time > > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage1_integration_time > > +KernelVersion: 5.20 > > +Contact: cy_huang@richtek.com > > +Description: > > + Each voltage conversion time in uS > > Please move this entry to sysfs-bus-iio > > It's a natural extension of existing standard ABI so doesn't need to be in > a driver specific documentation file. > > However, way back in patch 1 I gave feedback on why we don't normally use integration time > for voltage channels and I thought you were changing this... > I didn't intend to change this. Just cannot find any suitable attribute for this feature. From the IC interrnal, there's only one set of ADC. And the conversion order is bus/shunt......, average sample count to control the sample update interval. That' why the sample frequency is calculated by one second to divide [(bus_ct + shunt_ct) * average sample bit] (us) If it's not suitable for this attribute, I think it's better to change it as file attribute, not IIO channel attribute. How do you think? > ... > > > +static int rtq6056_adc_read_channel(struct rtq6056_priv *priv, > > + struct iio_chan_spec const *ch, > > + int *val) > > +{ > > + struct device *dev = priv->dev; > > + unsigned int addr = ch->address; > > + unsigned int regval; > > + int ret; > > + > > + pm_runtime_get_sync(dev); > > + ret = regmap_read(priv->regmap, addr, ®val); > > + pm_runtime_mark_last_busy(dev); > > + pm_runtime_put(dev); > > + if (ret) > > + return ret; > > + > > + /* Power and VBUS is unsigned 16-bit, others are signed 16-bit */ > > + if (addr == RTQ6056_REG_BUSVOLT || addr == RTQ6056_REG_POWER) > > + *val = regval; > > + else > > + *val = sign_extend32(regval, 16); > > + > > One blank line only. > > > + > > + return IIO_VAL_INT; > > +} > > + > ... > > > > + > > +static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, > > + struct iio_chan_spec const *chan, int val, > > + int val2, long mask) > > +{ > > + struct rtq6056_priv *priv = iio_priv(indio_dev); > > + > > + if (iio_buffer_enabled(indio_dev)) > > This is racy as can enter buffered mode immediately after this check. > Use iio_device_claim_direct_mode() to avoid any races around this. > for the shunt resistor attribute write, also? > > + return -EBUSY; > > + > > + switch (mask) { > > + case IIO_CHAN_INFO_INT_TIME: > > + return rtq6056_adc_set_conv_time(priv, chan, val); > > + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: > > + return rtq6056_adc_set_average(priv, val); > > + default: > > + return -EINVAL; > > + } > > +} > > > > + > > +static void rtq6056_remove(void *dev) > > +{ > > + pm_runtime_dont_use_autosuspend(dev); > > + pm_runtime_disable(dev); > > + pm_runtime_set_suspended(dev); > > There isn't anything here to push the device into a suspend state, so why > does calling pm_runtime_set_suspended() make sense? > As I know, It is needed, at least 'pm_runtime_set_suspended' must be kept. To think one case, adc is reading, module is removing. Who will change the IC state to off? pm_runtime is already disabled, the IC will be kept in 'active', right? > > +} > > + > > > > + > > +static int rtq6056_probe(struct i2c_client *i2c) > > +{ > > + struct iio_dev *indio_dev; > > + struct rtq6056_priv *priv; > > + struct device *dev = &i2c->dev; > > + struct regmap *regmap; > > + unsigned int vendor_id, shunt_resistor_uohm; > > + int ret; > > + > > + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > > + return -EOPNOTSUPP; > > + > > + indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); > > + if (!indio_dev) > > + return -ENOMEM; > > + > > + priv = iio_priv(indio_dev); > > + priv->dev = dev; > > + priv->vshuntct_us = priv->vbusct_us = 1037; > > + priv->avg_sample = 1; > > + i2c_set_clientdata(i2c, priv); > > + > > + regmap = devm_regmap_init_i2c(i2c, &rtq6056_regmap_config); > > + if (IS_ERR(regmap)) > > + return dev_err_probe(dev, PTR_ERR(regmap), > > + "Failed to init regmap\n"); > > + > > + priv->regmap = regmap; > > + > > + ret = regmap_read(regmap, RTQ6056_REG_MANUFACTID, &vendor_id); > > + if (ret) > > + return dev_err_probe(dev, ret, > > + "Failed to get manufacturer info\n"); > > + > > + if (vendor_id != RTQ6056_VENDOR_ID) > > + return dev_err_probe(dev, -ENODEV, > > + "Invalid vendor id 0x%04x\n", vendor_id); > > + > > + ret = devm_regmap_field_bulk_alloc(dev, regmap, priv->rm_fields, > > + rtq6056_reg_fields, F_MAX_FIELDS); > > + if (ret) > > + return dev_err_probe(dev, ret, "Failed to init regmap field\n"); > > + > > + /* > > + * By default, configure average sample as 1, bus and shunt conversion > > + * timea as 1037 microsecond, and operating mode to all on. > > + */ > > + ret = regmap_write(regmap, RTQ6056_REG_CONFIG, RTQ6056_DEFAULT_CONFIG); > > + if (ret) > > + return dev_err_probe(dev, ret, > > + "Failed to enable continuous sensing\n"); > > + > > + pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); > > + pm_runtime_use_autosuspend(dev); > > + pm_runtime_set_active(dev); > > + pm_runtime_mark_last_busy(dev); > > + pm_runtime_enable(dev); > > Look at whether you can use devm_pm_runtime_enable() > Note it handles disabling autosuspend for you. > > When using runtime_pm() you want to ensure that the device works without > runtime pm support being enabled. As such, you turn the device on before > enabling runtime_pm() and (this is missing I think) turn it off after disabling > runtime pm. So I'd expect a devm_add_action_or_reset() call to unwind > setting the device into continuous sending above. > If so, I think it's better to configure the device keep in off state in probe stage. The calling order may need to be changed as below devm_add_action_or_reset... pm_runtime_set_autosuspend_delay pm_runtime_use_auto_suspend devm_pm_runtime_enable > > + > > + ret = devm_add_action_or_reset(dev, rtq6056_remove, dev); > > The callback naming is too generic. It should give some indication > of what it is undoing (much of probe is handled by other devm_ callbacks). > How about to change the name to 'rtq6056_enter_shutdown_state'? And in this function, to change the device state in shutdown with 'pm_runtime_set_suspended' API. > > + if (ret) > > + return ret; > > + > > + /* By default, use 2000 micro-ohm resistor */ > > + shunt_resistor_uohm = 2000; > > + device_property_read_u32(dev, "shunt-resistor-micro-ohms", > > + &shunt_resistor_uohm); > > + > > + ret = rtq6056_set_shunt_resistor(priv, shunt_resistor_uohm); > > + if (ret) > > + return dev_err_probe(dev, ret, > > + "Failed to init shunt resistor\n"); > > + > > + indio_dev->name = "rtq6056"; > > + indio_dev->modes = INDIO_DIRECT_MODE; > > + indio_dev->channels = rtq6056_channels; > > + indio_dev->num_channels = ARRAY_SIZE(rtq6056_channels); > > + indio_dev->info = &rtq6056_info; > > + > > + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, > > + rtq6056_buffer_trigger_handler, > > + NULL); > > + if (ret) > > + return dev_err_probe(dev, ret, > > + "Failed to allocate iio trigger buffer\n"); > > + > > + return devm_iio_device_register(dev, indio_dev); > > +} > > > + > > +static const struct dev_pm_ops rtq6056_pm_ops = { > > + RUNTIME_PM_OPS(rtq6056_runtime_suspend, rtq6056_runtime_resume, NULL) > > Is there any reason we can't use these same ops to achieve at least some power > saving in suspend? i.e. use DEFINE_RUNTIME_PM_OPS() ~~~~~~~~~~~~~~~~~~~~~~~ Where can I find this? > > I have tidying this up in existing drivers on my todo list as I think it is almost > always a good idea. Note this is why there isn't a define to create the > particular combination you have here. > If there's no combination like as that one, why not unify it to '_DEFINE_DEV_PM_OPS'? > > +}; > > + > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 2/2] iio: adc: Add rtq6056 support 2022-07-11 2:48 ` ChiYuan Huang @ 2022-07-11 3:16 ` ChiYuan Huang 2022-07-16 17:39 ` Jonathan Cameron 2022-07-16 17:37 ` Jonathan Cameron 1 sibling, 1 reply; 10+ messages in thread From: ChiYuan Huang @ 2022-07-11 3:16 UTC (permalink / raw) To: Jonathan Cameron Cc: Rob Herring, Krzysztof Kozlowski, Lars-Peter Clausen, cy_huang, linux-iio, lkml, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS ChiYuan Huang <u0084500@gmail.com> 於 2022年7月11日 週一 上午10:48寫道： > > Jonathan Cameron <jic23@kernel.org> 於 2022年7月8日 週五 凌晨1:20寫道： > > > > On Wed, 6 Jul 2022 22:11:42 +0800 > > cy_huang <u0084500@gmail.com> wrote: > > > > > From: ChiYuan Huang <cy_huang@richtek.com> > > > > > > Add Richtek rtq6056 supporting. > > > > > > It can be used for the system to monitor load current and power with 16-bit > > > resolution. > > > > > > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > > > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > > > > Various feedback inline. > > > > Thanks, > > > > Jonathan > > > > > --- > > > Since v5 > > > - Fix kernel version text for ABI. > > > > > > Since v4 > > > - Add '__aligned(8)' for timestamp member in buffer_trigger_handler function. > > > - Declare timestamp from 'int64_t' to more unified 's64'. > > > > > > Since v3 > > > - Refine pm_runtime API calling order in 'read_channel' API. > > > - Fix vshunt wrong scale for divider. > > > - Refine the comment text. > > > - Use 'devm_add_action_or_reset' to decrease the code usage in probe > > > function. > > > - Use RUNTIME_PM_OPS to replace SET_RUNTIME_PM_OPS. > > > - minor fix for the comma. > > > - Use pm_ptr to replace the direct assigned pm_ops. > > > > > > Since v2 > > > - Rename file from 'rtq6056-adc' to 'rtq6056'. > > > - Refine the ABI, if generic already defined it, remove it and check the channel > > > report unit. > > > - Add copyright text. > > > - include the correct header. > > > - change the property parsing name. > > > - To use iio_chan_spec address field. > > > - Refine each channel separate and shared_by_all. > > > - Use pm_runtime and pm_runtime_autosuspend. > > > - Remove the shutdown callback. From the HW suggestion, it's not recommended to > > > use battery as the power supply. > > > - Check all scale unit (voltage->mV, current->mA, power->milliWatt). > > > - Use the read_avail to provide the interface for attribute value list. > > > - Add comma for the last element in the const integer array. > > > - Refine each ADC label text. > > > - In read_label callback, replace snprintf to sysfs_emit. > > > > > > --- > > > .../ABI/testing/sysfs-bus-iio-adc-rtq6056 | 6 + > > > drivers/iio/adc/Kconfig | 15 + > > > drivers/iio/adc/Makefile | 1 + > > > drivers/iio/adc/rtq6056.c | 651 +++++++++++++++++++++ > > > 4 files changed, 673 insertions(+) > > > create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > > create mode 100644 drivers/iio/adc/rtq6056.c > > > > > > diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > > new file mode 100644 > > > index 00000000..e89d15b > > > --- /dev/null > > > +++ b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > > @@ -0,0 +1,6 @@ > > > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage0_integration_time > > > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage1_integration_time > > > +KernelVersion: 5.20 > > > +Contact: cy_huang@richtek.com > > > +Description: > > > + Each voltage conversion time in uS > > > > Please move this entry to sysfs-bus-iio > > > > It's a natural extension of existing standard ABI so doesn't need to be in > > a driver specific documentation file. > > > > However, way back in patch 1 I gave feedback on why we don't normally use integration time > > for voltage channels and I thought you were changing this... > > > I didn't intend to change this. Just cannot find any suitable > attribute for this feature. > From the IC interrnal, there's only one set of ADC. > And the conversion order is bus/shunt......, average sample count to > control the sample update interval. > That' why the sample frequency is calculated by one second to divide > [(bus_ct + shunt_ct) * average sample bit] (us) > > If it's not suitable for this attribute, I think it's better to change > it as file attribute, not IIO channel attribute. > > How do you think? > > ... > > > > > +static int rtq6056_adc_read_channel(struct rtq6056_priv *priv, > > > + struct iio_chan_spec const *ch, > > > + int *val) > > > +{ > > > + struct device *dev = priv->dev; > > > + unsigned int addr = ch->address; > > > + unsigned int regval; > > > + int ret; > > > + > > > + pm_runtime_get_sync(dev); > > > + ret = regmap_read(priv->regmap, addr, ®val); > > > + pm_runtime_mark_last_busy(dev); > > > + pm_runtime_put(dev); > > > + if (ret) > > > + return ret; > > > + > > > + /* Power and VBUS is unsigned 16-bit, others are signed 16-bit */ > > > + if (addr == RTQ6056_REG_BUSVOLT || addr == RTQ6056_REG_POWER) > > > + *val = regval; > > > + else > > > + *val = sign_extend32(regval, 16); > > > + > > > > One blank line only. > > > > > + > > > + return IIO_VAL_INT; > > > +} > > > + > > ... > > > > > > > + > > > +static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, > > > + struct iio_chan_spec const *chan, int val, > > > + int val2, long mask) > > > +{ > > > + struct rtq6056_priv *priv = iio_priv(indio_dev); > > > + > > > + if (iio_buffer_enabled(indio_dev)) > > > > This is racy as can enter buffered mode immediately after this check. > > Use iio_device_claim_direct_mode() to avoid any races around this. > > > for the shunt resistor attribute write, also? > > > + return -EBUSY; > > > + > > > + switch (mask) { > > > + case IIO_CHAN_INFO_INT_TIME: > > > + return rtq6056_adc_set_conv_time(priv, chan, val); > > > + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: > > > + return rtq6056_adc_set_average(priv, val); > > > + default: > > > + return -EINVAL; > > > + } > > > +} > > > > > > > + > > > +static void rtq6056_remove(void *dev) > > > +{ > > > + pm_runtime_dont_use_autosuspend(dev); > > > + pm_runtime_disable(dev); > > > + pm_runtime_set_suspended(dev); > > > > There isn't anything here to push the device into a suspend state, so why > > does calling pm_runtime_set_suspended() make sense? > > > As I know, It is needed, at least 'pm_runtime_set_suspended' must be kept. > > To think one case, adc is reading, module is removing. > Who will change the IC state to off? > > pm_runtime is already disabled, the IC will be kept in 'active', right? > > > +} > > > + > > > > > > + > > > +static int rtq6056_probe(struct i2c_client *i2c) > > > +{ > > > + struct iio_dev *indio_dev; > > > + struct rtq6056_priv *priv; > > > + struct device *dev = &i2c->dev; > > > + struct regmap *regmap; > > > + unsigned int vendor_id, shunt_resistor_uohm; > > > + int ret; > > > + > > > + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > > > + return -EOPNOTSUPP; > > > + > > > + indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); > > > + if (!indio_dev) > > > + return -ENOMEM; > > > + > > > + priv = iio_priv(indio_dev); > > > + priv->dev = dev; > > > + priv->vshuntct_us = priv->vbusct_us = 1037; > > > + priv->avg_sample = 1; > > > + i2c_set_clientdata(i2c, priv); > > > + > > > + regmap = devm_regmap_init_i2c(i2c, &rtq6056_regmap_config); > > > + if (IS_ERR(regmap)) > > > + return dev_err_probe(dev, PTR_ERR(regmap), > > > + "Failed to init regmap\n"); > > > + > > > + priv->regmap = regmap; > > > + > > > + ret = regmap_read(regmap, RTQ6056_REG_MANUFACTID, &vendor_id); > > > + if (ret) > > > + return dev_err_probe(dev, ret, > > > + "Failed to get manufacturer info\n"); > > > + > > > + if (vendor_id != RTQ6056_VENDOR_ID) > > > + return dev_err_probe(dev, -ENODEV, > > > + "Invalid vendor id 0x%04x\n", vendor_id); > > > + > > > + ret = devm_regmap_field_bulk_alloc(dev, regmap, priv->rm_fields, > > > + rtq6056_reg_fields, F_MAX_FIELDS); > > > + if (ret) > > > + return dev_err_probe(dev, ret, "Failed to init regmap field\n"); > > > + > > > + /* > > > + * By default, configure average sample as 1, bus and shunt conversion > > > + * timea as 1037 microsecond, and operating mode to all on. > > > + */ > > > + ret = regmap_write(regmap, RTQ6056_REG_CONFIG, RTQ6056_DEFAULT_CONFIG); > > > + if (ret) > > > + return dev_err_probe(dev, ret, > > > + "Failed to enable continuous sensing\n"); > > > + > > > + pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); > > > + pm_runtime_use_autosuspend(dev); > > > + pm_runtime_set_active(dev); > > > + pm_runtime_mark_last_busy(dev); > > > + pm_runtime_enable(dev); > > > > Look at whether you can use devm_pm_runtime_enable() > > Note it handles disabling autosuspend for you. > > > > When using runtime_pm() you want to ensure that the device works without > > runtime pm support being enabled. As such, you turn the device on before > > enabling runtime_pm() and (this is missing I think) turn it off after disabling > > runtime pm. So I'd expect a devm_add_action_or_reset() call to unwind > > setting the device into continuous sending above. > > > If so, I think it's better to configure the device keep in off state > in probe stage. > The calling order may need to be changed as below > devm_add_action_or_reset... > > pm_runtime_set_autosuspend_delay > pm_runtime_use_auto_suspend > devm_pm_runtime_enable > Ah, not correct. How about if 'PM_RUNTIME' is not enabled? Do we need to consider about this case? If yes, the original flow about 'pm_runtime' is correct. > > > + > > > + ret = devm_add_action_or_reset(dev, rtq6056_remove, dev); > > > > The callback naming is too generic. It should give some indication > > of what it is undoing (much of probe is handled by other devm_ callbacks). > > > How about to change the name to 'rtq6056_enter_shutdown_state'? > And in this function, to change the device state in shutdown with > 'pm_runtime_set_suspended' API. > > > + if (ret) > > > + return ret; > > > + > > > + /* By default, use 2000 micro-ohm resistor */ > > > + shunt_resistor_uohm = 2000; > > > + device_property_read_u32(dev, "shunt-resistor-micro-ohms", > > > + &shunt_resistor_uohm); > > > + > > > + ret = rtq6056_set_shunt_resistor(priv, shunt_resistor_uohm); > > > + if (ret) > > > + return dev_err_probe(dev, ret, > > > + "Failed to init shunt resistor\n"); > > > + > > > + indio_dev->name = "rtq6056"; > > > + indio_dev->modes = INDIO_DIRECT_MODE; > > > + indio_dev->channels = rtq6056_channels; > > > + indio_dev->num_channels = ARRAY_SIZE(rtq6056_channels); > > > + indio_dev->info = &rtq6056_info; > > > + > > > + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, > > > + rtq6056_buffer_trigger_handler, > > > + NULL); > > > + if (ret) > > > + return dev_err_probe(dev, ret, > > > + "Failed to allocate iio trigger buffer\n"); > > > + > > > + return devm_iio_device_register(dev, indio_dev); > > > +} > > > > > + > > > +static const struct dev_pm_ops rtq6056_pm_ops = { > > > + RUNTIME_PM_OPS(rtq6056_runtime_suspend, rtq6056_runtime_resume, NULL) > > > > Is there any reason we can't use these same ops to achieve at least some power > > saving in suspend? i.e. use DEFINE_RUNTIME_PM_OPS() > ~~~~~~~~~~~~~~~~~~~~~~~ > Where can I find this? > > > > I have tidying this up in existing drivers on my todo list as I think it is almost > > always a good idea. Note this is why there isn't a define to create the > > particular combination you have here. > > > If there's no combination like as that one, why not unify it to > '_DEFINE_DEV_PM_OPS'? > > > +}; > > > + > > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 2/2] iio: adc: Add rtq6056 support 2022-07-11 3:16 ` ChiYuan Huang @ 2022-07-16 17:39 ` Jonathan Cameron 2022-07-18 5:44 ` ChiYuan Huang 0 siblings, 1 reply; 10+ messages in thread From: Jonathan Cameron @ 2022-07-16 17:39 UTC (permalink / raw) To: ChiYuan Huang Cc: Rob Herring, Krzysztof Kozlowski, Lars-Peter Clausen, cy_huang, linux-iio, lkml, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS > > > > + > > > > +static int rtq6056_probe(struct i2c_client *i2c) > > > > +{ > > > > + struct iio_dev *indio_dev; > > > > + struct rtq6056_priv *priv; > > > > + struct device *dev = &i2c->dev; > > > > + struct regmap *regmap; > > > > + unsigned int vendor_id, shunt_resistor_uohm; > > > > + int ret; > > > > + > > > > + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > > > > + return -EOPNOTSUPP; > > > > + > > > > + indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); > > > > + if (!indio_dev) > > > > + return -ENOMEM; > > > > + > > > > + priv = iio_priv(indio_dev); > > > > + priv->dev = dev; > > > > + priv->vshuntct_us = priv->vbusct_us = 1037; > > > > + priv->avg_sample = 1; > > > > + i2c_set_clientdata(i2c, priv); > > > > + > > > > + regmap = devm_regmap_init_i2c(i2c, &rtq6056_regmap_config); > > > > + if (IS_ERR(regmap)) > > > > + return dev_err_probe(dev, PTR_ERR(regmap), > > > > + "Failed to init regmap\n"); > > > > + > > > > + priv->regmap = regmap; > > > > + > > > > + ret = regmap_read(regmap, RTQ6056_REG_MANUFACTID, &vendor_id); > > > > + if (ret) > > > > + return dev_err_probe(dev, ret, > > > > + "Failed to get manufacturer info\n"); > > > > + > > > > + if (vendor_id != RTQ6056_VENDOR_ID) > > > > + return dev_err_probe(dev, -ENODEV, > > > > + "Invalid vendor id 0x%04x\n", vendor_id); > > > > + > > > > + ret = devm_regmap_field_bulk_alloc(dev, regmap, priv->rm_fields, > > > > + rtq6056_reg_fields, F_MAX_FIELDS); > > > > + if (ret) > > > > + return dev_err_probe(dev, ret, "Failed to init regmap field\n"); > > > > + > > > > + /* > > > > + * By default, configure average sample as 1, bus and shunt conversion > > > > + * timea as 1037 microsecond, and operating mode to all on. > > > > + */ > > > > + ret = regmap_write(regmap, RTQ6056_REG_CONFIG, RTQ6056_DEFAULT_CONFIG); > > > > + if (ret) > > > > + return dev_err_probe(dev, ret, > > > > + "Failed to enable continuous sensing\n"); > > > > + > > > > + pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); > > > > + pm_runtime_use_autosuspend(dev); > > > > + pm_runtime_set_active(dev); > > > > + pm_runtime_mark_last_busy(dev); > > > > + pm_runtime_enable(dev); > > > > > > Look at whether you can use devm_pm_runtime_enable() > > > Note it handles disabling autosuspend for you. > > > > > > When using runtime_pm() you want to ensure that the device works without > > > runtime pm support being enabled. As such, you turn the device on before > > > enabling runtime_pm() and (this is missing I think) turn it off after disabling > > > runtime pm. So I'd expect a devm_add_action_or_reset() call to unwind > > > setting the device into continuous sending above. > > > > > If so, I think it's better to configure the device keep in off state > > in probe stage. > > The calling order may need to be changed as below > > devm_add_action_or_reset... > > > > pm_runtime_set_autosuspend_delay > > pm_runtime_use_auto_suspend > > devm_pm_runtime_enable > > > Ah, not correct. How about if 'PM_RUNTIME' is not enabled? > Do we need to consider about this case? > > If yes, the original flow about 'pm_runtime' is correct. I don't follow. Perhaps next version will make it clear what you mean. Jonathan ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 2/2] iio: adc: Add rtq6056 support 2022-07-16 17:39 ` Jonathan Cameron @ 2022-07-18 5:44 ` ChiYuan Huang 0 siblings, 0 replies; 10+ messages in thread From: ChiYuan Huang @ 2022-07-18 5:44 UTC (permalink / raw) To: Jonathan Cameron Cc: Rob Herring, Krzysztof Kozlowski, Lars-Peter Clausen, cy_huang, linux-iio, lkml, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS HI, Jonathan Jonathan Cameron <jic23@kernel.org> 於 2022年7月17日 週日 凌晨1:29寫道： > > > > > > > + > > > > > +static int rtq6056_probe(struct i2c_client *i2c) > > > > > +{ > > > > > + struct iio_dev *indio_dev; > > > > > + struct rtq6056_priv *priv; > > > > > + struct device *dev = &i2c->dev; > > > > > + struct regmap *regmap; > > > > > + unsigned int vendor_id, shunt_resistor_uohm; > > > > > + int ret; > > > > > + > > > > > + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > > > > > + return -EOPNOTSUPP; > > > > > + > > > > > + indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); > > > > > + if (!indio_dev) > > > > > + return -ENOMEM; > > > > > + > > > > > + priv = iio_priv(indio_dev); > > > > > + priv->dev = dev; > > > > > + priv->vshuntct_us = priv->vbusct_us = 1037; > > > > > + priv->avg_sample = 1; > > > > > + i2c_set_clientdata(i2c, priv); > > > > > + > > > > > + regmap = devm_regmap_init_i2c(i2c, &rtq6056_regmap_config); > > > > > + if (IS_ERR(regmap)) > > > > > + return dev_err_probe(dev, PTR_ERR(regmap), > > > > > + "Failed to init regmap\n"); > > > > > + > > > > > + priv->regmap = regmap; > > > > > + > > > > > + ret = regmap_read(regmap, RTQ6056_REG_MANUFACTID, &vendor_id); > > > > > + if (ret) > > > > > + return dev_err_probe(dev, ret, > > > > > + "Failed to get manufacturer info\n"); > > > > > + > > > > > + if (vendor_id != RTQ6056_VENDOR_ID) > > > > > + return dev_err_probe(dev, -ENODEV, > > > > > + "Invalid vendor id 0x%04x\n", vendor_id); > > > > > + > > > > > + ret = devm_regmap_field_bulk_alloc(dev, regmap, priv->rm_fields, > > > > > + rtq6056_reg_fields, F_MAX_FIELDS); > > > > > + if (ret) > > > > > + return dev_err_probe(dev, ret, "Failed to init regmap field\n"); > > > > > + > > > > > + /* > > > > > + * By default, configure average sample as 1, bus and shunt conversion > > > > > + * timea as 1037 microsecond, and operating mode to all on. > > > > > + */ > > > > > + ret = regmap_write(regmap, RTQ6056_REG_CONFIG, RTQ6056_DEFAULT_CONFIG); > > > > > + if (ret) > > > > > + return dev_err_probe(dev, ret, > > > > > + "Failed to enable continuous sensing\n"); > > > > > + > > > > > + pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); > > > > > + pm_runtime_use_autosuspend(dev); > > > > > + pm_runtime_set_active(dev); > > > > > + pm_runtime_mark_last_busy(dev); > > > > > + pm_runtime_enable(dev); > > > > > > > > Look at whether you can use devm_pm_runtime_enable() > > > > Note it handles disabling autosuspend for you. > > > > > > > > When using runtime_pm() you want to ensure that the device works without > > > > runtime pm support being enabled. As such, you turn the device on before > > > > enabling runtime_pm() and (this is missing I think) turn it off after disabling > > > > runtime pm. So I'd expect a devm_add_action_or_reset() call to unwind > > > > setting the device into continuous sending above. > > > > > > > If so, I think it's better to configure the device keep in off state > > > in probe stage. > > > The calling order may need to be changed as below > > > devm_add_action_or_reset... > > > > > > pm_runtime_set_autosuspend_delay > > > pm_runtime_use_auto_suspend > > > devm_pm_runtime_enable > > > > > Ah, not correct. How about if 'PM_RUNTIME' is not enabled? > > Do we need to consider about this case? > > > > If yes, the original flow about 'pm_runtime' is correct. > I don't follow. Perhaps next version will make it clear what you mean. > In v6, I already fixed most about the comment in v5. Only the 'DEFINE_RUNTIME_DEV_PM_OPS' is left. Now all are clear. Please review the v7. It includes all the fixes. Thanks. > Jonathan ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 2/2] iio: adc: Add rtq6056 support 2022-07-11 2:48 ` ChiYuan Huang 2022-07-11 3:16 ` ChiYuan Huang @ 2022-07-16 17:37 ` Jonathan Cameron 2022-07-18 3:24 ` ChiYuan Huang 1 sibling, 1 reply; 10+ messages in thread From: Jonathan Cameron @ 2022-07-16 17:37 UTC (permalink / raw) To: ChiYuan Huang Cc: Rob Herring, Krzysztof Kozlowski, Lars-Peter Clausen, cy_huang, linux-iio, lkml, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS On Mon, 11 Jul 2022 10:48:17 +0800 ChiYuan Huang <u0084500@gmail.com> wrote: > Jonathan Cameron <jic23@kernel.org> 於 2022年7月8日 週五 凌晨1:20寫道： > > > > On Wed, 6 Jul 2022 22:11:42 +0800 > > cy_huang <u0084500@gmail.com> wrote: > > > > > From: ChiYuan Huang <cy_huang@richtek.com> > > > > > > Add Richtek rtq6056 supporting. > > > > > > It can be used for the system to monitor load current and power with 16-bit > > > resolution. > > > > > > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > > > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > > > > Various feedback inline. > > > > Thanks, > > > > Jonathan > > > > > --- > > > Since v5 > > > - Fix kernel version text for ABI. > > > > > > Since v4 > > > - Add '__aligned(8)' for timestamp member in buffer_trigger_handler function. > > > - Declare timestamp from 'int64_t' to more unified 's64'. > > > > > > Since v3 > > > - Refine pm_runtime API calling order in 'read_channel' API. > > > - Fix vshunt wrong scale for divider. > > > - Refine the comment text. > > > - Use 'devm_add_action_or_reset' to decrease the code usage in probe > > > function. > > > - Use RUNTIME_PM_OPS to replace SET_RUNTIME_PM_OPS. > > > - minor fix for the comma. > > > - Use pm_ptr to replace the direct assigned pm_ops. > > > > > > Since v2 > > > - Rename file from 'rtq6056-adc' to 'rtq6056'. > > > - Refine the ABI, if generic already defined it, remove it and check the channel > > > report unit. > > > - Add copyright text. > > > - include the correct header. > > > - change the property parsing name. > > > - To use iio_chan_spec address field. > > > - Refine each channel separate and shared_by_all. > > > - Use pm_runtime and pm_runtime_autosuspend. > > > - Remove the shutdown callback. From the HW suggestion, it's not recommended to > > > use battery as the power supply. > > > - Check all scale unit (voltage->mV, current->mA, power->milliWatt). > > > - Use the read_avail to provide the interface for attribute value list. > > > - Add comma for the last element in the const integer array. > > > - Refine each ADC label text. > > > - In read_label callback, replace snprintf to sysfs_emit. > > > > > > --- > > > .../ABI/testing/sysfs-bus-iio-adc-rtq6056 | 6 + > > > drivers/iio/adc/Kconfig | 15 + > > > drivers/iio/adc/Makefile | 1 + > > > drivers/iio/adc/rtq6056.c | 651 +++++++++++++++++++++ > > > 4 files changed, 673 insertions(+) > > > create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > > create mode 100644 drivers/iio/adc/rtq6056.c > > > > > > diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > > new file mode 100644 > > > index 00000000..e89d15b > > > --- /dev/null > > > +++ b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > > @@ -0,0 +1,6 @@ > > > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage0_integration_time > > > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage1_integration_time > > > +KernelVersion: 5.20 > > > +Contact: cy_huang@richtek.com > > > +Description: > > > + Each voltage conversion time in uS > > > > Please move this entry to sysfs-bus-iio > > > > It's a natural extension of existing standard ABI so doesn't need to be in > > a driver specific documentation file. > > > > However, way back in patch 1 I gave feedback on why we don't normally use integration time > > for voltage channels and I thought you were changing this... > > > I didn't intend to change this. Just cannot find any suitable > attribute for this feature. > From the IC interrnal, there's only one set of ADC. > And the conversion order is bus/shunt......, average sample count to > control the sample update interval. > That' why the sample frequency is calculated by one second to divide > [(bus_ct + shunt_ct) * average sample bit] (us) > > If it's not suitable for this attribute, I think it's better to change > it as file attribute, not IIO channel attribute. > > How do you think? As mentioned in patch 1 discussion, we've done this before (IIRC) by defining per channel sampling frequencies and not providing a general one. We might want to consider improving the documentation in ABI/testing/sysfs-bus-iio to make that clear however. > > ... > > > > > +static int rtq6056_adc_read_channel(struct rtq6056_priv *priv, > > > + struct iio_chan_spec const *ch, > > > + int *val) > > > +{ > > > + struct device *dev = priv->dev; > > > + unsigned int addr = ch->address; > > > + unsigned int regval; > > > + int ret; > > > + > > > + pm_runtime_get_sync(dev); > > > + ret = regmap_read(priv->regmap, addr, ®val); > > > + pm_runtime_mark_last_busy(dev); > > > + pm_runtime_put(dev); > > > + if (ret) > > > + return ret; > > > + > > > + /* Power and VBUS is unsigned 16-bit, others are signed 16-bit */ > > > + if (addr == RTQ6056_REG_BUSVOLT || addr == RTQ6056_REG_POWER) > > > + *val = regval; > > > + else > > > + *val = sign_extend32(regval, 16); > > > + > > > > One blank line only. > > > > > + > > > + return IIO_VAL_INT; > > > +} > > > + > > ... > > > > > > > + > > > +static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, > > > + struct iio_chan_spec const *chan, int val, > > > + int val2, long mask) > > > +{ > > > + struct rtq6056_priv *priv = iio_priv(indio_dev); > > > + > > > + if (iio_buffer_enabled(indio_dev)) > > > > This is racy as can enter buffered mode immediately after this check. > > Use iio_device_claim_direct_mode() to avoid any races around this. > > > for the shunt resistor attribute write, also? > > > + return -EBUSY; > > > + > > > + switch (mask) { > > > + case IIO_CHAN_INFO_INT_TIME: > > > + return rtq6056_adc_set_conv_time(priv, chan, val); > > > + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: > > > + return rtq6056_adc_set_average(priv, val); > > > + default: > > > + return -EINVAL; > > > + } > > > +} > > > > > > > + > > > +static void rtq6056_remove(void *dev) > > > +{ > > > + pm_runtime_dont_use_autosuspend(dev); > > > + pm_runtime_disable(dev); > > > + pm_runtime_set_suspended(dev); > > > > There isn't anything here to push the device into a suspend state, so why > > does calling pm_runtime_set_suspended() make sense? > > > As I know, It is needed, at least 'pm_runtime_set_suspended' must be kept. > > To think one case, adc is reading, module is removing. > Who will change the IC state to off? That's not what set_suspended does. We aren't telling the device to 'suspend' we are telling the runtime pm code that it already is. If you want that to be the case, then you need to manually call whatever your driver needs to do to suspend the device. Note that if runtime pm is not configured into the kernel, everything should still work. That is you should always power the device up in probe() and down in remove(). That powerdown is needs to not use the runtime pm paths (as they aren't being built in such a kernel!) > > pm_runtime is already disabled, the IC will be kept in 'active', right? > > > +} > > > + > > > > > > + > > > +static int rtq6056_probe(struct i2c_client *i2c) > > > +{ > > > + struct iio_dev *indio_dev; > > > + struct rtq6056_priv *priv; > > > + struct device *dev = &i2c->dev; > > > + struct regmap *regmap; > > > + unsigned int vendor_id, shunt_resistor_uohm; > > > + int ret; > > > + > > > + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > > > + return -EOPNOTSUPP; > > > + > > > + indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); > > > + if (!indio_dev) > > > + return -ENOMEM; > > > + > > > + priv = iio_priv(indio_dev); > > > + priv->dev = dev; > > > + priv->vshuntct_us = priv->vbusct_us = 1037; > > > + priv->avg_sample = 1; > > > + i2c_set_clientdata(i2c, priv); > > > + > > > + regmap = devm_regmap_init_i2c(i2c, &rtq6056_regmap_config); > > > + if (IS_ERR(regmap)) > > > + return dev_err_probe(dev, PTR_ERR(regmap), > > > + "Failed to init regmap\n"); > > > + > > > + priv->regmap = regmap; > > > + > > > + ret = regmap_read(regmap, RTQ6056_REG_MANUFACTID, &vendor_id); > > > + if (ret) > > > + return dev_err_probe(dev, ret, > > > + "Failed to get manufacturer info\n"); > > > + > > > + if (vendor_id != RTQ6056_VENDOR_ID) > > > + return dev_err_probe(dev, -ENODEV, > > > + "Invalid vendor id 0x%04x\n", vendor_id); > > > + > > > + ret = devm_regmap_field_bulk_alloc(dev, regmap, priv->rm_fields, > > > + rtq6056_reg_fields, F_MAX_FIELDS); > > > + if (ret) > > > + return dev_err_probe(dev, ret, "Failed to init regmap field\n"); > > > + > > > + /* > > > + * By default, configure average sample as 1, bus and shunt conversion > > > + * timea as 1037 microsecond, and operating mode to all on. > > > + */ > > > + ret = regmap_write(regmap, RTQ6056_REG_CONFIG, RTQ6056_DEFAULT_CONFIG); > > > + if (ret) > > > + return dev_err_probe(dev, ret, > > > + "Failed to enable continuous sensing\n"); > > > + > > > + pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); > > > + pm_runtime_use_autosuspend(dev); > > > + pm_runtime_set_active(dev); > > > + pm_runtime_mark_last_busy(dev); > > > + pm_runtime_enable(dev); > > > > Look at whether you can use devm_pm_runtime_enable() > > Note it handles disabling autosuspend for you. > > > > When using runtime_pm() you want to ensure that the device works without > > runtime pm support being enabled. As such, you turn the device on before > > enabling runtime_pm() and (this is missing I think) turn it off after disabling > > runtime pm. So I'd expect a devm_add_action_or_reset() call to unwind > > setting the device into continuous sending above. > > > If so, I think it's better to configure the device keep in off state > in probe stage. Only keep it in off state 'if' runtime pm is configured in. Normally you need to power the device up in probe then enable runtime pm to turn it off again (if runtime pm is supported). If runtime pm isn't supported, we just leave the device powered up the whole time until remove() when we power it down. > The calling order may need to be changed as below > devm_add_action_or_reset... > > pm_runtime_set_autosuspend_delay > pm_runtime_use_auto_suspend > devm_pm_runtime_enable > > > > + > > > + ret = devm_add_action_or_reset(dev, rtq6056_remove, dev); > > > > The callback naming is too generic. It should give some indication > > of what it is undoing (much of probe is handled by other devm_ callbacks). > > > How about to change the name to 'rtq6056_enter_shutdown_state'? > And in this function, to change the device state in shutdown with > 'pm_runtime_set_suspended' API. I think this reflects back to earlier misunderstanding of what pm_runtime_set_suspended() actually does (assuming I have understood it correctly). > > > + if (ret) > > > + return ret; > > > + > > > + /* By default, use 2000 micro-ohm resistor */ > > > + shunt_resistor_uohm = 2000; > > > + device_property_read_u32(dev, "shunt-resistor-micro-ohms", > > > + &shunt_resistor_uohm); > > > + > > > + ret = rtq6056_set_shunt_resistor(priv, shunt_resistor_uohm); > > > + if (ret) > > > + return dev_err_probe(dev, ret, > > > + "Failed to init shunt resistor\n"); > > > + > > > + indio_dev->name = "rtq6056"; > > > + indio_dev->modes = INDIO_DIRECT_MODE; > > > + indio_dev->channels = rtq6056_channels; > > > + indio_dev->num_channels = ARRAY_SIZE(rtq6056_channels); > > > + indio_dev->info = &rtq6056_info; > > > + > > > + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, > > > + rtq6056_buffer_trigger_handler, > > > + NULL); > > > + if (ret) > > > + return dev_err_probe(dev, ret, > > > + "Failed to allocate iio trigger buffer\n"); > > > + > > > + return devm_iio_device_register(dev, indio_dev); > > > +} > > > > > + > > > +static const struct dev_pm_ops rtq6056_pm_ops = { > > > + RUNTIME_PM_OPS(rtq6056_runtime_suspend, rtq6056_runtime_resume, NULL) > > > > Is there any reason we can't use these same ops to achieve at least some power > > saving in suspend? i.e. use DEFINE_RUNTIME_PM_OPS() > ~~~~~~~~~~~~~~~~~~~~~~~ > Where can I find this? oops. DEFINE_RUNTIME_DEV_PM_OPS() https://elixir.bootlin.com/linux/v5.19-rc6/source/include/linux/pm_runtime.h#L37 > > > > I have tidying this up in existing drivers on my todo list as I think it is almost > > always a good idea. Note this is why there isn't a define to create the > > particular combination you have here. > > > If there's no combination like as that one, why not unify it to > '_DEFINE_DEV_PM_OPS'? > > > +}; > > > + > > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v5 2/2] iio: adc: Add rtq6056 support 2022-07-16 17:37 ` Jonathan Cameron @ 2022-07-18 3:24 ` ChiYuan Huang 0 siblings, 0 replies; 10+ messages in thread From: ChiYuan Huang @ 2022-07-18 3:24 UTC (permalink / raw) To: Jonathan Cameron Cc: Rob Herring, Krzysztof Kozlowski, Lars-Peter Clausen, cy_huang, linux-iio, lkml, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS Jonathan Cameron <jic23@kernel.org> 於 2022年7月17日 週日 凌晨1:27寫道： > > On Mon, 11 Jul 2022 10:48:17 +0800 > ChiYuan Huang <u0084500@gmail.com> wrote: > > > Jonathan Cameron <jic23@kernel.org> 於 2022年7月8日 週五 凌晨1:20寫道： > > > > > > On Wed, 6 Jul 2022 22:11:42 +0800 > > > cy_huang <u0084500@gmail.com> wrote: > > > > > > > From: ChiYuan Huang <cy_huang@richtek.com> > > > > > > > > Add Richtek rtq6056 supporting. > > > > > > > > It can be used for the system to monitor load current and power with 16-bit > > > > resolution. > > > > > > > > Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> > > > > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > > > > > > Various feedback inline. > > > > > > Thanks, > > > > > > Jonathan > > > > > > > --- > > > > Since v5 > > > > - Fix kernel version text for ABI. > > > > > > > > Since v4 > > > > - Add '__aligned(8)' for timestamp member in buffer_trigger_handler function. > > > > - Declare timestamp from 'int64_t' to more unified 's64'. > > > > > > > > Since v3 > > > > - Refine pm_runtime API calling order in 'read_channel' API. > > > > - Fix vshunt wrong scale for divider. > > > > - Refine the comment text. > > > > - Use 'devm_add_action_or_reset' to decrease the code usage in probe > > > > function. > > > > - Use RUNTIME_PM_OPS to replace SET_RUNTIME_PM_OPS. > > > > - minor fix for the comma. > > > > - Use pm_ptr to replace the direct assigned pm_ops. > > > > > > > > Since v2 > > > > - Rename file from 'rtq6056-adc' to 'rtq6056'. > > > > - Refine the ABI, if generic already defined it, remove it and check the channel > > > > report unit. > > > > - Add copyright text. > > > > - include the correct header. > > > > - change the property parsing name. > > > > - To use iio_chan_spec address field. > > > > - Refine each channel separate and shared_by_all. > > > > - Use pm_runtime and pm_runtime_autosuspend. > > > > - Remove the shutdown callback. From the HW suggestion, it's not recommended to > > > > use battery as the power supply. > > > > - Check all scale unit (voltage->mV, current->mA, power->milliWatt). > > > > - Use the read_avail to provide the interface for attribute value list. > > > > - Add comma for the last element in the const integer array. > > > > - Refine each ADC label text. > > > > - In read_label callback, replace snprintf to sysfs_emit. > > > > > > > > --- > > > > .../ABI/testing/sysfs-bus-iio-adc-rtq6056 | 6 + > > > > drivers/iio/adc/Kconfig | 15 + > > > > drivers/iio/adc/Makefile | 1 + > > > > drivers/iio/adc/rtq6056.c | 651 +++++++++++++++++++++ > > > > 4 files changed, 673 insertions(+) > > > > create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > > > create mode 100644 drivers/iio/adc/rtq6056.c > > > > > > > > diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > > > new file mode 100644 > > > > index 00000000..e89d15b > > > > --- /dev/null > > > > +++ b/Documentation/ABI/testing/sysfs-bus-iio-adc-rtq6056 > > > > @@ -0,0 +1,6 @@ > > > > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage0_integration_time > > > > +What: /sys/bus/iio/devices/iio:deviceX/in_voltage1_integration_time > > > > +KernelVersion: 5.20 > > > > +Contact: cy_huang@richtek.com > > > > +Description: > > > > + Each voltage conversion time in uS > > > > > > Please move this entry to sysfs-bus-iio > > > > > > It's a natural extension of existing standard ABI so doesn't need to be in > > > a driver specific documentation file. > > > > > > However, way back in patch 1 I gave feedback on why we don't normally use integration time > > > for voltage channels and I thought you were changing this... > > > > > I didn't intend to change this. Just cannot find any suitable > > attribute for this feature. > > From the IC interrnal, there's only one set of ADC. > > And the conversion order is bus/shunt......, average sample count to > > control the sample update interval. > > That' why the sample frequency is calculated by one second to divide > > [(bus_ct + shunt_ct) * average sample bit] (us) > > > > If it's not suitable for this attribute, I think it's better to change > > it as file attribute, not IIO channel attribute. > > > > How do you think? > > As mentioned in patch 1 discussion, we've done this before (IIRC) by defining per channel > sampling frequencies and not providing a general one. > > We might want to consider improving the documentation in ABI/testing/sysfs-bus-iio > to make that clear however. > > > > ... > > > > > > > +static int rtq6056_adc_read_channel(struct rtq6056_priv *priv, > > > > + struct iio_chan_spec const *ch, > > > > + int *val) > > > > +{ > > > > + struct device *dev = priv->dev; > > > > + unsigned int addr = ch->address; > > > > + unsigned int regval; > > > > + int ret; > > > > + > > > > + pm_runtime_get_sync(dev); > > > > + ret = regmap_read(priv->regmap, addr, ®val); > > > > + pm_runtime_mark_last_busy(dev); > > > > + pm_runtime_put(dev); > > > > + if (ret) > > > > + return ret; > > > > + > > > > + /* Power and VBUS is unsigned 16-bit, others are signed 16-bit */ > > > > + if (addr == RTQ6056_REG_BUSVOLT || addr == RTQ6056_REG_POWER) > > > > + *val = regval; > > > > + else > > > > + *val = sign_extend32(regval, 16); > > > > + > > > > > > One blank line only. > > > > > > > + > > > > + return IIO_VAL_INT; > > > > +} > > > > + > > > ... > > > > > > > > > > + > > > > +static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, > > > > + struct iio_chan_spec const *chan, int val, > > > > + int val2, long mask) > > > > +{ > > > > + struct rtq6056_priv *priv = iio_priv(indio_dev); > > > > + > > > > + if (iio_buffer_enabled(indio_dev)) > > > > > > This is racy as can enter buffered mode immediately after this check. > > > Use iio_device_claim_direct_mode() to avoid any races around this. > > > > > for the shunt resistor attribute write, also? > > > > + return -EBUSY; > > > > + > > > > + switch (mask) { > > > > + case IIO_CHAN_INFO_INT_TIME: > > > > + return rtq6056_adc_set_conv_time(priv, chan, val); > > > > + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: > > > > + return rtq6056_adc_set_average(priv, val); > > > > + default: > > > > + return -EINVAL; > > > > + } > > > > +} > > > > > > > > > > + > > > > +static void rtq6056_remove(void *dev) > > > > +{ > > > > + pm_runtime_dont_use_autosuspend(dev); > > > > + pm_runtime_disable(dev); > > > > + pm_runtime_set_suspended(dev); > > > > > > There isn't anything here to push the device into a suspend state, so why > > > does calling pm_runtime_set_suspended() make sense? > > > > > As I know, It is needed, at least 'pm_runtime_set_suspended' must be kept. > > > > To think one case, adc is reading, module is removing. > > Who will change the IC state to off? > > That's not what set_suspended does. We aren't telling the device to > 'suspend' we are telling the runtime pm code that it already is. > If you want that to be the case, then you need to manually call whatever your > driver needs to do to suspend the device. > > Note that if runtime pm is not configured into the kernel, everything should > still work. That is you should always power the device up in probe() and down > in remove(). That powerdown is needs to not use the runtime pm paths (as they > aren't being built in such a kernel!) > > > > > pm_runtime is already disabled, the IC will be kept in 'active', right? > > > > +} > > > > + > > > > > > > > + > > > > +static int rtq6056_probe(struct i2c_client *i2c) > > > > +{ > > > > + struct iio_dev *indio_dev; > > > > + struct rtq6056_priv *priv; > > > > + struct device *dev = &i2c->dev; > > > > + struct regmap *regmap; > > > > + unsigned int vendor_id, shunt_resistor_uohm; > > > > + int ret; > > > > + > > > > + if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > > > > + return -EOPNOTSUPP; > > > > + > > > > + indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); > > > > + if (!indio_dev) > > > > + return -ENOMEM; > > > > + > > > > + priv = iio_priv(indio_dev); > > > > + priv->dev = dev; > > > > + priv->vshuntct_us = priv->vbusct_us = 1037; > > > > + priv->avg_sample = 1; > > > > + i2c_set_clientdata(i2c, priv); > > > > + > > > > + regmap = devm_regmap_init_i2c(i2c, &rtq6056_regmap_config); > > > > + if (IS_ERR(regmap)) > > > > + return dev_err_probe(dev, PTR_ERR(regmap), > > > > + "Failed to init regmap\n"); > > > > + > > > > + priv->regmap = regmap; > > > > + > > > > + ret = regmap_read(regmap, RTQ6056_REG_MANUFACTID, &vendor_id); > > > > + if (ret) > > > > + return dev_err_probe(dev, ret, > > > > + "Failed to get manufacturer info\n"); > > > > + > > > > + if (vendor_id != RTQ6056_VENDOR_ID) > > > > + return dev_err_probe(dev, -ENODEV, > > > > + "Invalid vendor id 0x%04x\n", vendor_id); > > > > + > > > > + ret = devm_regmap_field_bulk_alloc(dev, regmap, priv->rm_fields, > > > > + rtq6056_reg_fields, F_MAX_FIELDS); > > > > + if (ret) > > > > + return dev_err_probe(dev, ret, "Failed to init regmap field\n"); > > > > + > > > > + /* > > > > + * By default, configure average sample as 1, bus and shunt conversion > > > > + * timea as 1037 microsecond, and operating mode to all on. > > > > + */ > > > > + ret = regmap_write(regmap, RTQ6056_REG_CONFIG, RTQ6056_DEFAULT_CONFIG); > > > > + if (ret) > > > > + return dev_err_probe(dev, ret, > > > > + "Failed to enable continuous sensing\n"); > > > > + > > > > + pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); > > > > + pm_runtime_use_autosuspend(dev); > > > > + pm_runtime_set_active(dev); > > > > + pm_runtime_mark_last_busy(dev); > > > > + pm_runtime_enable(dev); > > > > > > Look at whether you can use devm_pm_runtime_enable() > > > Note it handles disabling autosuspend for you. > > > > > > When using runtime_pm() you want to ensure that the device works without > > > runtime pm support being enabled. As such, you turn the device on before > > > enabling runtime_pm() and (this is missing I think) turn it off after disabling > > > runtime pm. So I'd expect a devm_add_action_or_reset() call to unwind > > > setting the device into continuous sending above. > > > > > If so, I think it's better to configure the device keep in off state > > in probe stage. > > Only keep it in off state 'if' runtime pm is configured in. > Normally you need to power the device up in probe then > enable runtime pm to turn it off again (if runtime pm is supported). > If runtime pm isn't supported, we just leave the device powered up the whole > time until remove() when we power it down. > > > The calling order may need to be changed as below > > devm_add_action_or_reset... > > > > pm_runtime_set_autosuspend_delay > > pm_runtime_use_auto_suspend > > devm_pm_runtime_enable > > > > > > > > > + > > > > + ret = devm_add_action_or_reset(dev, rtq6056_remove, dev); > > > > > > The callback naming is too generic. It should give some indication > > > of what it is undoing (much of probe is handled by other devm_ callbacks). > > > > > How about to change the name to 'rtq6056_enter_shutdown_state'? > > And in this function, to change the device state in shutdown with > > 'pm_runtime_set_suspended' API. > > I think this reflects back to earlier misunderstanding of what > pm_runtime_set_suspended() actually does (assuming I have understood it > correctly). > Ok, I really misunderstand it. > > > > + if (ret) > > > > + return ret; > > > > + > > > > + /* By default, use 2000 micro-ohm resistor */ > > > > + shunt_resistor_uohm = 2000; > > > > + device_property_read_u32(dev, "shunt-resistor-micro-ohms", > > > > + &shunt_resistor_uohm); > > > > + > > > > + ret = rtq6056_set_shunt_resistor(priv, shunt_resistor_uohm); > > > > + if (ret) > > > > + return dev_err_probe(dev, ret, > > > > + "Failed to init shunt resistor\n"); > > > > + > > > > + indio_dev->name = "rtq6056"; > > > > + indio_dev->modes = INDIO_DIRECT_MODE; > > > > + indio_dev->channels = rtq6056_channels; > > > > + indio_dev->num_channels = ARRAY_SIZE(rtq6056_channels); > > > > + indio_dev->info = &rtq6056_info; > > > > + > > > > + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, > > > > + rtq6056_buffer_trigger_handler, > > > > + NULL); > > > > + if (ret) > > > > + return dev_err_probe(dev, ret, > > > > + "Failed to allocate iio trigger buffer\n"); > > > > + > > > > + return devm_iio_device_register(dev, indio_dev); > > > > +} > > > > > > > + > > > > +static const struct dev_pm_ops rtq6056_pm_ops = { > > > > + RUNTIME_PM_OPS(rtq6056_runtime_suspend, rtq6056_runtime_resume, NULL) > > > > > > Is there any reason we can't use these same ops to achieve at least some power > > > saving in suspend? i.e. use DEFINE_RUNTIME_PM_OPS() > > ~~~~~~~~~~~~~~~~~~~~~~~ > > Where can I find this? > > oops. DEFINE_RUNTIME_DEV_PM_OPS() > https://elixir.bootlin.com/linux/v5.19-rc6/source/include/linux/pm_runtime.h#L37 > OK, it's really new API. That's why I cannot find it. Due to there's no reply in several days, so I already submit the v6 as my understanding. The last is to use 'DEFINE_RUNTIME_DEV_PM_OPS'. I think it's better than just to declare 'runtime_enable' and 'runtime_disable'. This API also consider system suspend and resume. Will be added in v7. > > > > > > I have tidying this up in existing drivers on my todo list as I think it is almost > > > always a good idea. Note this is why there isn't a define to create the > > > particular combination you have here. > > > > > If there's no combination like as that one, why not unify it to > > '_DEFINE_DEV_PM_OPS'? > > > > +}; > > > > + > > > > ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-07-18 5:44 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-07-06 14:11 [PATCH v5 0/2] Add Richtek RTQ6056 support cy_huang 2022-07-06 14:11 ` [PATCH v5 1/2] dt-bindings: iio: adc: Add rtq6056 adc support cy_huang 2022-07-06 14:11 ` [PATCH v5 2/2] iio: adc: Add rtq6056 support cy_huang 2022-07-07 17:30 ` Jonathan Cameron 2022-07-11 2:48 ` ChiYuan Huang 2022-07-11 3:16 ` ChiYuan Huang 2022-07-16 17:39 ` Jonathan Cameron 2022-07-18 5:44 ` ChiYuan Huang 2022-07-16 17:37 ` Jonathan Cameron 2022-07-18 3:24 ` ChiYuan Huang
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.