[PATCH] hwmon: (pmbus) Fix page vs. register when accessing fans

[PATCH] hwmon: (pmbus) Fix page vs. register when accessing fans

[Jan Kundrát]

Commit 16358542f32f added support for multi-phase pmbus devices.
However, when calling pmbus_add_sensor() for fans, the patch swapped
the `page` and `reg` attributes. As a result, the fan speeds were
reported as 0 RPM on my device.

Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
Fixes: 16358542f32f hwmon: (pmbus) Implement multi-phase support
---
 drivers/hwmon/pmbus/pmbus_core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git drivers/hwmon/pmbus/pmbus_core.c drivers/hwmon/pmbus/pmbus_core.c
index 8d321bf7d15b..e721a016f3e7 100644
--- drivers/hwmon/pmbus/pmbus_core.c
+++ drivers/hwmon/pmbus/pmbus_core.c
@@ -1869,7 +1869,7 @@ static int pmbus_add_fan_ctrl(struct i2c_client *client,
 	struct pmbus_sensor *sensor;
 
 	sensor = pmbus_add_sensor(data, "fan", "target", index, page,
-				  PMBUS_VIRT_FAN_TARGET_1 + id, 0xff, PSC_FAN,
+				  0xff, PMBUS_VIRT_FAN_TARGET_1 + id, PSC_FAN,
 				  false, false, true);
 
 	if (!sensor)
@@ -1880,14 +1880,14 @@ static int pmbus_add_fan_ctrl(struct i2c_client *client,
 		return 0;
 
 	sensor = pmbus_add_sensor(data, "pwm", NULL, index, page,
-				  PMBUS_VIRT_PWM_1 + id, 0xff, PSC_PWM,
+				  0xff, PMBUS_VIRT_PWM_1 + id, PSC_PWM,
 				  false, false, true);
 
 	if (!sensor)
 		return -ENOMEM;
 
 	sensor = pmbus_add_sensor(data, "pwm", "enable", index, page,
-				  PMBUS_VIRT_PWM_ENABLE_1 + id, 0xff, PSC_PWM,
+				  0xff, PMBUS_VIRT_PWM_ENABLE_1 + id, PSC_PWM,
 				  true, false, false);
 
 	if (!sensor)
@@ -1929,7 +1929,7 @@ static int pmbus_add_fan_attributes(struct i2c_client *client,
 				continue;
 
 			if (pmbus_add_sensor(data, "fan", "input", index,
-					     page, pmbus_fan_registers[f], 0xff,
+					     page, 0xff, pmbus_fan_registers[f],
 					     PSC_FAN, true, true, true) == NULL)
 				return -ENOMEM;
 
-- 
2.26.0

Re: [PATCH] hwmon: (pmbus) Fix page vs. register when accessing fans

[Guenter Roeck]

On Tue, Jun 23, 2020 at 09:47:39AM +0200, Jan Kundrát wrote:
> Commit 16358542f32f added support for multi-phase pmbus devices.
> However, when calling pmbus_add_sensor() for fans, the patch swapped
> the `page` and `reg` attributes. As a result, the fan speeds were
> reported as 0 RPM on my device.
> 
> Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
> Fixes: 16358542f32f hwmon: (pmbus) Implement multi-phase support

Applied.

Thanks,
Guenter

> ---
>  a/drivers/hwmon/pmbus/pmbus_core.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
> index 8d321bf7d15b..e721a016f3e7 100644
> --- a/drivers/hwmon/pmbus/pmbus_core.c
> +++ b/drivers/hwmon/pmbus/pmbus_core.c
> @@ -1869,7 +1869,7 @@ static int pmbus_add_fan_ctrl(struct i2c_client *client,
>  	struct pmbus_sensor *sensor;
>  
>  	sensor = pmbus_add_sensor(data, "fan", "target", index, page,
> -				  PMBUS_VIRT_FAN_TARGET_1 + id, 0xff, PSC_FAN,
> +				  0xff, PMBUS_VIRT_FAN_TARGET_1 + id, PSC_FAN,
>  				  false, false, true);
>  
>  	if (!sensor)
> @@ -1880,14 +1880,14 @@ static int pmbus_add_fan_ctrl(struct i2c_client *client,
>  		return 0;
>  
>  	sensor = pmbus_add_sensor(data, "pwm", NULL, index, page,
> -				  PMBUS_VIRT_PWM_1 + id, 0xff, PSC_PWM,
> +				  0xff, PMBUS_VIRT_PWM_1 + id, PSC_PWM,
>  				  false, false, true);
>  
>  	if (!sensor)
>  		return -ENOMEM;
>  
>  	sensor = pmbus_add_sensor(data, "pwm", "enable", index, page,
> -				  PMBUS_VIRT_PWM_ENABLE_1 + id, 0xff, PSC_PWM,
> +				  0xff, PMBUS_VIRT_PWM_ENABLE_1 + id, PSC_PWM,
>  				  true, false, false);
>  
>  	if (!sensor)
> @@ -1929,7 +1929,7 @@ static int pmbus_add_fan_attributes(struct i2c_client *client,
>  				continue;
>  
>  			if (pmbus_add_sensor(data, "fan", "input", index,
> -					     page, pmbus_fan_registers[f], 0xff,
> +					     page, 0xff, pmbus_fan_registers[f],
>  					     PSC_FAN, true, true, true) == NULL)
>  				return -ENOMEM;
>