Skip to content

Commit 42b49f0

Browse files
bjwymangregkh
authored andcommitted
hwmon: (pmbus/ibm-cffps) max_power_out swap changes
[ Upstream commit f067d55 ] 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> Link: https://lore.kernel.org/r/20210928205051.1222815-1-bjwyman@gmail.com [groeck: Replaced yoda programming] Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent bb893f0 commit 42b49f0

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

drivers/hwmon/pmbus/ibm-cffps.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,14 @@ static ssize_t ibm_cffps_debugfs_read(struct file *file, char __user *buf,
171171
cmd = CFFPS_SN_CMD;
172172
break;
173173
case CFFPS_DEBUGFS_MAX_POWER_OUT:
174-
rc = i2c_smbus_read_word_swapped(psu->client,
175-
CFFPS_MAX_POWER_OUT_CMD);
174+
if (psu->version == cffps1) {
175+
rc = i2c_smbus_read_word_swapped(psu->client,
176+
CFFPS_MAX_POWER_OUT_CMD);
177+
} else {
178+
rc = i2c_smbus_read_word_data(psu->client,
179+
CFFPS_MAX_POWER_OUT_CMD);
180+
}
181+
176182
if (rc < 0)
177183
return rc;
178184

0 commit comments

Comments
 (0)