The patch titled ibmpex: correct power use multipliers for QS2x blade has been added to the -mm tree. Its filename is ibmpex-correct-power-use-multipliers-for-qs2x-blade.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ibmpex: correct power use multipliers for QS2x blade From: "Darrick J. Wong" <djwong@xxxxxxxxxx> The QS2x blades ships with v2.54 of the firmware, which use the same multiplier for all power meters. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> Cc: Mark M. Hoffman <mhoffman@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/hwmon/ibmpex.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff -puN drivers/hwmon/ibmpex.c~ibmpex-correct-power-use-multipliers-for-qs2x-blade drivers/hwmon/ibmpex.c --- a/drivers/hwmon/ibmpex.c~ibmpex-correct-power-use-multipliers-for-qs2x-blade +++ a/drivers/hwmon/ibmpex.c @@ -327,10 +327,14 @@ static int is_temp_sensor(const char *se return 0; } -static int power_sensor_multiplier(const char *sensor_id, int len) +static int power_sensor_multiplier(struct ibmpex_bmc_data *data, + const char *sensor_id, int len) { int i; + if (data->sensor_major == 2) + return 1000000; + for (i = PEX_SENSOR_TYPE_LEN; i < len - 1; i++) if (!memcmp(&sensor_id[i], watt_sensor_sig, PEX_MULT_LEN)) return 1000000; @@ -398,8 +402,9 @@ static int ibmpex_find_sensors(struct ib num_power++; sensor_counter = num_power; data->sensors[i].multiplier = - power_sensor_multiplier(data->rx_msg_data, - data->rx_msg_len); + power_sensor_multiplier(data, + data->rx_msg_data, + data->rx_msg_len); } else if (is_temp_sensor(data->rx_msg_data, data->rx_msg_len)) { sensor_type = TEMP_SENSOR; _ Patches currently in -mm which might be from djwong@xxxxxxxxxx are adt746x-logical-bitwise-confusion-in-set_max_duty_at_crit.patch git-scsi-misc.patch mptbase-reset-ioc-initiator-during-pci-resume.patch scsi-aic94xx-cleanups.patch ibmpex-correct-power-use-multipliers-for-qs2x-blade.patch ibmpex-update-kconfig-to-list-more-supported-models.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html