| Message ID | 20181017225622.8366-1-kunyi@google.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [1/2] hwmon: (pmbus): Add driver for Intersil ISL68137 | expand |
On 10/17/2018 03:56 PM, Kun Yi wrote: > From: Robert Lippert <rlippert@google.com> > > This patch adds sysfs files avs(0|1)_enabled underneath the I2C device > to control the AVS state of each rail and perform the appropriate > hacks when enabling AVS. > > The ISL68137 has issues wrt AVS operation mode that require it > to be enabled/disabled at runtime. > This is quite unusual. This would usually be handled in ROMMON/BIOS for devices like this. What are those issues ? > Additionally enabling AVS mode requires a hack to set the VOUT value > before enabling to make sure that the device does not switch to > an old cached AVS provided value and is instead in a "clean" state > before booting. > > Signed-off-by: Robert Lippert <rlippert@google.com> > Signed-off-by: Kun Yi <kunyi@google.com> > --- > drivers/hwmon/pmbus/isl68137.c | 120 ++++++++++++++++++++++++++++++++- > 1 file changed, 118 insertions(+), 2 deletions(-) > > diff --git a/drivers/hwmon/pmbus/isl68137.c b/drivers/hwmon/pmbus/isl68137.c > index 2a5322e4a286..94e2894f13bc 100644 > --- a/drivers/hwmon/pmbus/isl68137.c > +++ b/drivers/hwmon/pmbus/isl68137.c > @@ -19,8 +19,11 @@ > #include <linux/init.h> > #include <linux/err.h> > #include <linux/i2c.h> > +#include <linux/hwmon-sysfs.h> > #include "pmbus.h" > > +#define ISL68137_VOUT_AVS 0x30 > + > static struct pmbus_driver_info isl68137_info = { > .pages = 2, > .format[PSC_VOLTAGE_IN] = direct, > @@ -56,10 +59,123 @@ static struct pmbus_driver_info isl68137_info = { > | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_POUT, > }; > > +static ssize_t isl68137_avs_enable_show_page(struct i2c_client *client, > + int page, > + char *buf) > +{ > + int val = pmbus_read_byte_data(client, page, PMBUS_OPERATION); > + > + return sprintf(buf, "%d\n", > + (val & ISL68137_VOUT_AVS) == ISL68137_VOUT_AVS ? 1 : 0); > +} > + > +static ssize_t isl68137_avs_enable_store_page(struct i2c_client *client, > + int page, > + const char *buf, size_t count) > +{ > + int rc, op_val; > + > + if (count < 1) { > + rc = -EINVAL; > + goto out; > + } > + > + switch (buf[0]) { > + case '0': > + op_val = 0; > + break; > + case '1': > + op_val = ISL68137_VOUT_AVS; > + break; > + default: > + rc = -EINVAL; > + goto out; > + } > + Please use kstrtobool(). > + /* > + * Writes to VOUT setpoint over AVSBus will persist after the VRM is > + * switched to PMBus control. Switching back to AVSBus control > + * restores this persisted setpoint rather than re-initializing to > + * PMBus VOUT_COMMAND. Writing VOUT_COMMAND first over PMBus before > + * enabling AVS control is the workaround. > + */ > + if (op_val == ISL68137_VOUT_AVS) { > + int vout_command = pmbus_read_word_data(client, page, > + PMBUS_VOUT_COMMAND); > + rc = pmbus_write_word_data(client, page, PMBUS_VOUT_COMMAND, > + vout_command); > + if (rc) > + goto out; Does it make a difference if bit 1 is set in the operation register ? > + } > + > + rc = pmbus_update_byte_data(client, page, PMBUS_OPERATION, > + ISL68137_VOUT_AVS, op_val); > + > +out: > + return rc < 0 ? rc : count; > +} > + > +static ssize_t isl68137_avs_enable_show(struct device *dev, > + struct device_attribute *devattr, > + char *buf) > +{ > + struct i2c_client *client = kobj_to_i2c_client(&dev->kobj); > + struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr); > + > + return isl68137_avs_enable_show_page(client, attr->index, buf); > +} > + > +static ssize_t isl68137_avs_enable_store(struct device *dev, > + struct device_attribute *devattr, > + const char *buf, size_t count) > +{ > + struct i2c_client *client = kobj_to_i2c_client(&dev->kobj); > + struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr); > + > + return isl68137_avs_enable_store_page(client, attr->index, buf, count); > +} > + > +static SENSOR_DEVICE_ATTR_2(avs0_enabled, 0644, > + isl68137_avs_enable_show, isl68137_avs_enable_store, > + 0, 0); > +static SENSOR_DEVICE_ATTR_2(avs1_enabled, 0644, > + isl68137_avs_enable_show, isl68137_avs_enable_store, > + 0, 1); > + Why ATTR_2 ? That seems quite pointless. I would suggest to use _enable as attribute name, but I understand this is POV, so I won't insist on it. > +static int isl68137_remove(struct i2c_client *client); > + Please move the remove function to this location. > static int isl68137_probe(struct i2c_client *client, > const struct i2c_device_id *id) > { > - return pmbus_do_probe(client, id, &isl68137_info); > + int rc; > + > + rc = pmbus_do_probe(client, id, &isl68137_info); > + if (rc) > + return rc; > + > + rc = device_create_file(&client->dev, > + &sensor_dev_attr_avs0_enabled.dev_attr); > + if (rc) > + goto out_fail; > + rc = device_create_file(&client->dev, > + &sensor_dev_attr_avs1_enabled.dev_attr); > + if (rc) > + goto out_fail; > + This creadtes the device files after the hwmon device is created, which may confuse userspace if it is triggered by the creation of the hwmon device. You might consider creating the device files before registering the hwmon device. That makes removal on error a bit more complex, though, so I'll leave it up to you. > + return rc; > + > +out_fail: > + isl68137_remove(client); > + return rc; > +} > + > +static int isl68137_remove(struct i2c_client *client) > +{ > + device_remove_file(&client->dev, > + &sensor_dev_attr_avs1_enabled.dev_attr); > + device_remove_file(&client->dev, > + &sensor_dev_attr_avs0_enabled.dev_attr); > + return pmbus_do_remove(client); > } > > static const struct i2c_device_id isl68137_id[] = { > @@ -75,7 +191,7 @@ static struct i2c_driver isl68137_driver = { > .name = "isl68137", > }, > .probe = isl68137_probe, > - .remove = pmbus_do_remove, > + .remove = isl68137_remove, > .id_table = isl68137_id, > }; > >
diff --git a/drivers/hwmon/pmbus/isl68137.c b/drivers/hwmon/pmbus/isl68137.c index 2a5322e4a286..94e2894f13bc 100644 --- a/drivers/hwmon/pmbus/isl68137.c +++ b/drivers/hwmon/pmbus/isl68137.c @@ -19,8 +19,11 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/i2c.h> +#include <linux/hwmon-sysfs.h> #include "pmbus.h" +#define ISL68137_VOUT_AVS 0x30 + static struct pmbus_driver_info isl68137_info = { .pages = 2, .format[PSC_VOLTAGE_IN] = direct, @@ -56,10 +59,123 @@ static struct pmbus_driver_info isl68137_info = { | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_POUT, }; +static ssize_t isl68137_avs_enable_show_page(struct i2c_client *client, + int page, + char *buf) +{ + int val = pmbus_read_byte_data(client, page, PMBUS_OPERATION); + + return sprintf(buf, "%d\n", + (val & ISL68137_VOUT_AVS) == ISL68137_VOUT_AVS ? 1 : 0); +} + +static ssize_t isl68137_avs_enable_store_page(struct i2c_client *client, + int page, + const char *buf, size_t count) +{ + int rc, op_val; + + if (count < 1) { + rc = -EINVAL; + goto out; + } + + switch (buf[0]) { + case '0': + op_val = 0; + break; + case '1': + op_val = ISL68137_VOUT_AVS; + break; + default: + rc = -EINVAL; + goto out; + } + + /* + * Writes to VOUT setpoint over AVSBus will persist after the VRM is + * switched to PMBus control. Switching back to AVSBus control + * restores this persisted setpoint rather than re-initializing to + * PMBus VOUT_COMMAND. Writing VOUT_COMMAND first over PMBus before + * enabling AVS control is the workaround. + */ + if (op_val == ISL68137_VOUT_AVS) { + int vout_command = pmbus_read_word_data(client, page, + PMBUS_VOUT_COMMAND); + rc = pmbus_write_word_data(client, page, PMBUS_VOUT_COMMAND, + vout_command); + if (rc) + goto out; + } + + rc = pmbus_update_byte_data(client, page, PMBUS_OPERATION, + ISL68137_VOUT_AVS, op_val); + +out: + return rc < 0 ? rc : count; +} + +static ssize_t isl68137_avs_enable_show(struct device *dev, + struct device_attribute *devattr, + char *buf) +{ + struct i2c_client *client = kobj_to_i2c_client(&dev->kobj); + struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr); + + return isl68137_avs_enable_show_page(client, attr->index, buf); +} + +static ssize_t isl68137_avs_enable_store(struct device *dev, + struct device_attribute *devattr, + const char *buf, size_t count) +{ + struct i2c_client *client = kobj_to_i2c_client(&dev->kobj); + struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr); + + return isl68137_avs_enable_store_page(client, attr->index, buf, count); +} + +static SENSOR_DEVICE_ATTR_2(avs0_enabled, 0644, + isl68137_avs_enable_show, isl68137_avs_enable_store, + 0, 0); +static SENSOR_DEVICE_ATTR_2(avs1_enabled, 0644, + isl68137_avs_enable_show, isl68137_avs_enable_store, + 0, 1); + +static int isl68137_remove(struct i2c_client *client); + static int isl68137_probe(struct i2c_client *client, const struct i2c_device_id *id) { - return pmbus_do_probe(client, id, &isl68137_info); + int rc; + + rc = pmbus_do_probe(client, id, &isl68137_info); + if (rc) + return rc; + + rc = device_create_file(&client->dev, + &sensor_dev_attr_avs0_enabled.dev_attr); + if (rc) + goto out_fail; + rc = device_create_file(&client->dev, + &sensor_dev_attr_avs1_enabled.dev_attr); + if (rc) + goto out_fail; + + return rc; + +out_fail: + isl68137_remove(client); + return rc; +} + +static int isl68137_remove(struct i2c_client *client) +{ + device_remove_file(&client->dev, + &sensor_dev_attr_avs1_enabled.dev_attr); + device_remove_file(&client->dev, + &sensor_dev_attr_avs0_enabled.dev_attr); + return pmbus_do_remove(client); } static const struct i2c_device_id isl68137_id[] = { @@ -75,7 +191,7 @@ static struct i2c_driver isl68137_driver = { .name = "isl68137", }, .probe = isl68137_probe, - .remove = pmbus_do_remove, + .remove = isl68137_remove, .id_table = isl68137_id, };