From: Guenter Roeck <linux@roeck-us.net> To: Florian Fainelli <f.fainelli@gmail.com> Cc: linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Sudeep Holla <sudeep.holla@arm.com>, Jean Delvare <jdelvare@suse.com>, linux-arm-kernel@lists.infradead.org, "open list:HARDWARE MONITORING" <linux-hwmon@vger.kernel.org> Subject: Re: [PATCH v5 2/2] hwmon: scmi: Scale values to target desired HWMON units Date: Wed, 8 May 2019 14:10:17 -0700 [thread overview] Message-ID: <20190508211017.GA29998@roeck-us.net> (raw) In-Reply-To: <20190508184635.5054-3-f.fainelli@gmail.com> On Wed, May 08, 2019 at 11:46:35AM -0700, Florian Fainelli wrote: > If the SCMI firmware implementation is reporting values in a scale that > is different from the HWMON units, we need to scale up or down the value > according to how far appart they are. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Question is which tree this series should go through. I am fine with arm. Thanks, Guenter > --- > drivers/hwmon/scmi-hwmon.c | 45 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 45 insertions(+) > > diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c > index a80183a488c5..2c7b87edf5aa 100644 > --- a/drivers/hwmon/scmi-hwmon.c > +++ b/drivers/hwmon/scmi-hwmon.c > @@ -18,6 +18,47 @@ struct scmi_sensors { > const struct scmi_sensor_info **info[hwmon_max]; > }; > > +static inline u64 __pow10(u8 x) > +{ > + u64 r = 1; > + > + while (x--) > + r *= 10; > + > + return r; > +} > + > +static int scmi_hwmon_scale(const struct scmi_sensor_info *sensor, u64 *value) > +{ > + s8 scale = sensor->scale; > + u64 f; > + > + switch (sensor->type) { > + case TEMPERATURE_C: > + case VOLTAGE: > + case CURRENT: > + scale += 3; > + break; > + case POWER: > + case ENERGY: > + scale += 6; > + break; > + default: > + break; > + } > + > + if (abs(scale) > 19) > + return -E2BIG; > + > + f = __pow10(abs(scale)); > + if (scale > 0) > + *value *= f; > + else > + *value = div64_u64(*value, f); > + > + return 0; > +} > + > static int scmi_hwmon_read(struct device *dev, enum hwmon_sensor_types type, > u32 attr, int channel, long *val) > { > @@ -29,6 +70,10 @@ static int scmi_hwmon_read(struct device *dev, enum hwmon_sensor_types type, > > sensor = *(scmi_sensors->info[type] + channel); > ret = h->sensor_ops->reading_get(h, sensor->id, false, &value); > + if (ret) > + return ret; > + > + ret = scmi_hwmon_scale(sensor, &value); > if (!ret) > *val = value; > > -- > 2.17.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Guenter Roeck <linux@roeck-us.net> To: Florian Fainelli <f.fainelli@gmail.com> Cc: "open list:HARDWARE MONITORING" <linux-hwmon@vger.kernel.org>, Jean Delvare <jdelvare@suse.com>, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Sudeep Holla <sudeep.holla@arm.com>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v5 2/2] hwmon: scmi: Scale values to target desired HWMON units Date: Wed, 8 May 2019 14:10:17 -0700 [thread overview] Message-ID: <20190508211017.GA29998@roeck-us.net> (raw) In-Reply-To: <20190508184635.5054-3-f.fainelli@gmail.com> On Wed, May 08, 2019 at 11:46:35AM -0700, Florian Fainelli wrote: > If the SCMI firmware implementation is reporting values in a scale that > is different from the HWMON units, we need to scale up or down the value > according to how far appart they are. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Question is which tree this series should go through. I am fine with arm. Thanks, Guenter > --- > drivers/hwmon/scmi-hwmon.c | 45 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 45 insertions(+) > > diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c > index a80183a488c5..2c7b87edf5aa 100644 > --- a/drivers/hwmon/scmi-hwmon.c > +++ b/drivers/hwmon/scmi-hwmon.c > @@ -18,6 +18,47 @@ struct scmi_sensors { > const struct scmi_sensor_info **info[hwmon_max]; > }; > > +static inline u64 __pow10(u8 x) > +{ > + u64 r = 1; > + > + while (x--) > + r *= 10; > + > + return r; > +} > + > +static int scmi_hwmon_scale(const struct scmi_sensor_info *sensor, u64 *value) > +{ > + s8 scale = sensor->scale; > + u64 f; > + > + switch (sensor->type) { > + case TEMPERATURE_C: > + case VOLTAGE: > + case CURRENT: > + scale += 3; > + break; > + case POWER: > + case ENERGY: > + scale += 6; > + break; > + default: > + break; > + } > + > + if (abs(scale) > 19) > + return -E2BIG; > + > + f = __pow10(abs(scale)); > + if (scale > 0) > + *value *= f; > + else > + *value = div64_u64(*value, f); > + > + return 0; > +} > + > static int scmi_hwmon_read(struct device *dev, enum hwmon_sensor_types type, > u32 attr, int channel, long *val) > { > @@ -29,6 +70,10 @@ static int scmi_hwmon_read(struct device *dev, enum hwmon_sensor_types type, > > sensor = *(scmi_sensors->info[type] + channel); > ret = h->sensor_ops->reading_get(h, sensor->id, false, &value); > + if (ret) > + return ret; > + > + ret = scmi_hwmon_scale(sensor, &value); > if (!ret) > *val = value; > > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-08 21:10 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-08 18:46 [PATCH v5 0/2] hwmon: scmi: Scale values to target desired HWMON units Florian Fainelli 2019-05-08 18:46 ` Florian Fainelli 2019-05-08 18:46 ` [PATCH v5 1/2] firmware: arm_scmi: Fetch and store sensor scale Florian Fainelli 2019-05-08 18:46 ` Florian Fainelli 2019-05-08 18:46 ` [PATCH v5 2/2] hwmon: scmi: Scale values to target desired HWMON units Florian Fainelli 2019-05-08 18:46 ` Florian Fainelli 2019-05-08 21:10 ` Guenter Roeck [this message] 2019-05-08 21:10 ` Guenter Roeck 2019-05-13 18:10 ` Florian Fainelli 2019-05-13 18:10 ` Florian Fainelli 2019-05-14 10:38 ` Sudeep Holla 2019-05-14 10:38 ` Sudeep Holla 2019-05-14 16:37 ` Sudeep Holla 2019-05-14 16:37 ` Sudeep Holla 2019-05-14 16:44 ` Florian Fainelli 2019-05-14 16:44 ` Florian Fainelli 2019-05-14 16:58 ` Guenter Roeck 2019-05-14 16:58 ` Guenter Roeck 2019-05-14 17:00 ` Sudeep Holla 2019-05-14 17:00 ` Sudeep Holla
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190508211017.GA29998@roeck-us.net \ --to=linux@roeck-us.net \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=f.fainelli@gmail.com \ --cc=jdelvare@suse.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-hwmon@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=sudeep.holla@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.