On Thu, Sep 28, 2023 at 09:37:16AM +0200, Nuno Sá wrote: > Hi Antoniu, > > some comments from me... > > On Tue, 2023-09-26 at 17:05 +0300, Antoniu Miclaus wrote: > > Add support for LTC2991 Octal I2C Voltage, Current, and Temperature > > Monitor. > > > > The LTC2991 is used to monitor system temperatures, voltages and > > currents. Through the I 2C serial interface, theeight monitors can > > individually measure supply voltages and can be paired for > > differential measurements of current sense resistors or temperature > > sensing transistors. Additional measurements include internal > > temperature and internal VCC. > > > > Signed-off-by: Antoniu Miclaus <antoniu.miclaus@xxxxxxxxxx> > > --- > > Documentation/hwmon/index.rst | 1 + > > Documentation/hwmon/ltc2991.rst | 43 +++ > > MAINTAINERS | 8 + > > drivers/hwmon/Kconfig | 11 + > > drivers/hwmon/Makefile | 1 + > > drivers/hwmon/ltc2991.c | 490 ++++++++++++++++++++++++++++++++ > > 6 files changed, 554 insertions(+) > > create mode 100644 Documentation/hwmon/ltc2991.rst > > create mode 100644 drivers/hwmon/ltc2991.c > > > > diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst > > index 88dadea85cfc..0ec96abe3f7d 100644 > > --- a/Documentation/hwmon/index.rst > > +++ b/Documentation/hwmon/index.rst > > @@ -121,6 +121,7 @@ Hardware Monitoring Kernel Drivers > > ltc2947 > > ltc2978 > > ltc2990 > > + ltc2991 > > ltc3815 > > ltc4151 > > ltc4215 > > diff --git a/Documentation/hwmon/ltc2991.rst b/Documentation/hwmon/ltc2991.rst > > new file mode 100644 > > index 000000000000..9ab29dd85012 > > --- /dev/null > > +++ b/Documentation/hwmon/ltc2991.rst > > @@ -0,0 +1,43 @@ > > +.. SPDX-License-Identifier: GPL-2.0 > > + > > +Kernel driver ltc2991 > > +===================== > > + > > +Supported chips: > > + > > + * Analog Devices LTC2991 > > + > > + Prefix: 'ltc2991' > > + > > + Addresses scanned: I2C 0x48 - 0x4f > > + > > + Datasheet: > > https://www.analog.com/media/en/technical-documentation/data-sheets/2991ff.pdf > > + > > +Authors: > > + > > + - Antoniu Miclaus <antoniu.miclaus@xxxxxxxxxx> > > + > > + > > +Description > > +----------- > > + > > +This driver supports hardware monitoring for Analog Devices LTC2991 Octal I2C > > +Voltage, Current and Temperature Monitor. > > + > > +The LTC2991 is used to monitor system temperatures, voltages and currents. > > +Through the I2C serial interface, the eight monitors can individually measure > > +supply voltages and can be paired for differential measurements of current sense > > +resistors or temperature sensing transistors. Additional measurements include > > +internal temperatureand internal VCC. > > + > > + > > +sysfs-Interface > > +------------- > > + > > +The following attributes are supported. Limits are read-only. > > + > > +=============== ================= > > +inX_input: voltage input > > +currX_input: current input > > +tempX_input: temperature input > > +=============== ================= > > diff --git a/MAINTAINERS b/MAINTAINERS > > index b19995690904..98dd8a8e1f84 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -12451,6 +12451,14 @@ F: drivers/hwmon/ltc2947-i2c.c > > F: drivers/hwmon/ltc2947-spi.c > > F: drivers/hwmon/ltc2947.h > > > > +LTC2991 HARDWARE MONITOR DRIVER > > +M: Antoniu Miclaus <antoniu.miclaus@xxxxxxxxxx> > > +L: linux-hwmon@xxxxxxxxxxxxxxx > > +S: Supported > > +W: https://ez.analog.com/linux-software-drivers > > +F: Documentation/devicetree/bindings/hwmon/adi,ltc2991.yaml > > +F: drivers/hwmon/ltc2991.c > > + > > LTC2983 IIO TEMPERATURE DRIVER > > M: Nuno Sá <nuno.sa@xxxxxxxxxx> > > L: linux-iio@xxxxxxxxxxxxxxx > > diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig > > index ec38c8892158..818a67328fcd 100644 > > --- a/drivers/hwmon/Kconfig > > +++ b/drivers/hwmon/Kconfig > > @@ -932,6 +932,17 @@ config SENSORS_LTC2990 > > This driver can also be built as a module. If so, the module will > > be called ltc2990. > > > > +config SENSORS_LTC2991 > > + tristate "Analog Devices LTC2991" > > + depends on I2C > > + help > > + If you say yes here you get support for Analog Devices LTC2991 > > + Octal I2C Voltage, Current, and Temperature Monitor. The LTC2991 > > + supports a combination of voltage, current and temperature monitoring. > > + > > + This driver can also be built as a module. If so, the module will > > + be called ltc2991. > > + > > config SENSORS_LTC2992 > > tristate "Linear Technology LTC2992" > > depends on I2C > > diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile > > index 4ac9452b5430..f324d057535a 100644 > > --- a/drivers/hwmon/Makefile > > +++ b/drivers/hwmon/Makefile > > @@ -127,6 +127,7 @@ obj-$(CONFIG_SENSORS_LTC2947) += ltc2947-core.o > > obj-$(CONFIG_SENSORS_LTC2947_I2C) += ltc2947-i2c.o > > obj-$(CONFIG_SENSORS_LTC2947_SPI) += ltc2947-spi.o > > obj-$(CONFIG_SENSORS_LTC2990) += ltc2990.o > > +obj-$(CONFIG_SENSORS_LTC2991) += ltc2991.o > > obj-$(CONFIG_SENSORS_LTC2992) += ltc2992.o > > obj-$(CONFIG_SENSORS_LTC4151) += ltc4151.o > > obj-$(CONFIG_SENSORS_LTC4215) += ltc4215.o > > diff --git a/drivers/hwmon/ltc2991.c b/drivers/hwmon/ltc2991.c > > new file mode 100644 > > index 000000000000..51a60ca8c24e > > --- /dev/null > > +++ b/drivers/hwmon/ltc2991.c > > @@ -0,0 +1,490 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Copyright (C) 2023 Analog Devices, Inc. > > + * Author: Antoniu Miclaus <antoniu.miclaus@xxxxxxxxxx> > > + */ > > + > > +#include <linux/bitops.h> > > +#include <linux/err.h> > > +#include <linux/hwmon.h> > > +#include <linux/hwmon-sysfs.h> > > +#include <linux/i2c.h> > > +#include <linux/kernel.h> > > +#include <linux/module.h> > > +#include <linux/property.h> > > +#include <linux/regmap.h> > > +#include <linux/regulator/consumer.h> > > + > > +#define LTC2991_STATUS_LOW 0x00 > > +#define LTC2991_CH_EN_TRIGGER 0x01 > > +#define LTC2991_V1_V4_CTRL 0x06 > > +#define LTC2991_V5_V8_CTRL 0x07 > > +#define LTC2991_PWM_TH_LSB_T_INT 0x08 > > +#define LTC2991_PWM_TH_MSB 0x09 > > +#define LTC2991_CHANNEL_V_MSB(x) (0x0A + ((x) * 2)) > > +#define LTC2991_CHANNEL_T_MSB(x) (0x0A + ((x) * 4)) > > +#define LTC2991_CHANNEL_C_MSB(x) (0x0C + ((x) * 4)) > > +#define LTC2991_T_INT_MSB 0x1A > > +#define LTC2991_VCC_MSB 0x1C > > + > > +#define LTC2991_V7_V8_EN BIT(7) > > +#define LTC2991_V5_V6_EN BIT(6) > > +#define LTC2991_V3_V4_EN BIT(5) > > +#define LTC2991_V1_V2_EN BIT(4) > > +#define LTC2991_T_INT_VCC_EN BIT(3) > > + > > +#define LTC2991_V3_V4_FILT_EN BIT(7) > > +#define LTC2991_V3_V4_TEMP_EN BIT(5) > > +#define LTC2991_V3_V4_DIFF_EN BIT(4) > > +#define LTC2991_V1_V2_FILT_EN BIT(3) > > +#define LTC2991_V1_V2_TEMP_EN BIT(1) > > +#define LTC2991_V1_V2_DIFF_EN BIT(0) > > + > > +#define LTC2991_V7_V8_FILT_EN BIT(7) > > +#define LTC2991_V7_V8_TEMP_EN BIT(5) > > +#define LTC2991_V7_V8_DIFF_EN BIT(4) > > +#define LTC2991_V5_V6_FILT_EN BIT(7) > > +#define LTC2991_V5_V6_TEMP_EN BIT(5) > > +#define LTC2991_V5_V6_DIFF_EN BIT(4) > > + > > +#define LTC2991_REPEAT_ACQ_EN BIT(4) > > +#define LTC2991_T_INT_FILT_EN BIT(3) > > + > > +#define LTC2991_MAX_CHANNEL 4 > > +#define LTC2991_T_INT_CH_NR 4 > > +#define LTC2991_VCC_CH_NR 0 > > + > > +static const char *const label_voltages[] = { > > + "vcc", > > + "voltage1", > > + "voltage2", > > + "voltage3", > > + "voltage4", > > + "voltage5", > > + "voltage6", > > + "voltage7", > > + "voltage8" > > +}; > > + > > +static const char *const label_temp[] = { > > + "t1", > > + "t2", > > + "t3", > > + "t4", > > + "t_int" > > +}; > > + > > +static const char *const label_curr[] = { > > + "v1-v2", > > + "v3-v4", > > + "v5-v6", > > + "v7-v8" > > +}; > > + > > +struct ltc2991_state { > > + struct i2c_client *client; > > + struct regmap *regmap; > > + u32 r_sense_mohm[LTC2991_MAX_CHANNEL]; > > + bool temp_en[LTC2991_MAX_CHANNEL]; > > +}; > > + > > +static int ltc2991_read_reg(struct ltc2991_state *st, u8 addr, u8 reg_len, > > + int *val) > > +{ > > + u8 regvals[2]; > > + int ret; > > + int i; > > + > > + ret = regmap_bulk_read(st->regmap, addr, regvals, reg_len); > > + if (ret) > > + return ret; > > + > > + *val = 0; > > + for (i = 0; i < reg_len; i++) > > + *val |= regvals[reg_len - i - 1] << (i * 8); > > Hmm this does not look good :)... You should use proper __be annotations and API... > > > + > > + return 0; > > +} > > + > > +static int ltc2991_get_voltage(struct ltc2991_state *st, u32 reg, long *val) > > +{ > > + int reg_val, ret, offset = 0; > > + > > + ret = ltc2991_read_reg(st, reg, 2, ®_val); > > + if (ret) > > + return ret; > > + > > + if (reg == LTC2991_VCC_MSB) > > + /* Vcc 2.5V offset */ > > + offset = 2500; > > + > > + /* Vx, 305.18uV/LSB */ > > + *val = DIV_ROUND_CLOSEST(sign_extend32(reg_val, 14) * 30518, > > + 1000 * 100) + offset; > > + > > + return 0; > > +} > > + > > +static int ltc2991_read_in(struct device *dev, u32 attr, int channel, long *val) > > +{ > > + struct ltc2991_state *st = dev_get_drvdata(dev); > > + u32 reg; > > + > > + switch (attr) { > > + case hwmon_in_input: > > + if (channel == LTC2991_VCC_CH_NR) > > + reg = LTC2991_VCC_MSB; > > + else > > + reg = LTC2991_CHANNEL_V_MSB(channel - 1); > > + break; > > + default: > > + return -EOPNOTSUPP; > > + } > > + > > + return ltc2991_get_voltage(st, reg, val); > > +} > > + > > +static int ltc2991_get_curr(struct ltc2991_state *st, u32 reg, int channel, > > + long *val) > > +{ > > + int reg_val, ret; > > + > > + ret = ltc2991_read_reg(st, reg, 2, ®_val); > > + if (ret) > > + return ret; > > + > > + /* Vx-Vy, 19.075uV/LSB */ > > + *val = DIV_ROUND_CLOSEST(sign_extend32(reg_val, 14) * 19075, 1000) > > + / st->r_sense_mohm[channel]; > > + > > + return 0; > > +} > > + > > +static int ltc2991_read_curr(struct device *dev, u32 attr, int channel, > > + long *val) > > +{ > > + struct ltc2991_state *st = dev_get_drvdata(dev); > > + u32 reg; > > + > > + switch (attr) { > > + case hwmon_curr_input: > > + reg = LTC2991_CHANNEL_C_MSB(channel); > you could just return... > > + break; > > + default: > > + return -EOPNOTSUPP; > > + } > > + > > + return ltc2991_get_curr(st, reg, channel, val); > > +} > > + > > +static int ltc2991_get_temp(struct ltc2991_state *st, u32 reg, int channel, > > + long *val) > > +{ > > + int reg_val, ret; > > + > > + ret = ltc2991_read_reg(st, reg, 2, ®_val); > > + if (ret) > > + return ret; > > + > > + /* Temp LSB = 0.0625 Degrees */ > > + *val = DIV_ROUND_CLOSEST(sign_extend32(reg_val, 12) * 1000, 16); > > + > > + return 0; > > +} > > + > > +static int ltc2991_read_temp(struct device *dev, u32 attr, int channel, > > + long *val) > > +{ > > + struct ltc2991_state *st = dev_get_drvdata(dev); > > + u32 reg; > > + > > + switch (attr) { > > + case hwmon_temp_input: > > + if (channel == LTC2991_T_INT_CH_NR) > > + reg = LTC2991_T_INT_MSB; > > + else > > + reg = LTC2991_CHANNEL_T_MSB(channel); > > nit: you could just return in each of the statements... > > > + break; > > + default: > > + return -EOPNOTSUPP; > > + } > > + > > + return ltc2991_get_temp(st, reg, channel, val); > > +} > > + > > +static int ltc2991_read(struct device *dev, enum hwmon_sensor_types type, u32 > > attr, int channel, > > + long *val) > > +{ > > + switch (type) { > > + case hwmon_in: > > + return ltc2991_read_in(dev, attr, channel, val); > > + case hwmon_curr: > > + return ltc2991_read_curr(dev, attr, channel, val); > > + case hwmon_temp: > > + return ltc2991_read_temp(dev, attr, channel, val); > > + default: > > + return -EOPNOTSUPP; > > + } > > +} > > + > > +static umode_t ltc2991_is_visible(const void *data, enum hwmon_sensor_types type, > > u32 attr, > > + int channel) > > +{ > > + const struct ltc2991_state *st = data; > > + > > + switch (type) { > > + case hwmon_in: > > + switch (attr) { > > + case hwmon_in_input: > > + case hwmon_in_label: > > + return 0444; > > + } > > + break; > > + case hwmon_curr: > > + switch (attr) { > > + case hwmon_curr_input: > > + case hwmon_curr_label: > > + if (st->r_sense_mohm[channel]) > > + return 0444; > > Is this is a real usecase? I mean, not having a rsense? If not, I would just make the > property mandatory... > It doesn't make sense. There should be a default if the property isn't there, and a property value of 0 should not be accepted. However, I think the chip only monitors current or voltage or temperature on each channel, so something is wrong anyway. Figure 1 in the datasheet shows this pretty well: It consumes all input pins and has one current sensor, three voltage sensors, two external temperature sensors, and the internal temperature sensor. That makes a total of 7 sensors, not all the sensors enabled here. Essentially, - If voltages are differential, only every other voltage is enabled - If temperature sensors are enabled, the corresponding output pins do not monitor voltage or current - current channels are only enabled if differential voltage measurement is enabled (or, in other words, enabling a current sensor disables the second associated voltage sensor) This must all be reflected here, and the existence of a current sense resistor should not be the deciding factor to determine if current sensing is enabled on a set of input pins. That should be explicit. Per datasheet, chip default is that all channels are configured to report voltages. Either that or, much better, the current chip configuration should be the default if there is no devicetree data (because that enables systems where defaults are set by the rom monitor or bios, and it enables module test code). Guenter
