Received-SPF: pass (google.com: domain of linux-kernel+bounces-200559-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <dbb9dfe5-8812-482a-b384-8e86e0a8eb8f@gmx.de>
Date: Tue, 4 Jun 2024 14:02:02 +0200
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] power: supply: hwmon: Add support for power sensors
From: Armin Wolf <W_Armin@gmx.de>
To: sre@kernel.org
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20240528222115.791511-1-W_Armin@gmx.de>
Content-Language: en-US
In-Reply-To: <20240528222115.791511-1-W_Armin@gmx.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
UI-OutboundReport: notjunk:1;M01:P0:iT6Rdzp9fZk=;MgFU7dgpZqTBoBPmsFhNCV8J163
 D3BtPVx6vp9dGvWv1/098HAfNW42tuvLwVRlhDkJnwNSGF89nnSQUs/CtZJTmjl9NKWWkBdOa
 nse9igQ9no5HpeBP8NHh3Jg2v1SyVD+OSbJ3gwC1yVG44PGBxIwDvUdBArY/CYXTyfgu1uZII
 nuSwoQhYgyczUza+9UJjBxNu305THAuZ0mzcDYzcn3wVvW1kH1w7wjfh1aXCQh/5vLW1u1AzX
 iIZCu6IeXLOmu+7voRsEs1pwwXnAYD69R7eK9wBEQJH6vVvFsYI4kyM8oa+/1zf+/tGPQzg7p
 9oyTMHM7eCIZhaVBHSPfu/vFNMU64c96olFJttbLPWfYDwajXNSSlaSxz3xS949uiYB6uNayf
 Qmmi2p8sIYP47x+pbyMxuDXnSbXKiakq0N8T7ZdWRB/W/j7PgGAXXIMW2lVZfZML60AOnooZP
 KOT8CIVNxpWKRloodY/95k8m8ZoxtzXp0Gcqg9lw1Iw/Q5x4mvEgm4nVkC92IHPnNi8A32oG6
 VkDtgrLlwIbJLnqdIhxL7fzBoTU9ki7IzZItWSzxraZO2txCxtTZOgS5ValGKO330cTCzzWT+
 ov7sY/GOBwz/Tu7zMINHxl7Pa99vztH+O38ACtEnSjDLYjG2528XC5RFKfT1/H9/XGNwYABpE
 /NNc2BK7YTt9rtiSlzXPY/R08SaWVYF/CoF/lI3TEkoHEFtJY7cz5YdcaMoj77tZUe88WNCGg
 PsHKUCblrRAW4vGfELbmvpHJFEJDPOJUvERyJy+/iqwy2rxMDYoO6UR/6Ke5rJLgyEyZeqPqE
 YHF2JiXC+T+v7EzbC53OYY+WTnV74Z1RDFEVCmeXZkAio=

Am 29.05.24 um 00:21 schrieb Armin Wolf:

> Currently, more than seven power supply drivers are supporting
> POWER_SUPPLY_PROP_POWER_NOW, but their power readings are not being
> reported through the hwmon subsystem.
>
> Fix this by adding support for power sensors to the power supply
> hwmon integration.

Hi, what is the status of this patch? Are there any obvious errors which
need to be fixed?

Thanks,
Armin Wolf

> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> ---
>   drivers/power/supply/power_supply_hwmon.c | 25 +++++++++++++++++++++++
>   1 file changed, 25 insertions(+)
>
> diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
> index c97893d4c25e..baacefbdf768 100644
> --- a/drivers/power/supply/power_supply_hwmon.c
> +++ b/drivers/power/supply/power_supply_hwmon.c
> @@ -48,6 +48,18 @@ static int power_supply_hwmon_curr_to_property(u32 attr)
>   	}
>   }
>
> +static int power_supply_hwmon_power_to_property(u32 attr)
> +{
> +	switch (attr) {
> +	case hwmon_power_input:
> +		return POWER_SUPPLY_PROP_POWER_NOW;
> +	case hwmon_power_average:
> +		return POWER_SUPPLY_PROP_POWER_AVG;
> +	default:
> +		return -EINVAL;
> +	}
> +}
> +
>   static int power_supply_hwmon_temp_to_property(u32 attr, int channel)
>   {
>   	if (channel) {
> @@ -90,6 +102,8 @@ power_supply_hwmon_to_property(enum hwmon_sensor_types type,
>   		return power_supply_hwmon_in_to_property(attr);
>   	case hwmon_curr:
>   		return power_supply_hwmon_curr_to_property(attr);
> +	case hwmon_power:
> +		return power_supply_hwmon_power_to_property(attr);
>   	case hwmon_temp:
>   		return power_supply_hwmon_temp_to_property(attr, channel);
>   	default:
> @@ -229,6 +243,11 @@ power_supply_hwmon_read(struct device *dev, enum hwmon_sensor_types type,
>   	case hwmon_in:
>   		pspval.intval = DIV_ROUND_CLOSEST(pspval.intval, 1000);
>   		break;
> +	case hwmon_power:
> +		/*
> +		 * Power properties are already in microwatts.
> +		 */
> +		break;
>   	/*
>   	 * Temp needs to be converted from 1/10 C to milli-C
>   	 */
> @@ -311,6 +330,10 @@ static const struct hwmon_channel_info * const power_supply_hwmon_info[] = {
>   			   HWMON_C_MAX     |
>   			   HWMON_C_INPUT),
>
> +	HWMON_CHANNEL_INFO(power,
> +			   HWMON_P_INPUT |
> +			   HWMON_P_AVERAGE),
> +
>   	HWMON_CHANNEL_INFO(in,
>   			   HWMON_I_AVERAGE |
>   			   HWMON_I_MIN     |
> @@ -359,6 +382,8 @@ int power_supply_add_hwmon_sysfs(struct power_supply *psy)
>   		case POWER_SUPPLY_PROP_CURRENT_AVG:
>   		case POWER_SUPPLY_PROP_CURRENT_MAX:
>   		case POWER_SUPPLY_PROP_CURRENT_NOW:
> +		case POWER_SUPPLY_PROP_POWER_AVG:
> +		case POWER_SUPPLY_PROP_POWER_NOW:
>   		case POWER_SUPPLY_PROP_TEMP:
>   		case POWER_SUPPLY_PROP_TEMP_MAX:
>   		case POWER_SUPPLY_PROP_TEMP_MIN:
> --
> 2.39.2
>
>