openbmc.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] hwmon: (pmbus/ibm-cffps) max_power_out swap changes
@ 2021-09-28 20:50 Brandon Wyman
  2021-09-29 15:38 ` Eddie James
  2021-10-02 11:40 ` Guenter Roeck
  0 siblings, 2 replies; 3+ messages in thread
From: Brandon Wyman @ 2021-09-28 20:50 UTC (permalink / raw)
  To: Joel Stanley, openbmc, Guenter Roeck, Jean Delvare, linux-hwmon,
	linux-kernel, Eddie James
  Cc: Brandon Wyman

The bytes for max_power_out from the ibm-cffps devices differ in byte
order for some power supplies.

The Witherspoon power supply returns the bytes in MSB/LSB order.

The Rainier power supply returns the bytes in LSB/MSB order.

The Witherspoon power supply uses version cffps1. The Rainier power
supply should use version cffps2. If version is cffps1, swap the bytes
before output to max_power_out.

Tested:
    Witherspoon before: 3148. Witherspoon after: 3148.
    Rainier before: 53255. Rainier after: 2000.

Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
---
 drivers/hwmon/pmbus/ibm-cffps.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
index df712ce4b164..79bfcd2749a6 100644
--- a/drivers/hwmon/pmbus/ibm-cffps.c
+++ b/drivers/hwmon/pmbus/ibm-cffps.c
@@ -171,8 +171,14 @@ static ssize_t ibm_cffps_debugfs_read(struct file *file, char __user *buf,
 		cmd = CFFPS_SN_CMD;
 		break;
 	case CFFPS_DEBUGFS_MAX_POWER_OUT:
-		rc = i2c_smbus_read_word_swapped(psu->client,
-						 CFFPS_MAX_POWER_OUT_CMD);
+		if (cffps1 == psu->version) {
+			rc = i2c_smbus_read_word_swapped(psu->client,
+					CFFPS_MAX_POWER_OUT_CMD);
+		} else {
+			rc = i2c_smbus_read_word_data(psu->client,
+					CFFPS_MAX_POWER_OUT_CMD);
+		}
+
 		if (rc < 0)
 			return rc;
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] hwmon: (pmbus/ibm-cffps) max_power_out swap changes
  2021-09-28 20:50 [PATCH v2] hwmon: (pmbus/ibm-cffps) max_power_out swap changes Brandon Wyman
@ 2021-09-29 15:38 ` Eddie James
  2021-10-02 11:40 ` Guenter Roeck
  1 sibling, 0 replies; 3+ messages in thread
From: Eddie James @ 2021-09-29 15:38 UTC (permalink / raw)
  To: Brandon Wyman, Joel Stanley, openbmc, Guenter Roeck,
	Jean Delvare, linux-hwmon, linux-kernel


On 9/28/21 3:50 PM, Brandon Wyman wrote:
> The bytes for max_power_out from the ibm-cffps devices differ in byte
> order for some power supplies.
>
> The Witherspoon power supply returns the bytes in MSB/LSB order.
>
> The Rainier power supply returns the bytes in LSB/MSB order.
>
> The Witherspoon power supply uses version cffps1. The Rainier power
> supply should use version cffps2. If version is cffps1, swap the bytes
> before output to max_power_out.


Looks fine, thanks Brandon!

Reviewed-by: Eddie James <eajames@linux.ibm.com>


>
> Tested:
>      Witherspoon before: 3148. Witherspoon after: 3148.
>      Rainier before: 53255. Rainier after: 2000.
>
> Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
> ---
>   drivers/hwmon/pmbus/ibm-cffps.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
> index df712ce4b164..79bfcd2749a6 100644
> --- a/drivers/hwmon/pmbus/ibm-cffps.c
> +++ b/drivers/hwmon/pmbus/ibm-cffps.c
> @@ -171,8 +171,14 @@ static ssize_t ibm_cffps_debugfs_read(struct file *file, char __user *buf,
>   		cmd = CFFPS_SN_CMD;
>   		break;
>   	case CFFPS_DEBUGFS_MAX_POWER_OUT:
> -		rc = i2c_smbus_read_word_swapped(psu->client,
> -						 CFFPS_MAX_POWER_OUT_CMD);
> +		if (cffps1 == psu->version) {
> +			rc = i2c_smbus_read_word_swapped(psu->client,
> +					CFFPS_MAX_POWER_OUT_CMD);
> +		} else {
> +			rc = i2c_smbus_read_word_data(psu->client,
> +					CFFPS_MAX_POWER_OUT_CMD);
> +		}
> +
>   		if (rc < 0)
>   			return rc;
>   

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] hwmon: (pmbus/ibm-cffps) max_power_out swap changes
  2021-09-28 20:50 [PATCH v2] hwmon: (pmbus/ibm-cffps) max_power_out swap changes Brandon Wyman
  2021-09-29 15:38 ` Eddie James
@ 2021-10-02 11:40 ` Guenter Roeck
  1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2021-10-02 11:40 UTC (permalink / raw)
  To: Brandon Wyman
  Cc: linux-hwmon, Jean Delvare, openbmc, Eddie James, linux-kernel

On Tue, Sep 28, 2021 at 08:50:51PM +0000, Brandon Wyman wrote:
> The bytes for max_power_out from the ibm-cffps devices differ in byte
> order for some power supplies.
> 
> The Witherspoon power supply returns the bytes in MSB/LSB order.
> 
> The Rainier power supply returns the bytes in LSB/MSB order.
> 
> The Witherspoon power supply uses version cffps1. The Rainier power
> supply should use version cffps2. If version is cffps1, swap the bytes
> before output to max_power_out.
> 
> Tested:
>     Witherspoon before: 3148. Witherspoon after: 3148.
>     Rainier before: 53255. Rainier after: 2000.
> 
> Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
> Reviewed-by: Eddie James <eajames@linux.ibm.com>

Applied, though ...

> ---
>  drivers/hwmon/pmbus/ibm-cffps.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
> index df712ce4b164..79bfcd2749a6 100644
> --- a/drivers/hwmon/pmbus/ibm-cffps.c
> +++ b/drivers/hwmon/pmbus/ibm-cffps.c
> @@ -171,8 +171,14 @@ static ssize_t ibm_cffps_debugfs_read(struct file *file, char __user *buf,
>  		cmd = CFFPS_SN_CMD;
>  		break;
>  	case CFFPS_DEBUGFS_MAX_POWER_OUT:
> -		rc = i2c_smbus_read_word_swapped(psu->client,
> -						 CFFPS_MAX_POWER_OUT_CMD);
> +		if (cffps1 == psu->version) {

The yoda programming replaced I did.

> +			rc = i2c_smbus_read_word_swapped(psu->client,
> +					CFFPS_MAX_POWER_OUT_CMD);
> +		} else {
> +			rc = i2c_smbus_read_word_data(psu->client,
> +					CFFPS_MAX_POWER_OUT_CMD);
> +		}
> +
>  		if (rc < 0)
>  			return rc;
>  

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-02 11:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-28 20:50 [PATCH v2] hwmon: (pmbus/ibm-cffps) max_power_out swap changes Brandon Wyman
2021-09-29 15:38 ` Eddie James
2021-10-02 11:40 ` Guenter Roeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).