On Tue, Feb 15, 2022 at 09:10:22AM -0600, Eddie James wrote:
> Export the power caps data for the soft minimum power cap through hwmon.
>
> Signed-off-by: Eddie James <eajames@xxxxxxxxxxxxx>
> Reviewed-by: Joel Stanley <joel@xxxxxxxxx>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> drivers/hwmon/occ/common.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c
> index 0cb4a0a6cbc1..f00cd59f1d19 100644
> --- a/drivers/hwmon/occ/common.c
> +++ b/drivers/hwmon/occ/common.c
> @@ -674,6 +674,9 @@ static ssize_t occ_show_caps_3(struct device *dev,
> case 7:
> val = caps->user_source;
> break;
> + case 8:
> + val = get_unaligned_be16(&caps->soft_min) * 1000000ULL;
> + break;
> default:
> return -EINVAL;
> }
> @@ -835,12 +838,13 @@ static int occ_setup_sensor_attrs(struct occ *occ)
> case 1:
> num_attrs += (sensors->caps.num_sensors * 7);
> break;
> - case 3:
> - show_caps = occ_show_caps_3;
> - fallthrough;
> case 2:
> num_attrs += (sensors->caps.num_sensors * 8);
> break;
> + case 3:
> + show_caps = occ_show_caps_3;
> + num_attrs += (sensors->caps.num_sensors * 9);
> + break;
> default:
> sensors->caps.num_sensors = 0;
> }
> @@ -1047,6 +1051,15 @@ static int occ_setup_sensor_attrs(struct occ *occ)
> attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
> show_caps, NULL, 7, 0);
> attr++;
> +
> + if (sensors->caps.version > 2) {
> + snprintf(attr->name, sizeof(attr->name),
> + "power%d_cap_min_soft", s);
> + attr->sensor = OCC_INIT_ATTR(attr->name, 0444,
> + show_caps, NULL,
> + 8, 0);
> + attr++;
> + }
> }
> }
>
