Skip to contentSkip to conversation

hwmon: (pmbus/ibm-cffps) max_power_out swap changes

PATCH Applied Brandon Wyman 3 participants 3 messages Sep 28, 2021 – Oct 2, 2021 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hwmon: (pmbus/ibm-cffps) max_power_out swap changes

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.

---
 drivers/hwmon/pmbus/ibm-cffps.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/hwmon/pmbus/ibm-cffps.c +8 -2
index df712ce4b164..79bfcd2749a6 100644
@@ -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;
 
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · 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.

Looks fine, thanks Brandon!

Quoted 31 lines

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

---
  drivers/hwmon/pmbus/ibm-cffps.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
drivers/hwmon/pmbus/ibm-cffps.c +8 -2
index df712ce4b164..79bfcd2749a6 100644
@@ -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;
 
maintainer Applied
#2 lore raw
In reply to Brandon Wyman
Quoted 11 lines · 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.

Quoted 6 lines

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

Applied, though ...

Quoted 9 lines
---
 drivers/hwmon/pmbus/ibm-cffps.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/hwmon/pmbus/ibm-cffps.c +0 -0
index df712ce4b164..79bfcd2749a6 100644

drivers/hwmon/pmbus/ibm-cffps.c static ssize_t ibm_cffps_debugfs_read(struct file *file, char __user *buf, · line 174

Quoted 6 lines
drivers/hwmon/pmbus/ibm-cffps.c +1 -2
@@ -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.

Quoted 10 lines
drivers/hwmon/pmbus/ibm-cffps.c +7 -0
+			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;