| Message ID | 1502162748-16372-3-git-send-email-eajames@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Mon, Aug 07, 2017 at 10:25:47PM -0500, eajames@linux.vnet.ibm.com wrote: > From: "Edward A. James" <eajames@us.ibm.com> > > Higher byte of the status register wasn't available for boolean alarms. > Store the STATUS_WORD register if it's available, and read it out when > queried by boolean attributes. > > The method of storing and retrieving the status reg is a bit hacky but > I couldn't work out another way without doubling the storage requirement > of every pmbus device or tearing up more of the pmbus core code. > > Signed-off-by: Edward A. James <eajames@us.ibm.com> > --- > drivers/hwmon/pmbus/pmbus_core.c | 37 +++++++++++++++++++++++++++---------- > 1 file changed, 27 insertions(+), 10 deletions(-) > > diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c > index 8511aba..3b53fa7 100644 > --- a/drivers/hwmon/pmbus/pmbus_core.c > +++ b/drivers/hwmon/pmbus/pmbus_core.c > @@ -43,7 +43,7 @@ > * Index into status register array, per status register group > */ > #define PB_STATUS_BASE 0 > -#define PB_STATUS_VOUT_BASE (PB_STATUS_BASE + PMBUS_PAGES) > +#define PB_STATUS_VOUT_BASE (PB_STATUS_BASE + (PMBUS_PAGES * 2)) > #define PB_STATUS_IOUT_BASE (PB_STATUS_VOUT_BASE + PMBUS_PAGES) > #define PB_STATUS_FAN_BASE (PB_STATUS_IOUT_BASE + PMBUS_PAGES) > #define PB_STATUS_FAN34_BASE (PB_STATUS_FAN_BASE + PMBUS_PAGES) > @@ -421,11 +421,14 @@ static struct pmbus_data *pmbus_update_device(struct device *dev) > > mutex_lock(&data->update_lock); > if (time_after(jiffies, data->last_updated + HZ) || !data->valid) { > - int i, j; > + int i, j, status; > > for (i = 0; i < info->pages; i++) { > - data->status[PB_STATUS_BASE + i] = > - data->read_status(client, i); > + status = data->read_status(client, i); > + data->status[PB_STATUS_BASE + (i * 2)] = status; > + data->status[PB_STATUS_BASE + (i * 2) + 1] = > + status >> 8; > + As mentioned before, I don't think the "waste" of some 200 bytes of memory warrants the added complexity here. > for (j = 0; j < ARRAY_SIZE(pmbus_status); j++) { > struct _pmbus_status *s = &pmbus_status[j]; > > @@ -718,6 +721,18 @@ static u16 pmbus_data2reg(struct pmbus_data *data, > return regval; > } > > +static int pmbus_get_status(struct pmbus_data *data, int reg) > +{ > + int ret; > + > + if (reg < PB_STATUS_BASE + PMBUS_PAGES) > + ret = data->status[reg * 2] | (data->status[(reg * 2) + 1] << 8); > + else > + ret = data->status[reg]; > + > + return ret; > +} ... and much less here. How much additional code does this generate ? How much execution time does it add to save some 200 bytes of data ? > + > /* > * Return boolean calculated from converted data. > * <index> defines a status register index and mask. > @@ -746,12 +761,12 @@ static int pmbus_get_boolean(struct pmbus_data *data, struct pmbus_boolean *b, > { > struct pmbus_sensor *s1 = b->s1; > struct pmbus_sensor *s2 = b->s2; > - u16 reg = (index >> 8) & 0xffff; > - u8 mask = index & 0xff; > + u16 reg = index >> 16; > + u16 mask = index & 0xffff; > int ret, status; > u8 regval; > > - status = data->status[reg]; > + status = pmbus_get_status(data, reg); > if (status < 0) > return status; > > @@ -890,7 +905,7 @@ static int pmbus_add_boolean(struct pmbus_data *data, > const char *name, const char *type, int seq, > struct pmbus_sensor *s1, > struct pmbus_sensor *s2, > - u16 reg, u8 mask) > + u16 reg, u16 mask) > { > struct pmbus_boolean *boolean; > struct sensor_device_attribute *a; > @@ -906,7 +921,7 @@ static int pmbus_add_boolean(struct pmbus_data *data, > boolean->s1 = s1; > boolean->s2 = s2; > pmbus_attr_init(a, boolean->name, S_IRUGO, pmbus_show_boolean, NULL, > - (reg << 8) | mask); > + (reg << 16) | mask); > > return pmbus_add_attribute(data, &a->dev_attr.attr); > } > @@ -992,7 +1007,7 @@ struct pmbus_limit_attr { > */ > struct pmbus_sensor_attr { > u16 reg; /* sensor register */ > - u8 gbit; /* generic status bit */ > + u16 gbit; /* generic status bit */ > u8 nlimit; /* # of limit registers */ > enum pmbus_sensor_classes class;/* sensor class */ > const char *label; /* sensor label */ > @@ -1337,6 +1352,7 @@ static int pmbus_add_sensor_attrs(struct i2c_client *client, > .func = PMBUS_HAVE_IIN, > .sfunc = PMBUS_HAVE_STATUS_INPUT, > .sbase = PB_STATUS_INPUT_BASE, > + .gbit = PB_STATUS_INPUT, The problem with this is that it assumes that the generic status bit is always available, which is not the case. You would have to add more conditionals when generating the attributes: An attribute must only be generated based on the generic status if the generic status bit is available. It is not available if (gbit & 0xff00) and there is no STATUS_WORD register. > .limit = iin_limit_attrs, > .nlimit = ARRAY_SIZE(iin_limit_attrs), > }, { > @@ -1421,6 +1437,7 @@ static int pmbus_add_sensor_attrs(struct i2c_client *client, > .func = PMBUS_HAVE_PIN, > .sfunc = PMBUS_HAVE_STATUS_INPUT, > .sbase = PB_STATUS_INPUT_BASE, > + .gbit = PB_STATUS_INPUT, > .limit = pin_limit_attrs, > .nlimit = ARRAY_SIZE(pin_limit_attrs), > }, { -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 8511aba..3b53fa7 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -43,7 +43,7 @@ * Index into status register array, per status register group */ #define PB_STATUS_BASE 0 -#define PB_STATUS_VOUT_BASE (PB_STATUS_BASE + PMBUS_PAGES) +#define PB_STATUS_VOUT_BASE (PB_STATUS_BASE + (PMBUS_PAGES * 2)) #define PB_STATUS_IOUT_BASE (PB_STATUS_VOUT_BASE + PMBUS_PAGES) #define PB_STATUS_FAN_BASE (PB_STATUS_IOUT_BASE + PMBUS_PAGES) #define PB_STATUS_FAN34_BASE (PB_STATUS_FAN_BASE + PMBUS_PAGES) @@ -421,11 +421,14 @@ static struct pmbus_data *pmbus_update_device(struct device *dev) mutex_lock(&data->update_lock); if (time_after(jiffies, data->last_updated + HZ) || !data->valid) { - int i, j; + int i, j, status; for (i = 0; i < info->pages; i++) { - data->status[PB_STATUS_BASE + i] = - data->read_status(client, i); + status = data->read_status(client, i); + data->status[PB_STATUS_BASE + (i * 2)] = status; + data->status[PB_STATUS_BASE + (i * 2) + 1] = + status >> 8; + for (j = 0; j < ARRAY_SIZE(pmbus_status); j++) { struct _pmbus_status *s = &pmbus_status[j]; @@ -718,6 +721,18 @@ static u16 pmbus_data2reg(struct pmbus_data *data, return regval; } +static int pmbus_get_status(struct pmbus_data *data, int reg) +{ + int ret; + + if (reg < PB_STATUS_BASE + PMBUS_PAGES) + ret = data->status[reg * 2] | (data->status[(reg * 2) + 1] << 8); + else + ret = data->status[reg]; + + return ret; +} + /* * Return boolean calculated from converted data. * <index> defines a status register index and mask. @@ -746,12 +761,12 @@ static int pmbus_get_boolean(struct pmbus_data *data, struct pmbus_boolean *b, { struct pmbus_sensor *s1 = b->s1; struct pmbus_sensor *s2 = b->s2; - u16 reg = (index >> 8) & 0xffff; - u8 mask = index & 0xff; + u16 reg = index >> 16; + u16 mask = index & 0xffff; int ret, status; u8 regval; - status = data->status[reg]; + status = pmbus_get_status(data, reg); if (status < 0) return status; @@ -890,7 +905,7 @@ static int pmbus_add_boolean(struct pmbus_data *data, const char *name, const char *type, int seq, struct pmbus_sensor *s1, struct pmbus_sensor *s2, - u16 reg, u8 mask) + u16 reg, u16 mask) { struct pmbus_boolean *boolean; struct sensor_device_attribute *a; @@ -906,7 +921,7 @@ static int pmbus_add_boolean(struct pmbus_data *data, boolean->s1 = s1; boolean->s2 = s2; pmbus_attr_init(a, boolean->name, S_IRUGO, pmbus_show_boolean, NULL, - (reg << 8) | mask); + (reg << 16) | mask); return pmbus_add_attribute(data, &a->dev_attr.attr); } @@ -992,7 +1007,7 @@ struct pmbus_limit_attr { */ struct pmbus_sensor_attr { u16 reg; /* sensor register */ - u8 gbit; /* generic status bit */ + u16 gbit; /* generic status bit */ u8 nlimit; /* # of limit registers */ enum pmbus_sensor_classes class;/* sensor class */ const char *label; /* sensor label */ @@ -1337,6 +1352,7 @@ static int pmbus_add_sensor_attrs(struct i2c_client *client, .func = PMBUS_HAVE_IIN, .sfunc = PMBUS_HAVE_STATUS_INPUT, .sbase = PB_STATUS_INPUT_BASE, + .gbit = PB_STATUS_INPUT, .limit = iin_limit_attrs, .nlimit = ARRAY_SIZE(iin_limit_attrs), }, { @@ -1421,6 +1437,7 @@ static int pmbus_add_sensor_attrs(struct i2c_client *client, .func = PMBUS_HAVE_PIN, .sfunc = PMBUS_HAVE_STATUS_INPUT, .sbase = PB_STATUS_INPUT_BASE, + .gbit = PB_STATUS_INPUT, .limit = pin_limit_attrs, .nlimit = ARRAY_SIZE(pin_limit_attrs), }, {