Commit b9fa0a3a authored by Vadim Pasternak's avatar Vadim Pasternak Committed by Guenter Roeck
Browse files

hwmon: (pmbus/core) Add support for vid mode detection per page bases 



Add support for VID protocol detection per page bases, instead of
detecting it based on "PMBU_VOUT" readout from page 0 for all the pages
supported by particular device.
The reason that some devices allows to configure different VID modes
per page within the same device.
Patch modifies the field "vrm_version" within the structure
"pmbus_driver_info" to be per page array.

Signed-off-by: default avatarVadim Pasternak <vadimp@mellanox.com>
Link: https://lore.kernel.org/r/20200113150841.17670-2-vadimp@mellanox.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent d9c8ae69

drivers/hwmon/pmbus/max20751.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static struct pmbus_driver_info max20751_info = { 
	.pages = 1,

	.format[PSC_VOLTAGE_IN] = linear,

	.format[PSC_VOLTAGE_OUT] = vid,

	.vrm_version = vr12,

	.vrm_version[0] = vr12,

	.format[PSC_TEMPERATURE] = linear,

	.format[PSC_CURRENT_OUT] = linear,

	.format[PSC_POWER] = linear,

drivers/hwmon/pmbus/pmbus.c

+3 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int pmbus_identify(struct i2c_client *client, 
	}



	if (pmbus_check_byte_register(client, 0, PMBUS_VOUT_MODE)) {

		int vout_mode;

		int vout_mode, i;



		vout_mode = pmbus_read_byte_data(client, 0, PMBUS_VOUT_MODE);

		if (vout_mode >= 0 && vout_mode != 0xff) {
@@ -124,7 +124,8 @@ static int pmbus_identify(struct i2c_client *client, 
				break;

			case 1:

				info->format[PSC_VOLTAGE_OUT] = vid;

				info->vrm_version = vr11;

				for (i = 0; i < info->pages; i++)

					info->vrm_version[i] = vr11;

				break;

			case 2:

				info->format[PSC_VOLTAGE_OUT] = direct;

drivers/hwmon/pmbus/pmbus.h

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ enum vrm_version { vr11 = 0, vr12, vr13 }; 
struct pmbus_driver_info {

	int pages;		/* Total number of pages */

	enum pmbus_data_format format[PSC_NUM_CLASSES];

	enum vrm_version vrm_version;

	enum vrm_version vrm_version[PMBUS_PAGES]; /* vrm version per page */

	/*

	 * Support one set of coefficients for each sensor type

	 * Used for chips providing data in direct mode.

drivers/hwmon/pmbus/pmbus_core.c

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static long pmbus_reg2data_vid(struct pmbus_data *data, 
	long val = sensor->data;

	long rv = 0;



	switch (data->info->vrm_version) {

	switch (data->info->vrm_version[sensor->page]) {

	case vr11:

		if (val >= 0x02 && val <= 0xb2)

			rv = DIV_ROUND_CLOSEST(160000 - (val - 2) * 625, 100);

drivers/hwmon/pmbus/pxe1610.c

+24 −20
Original line number Diff line number Diff line
@@ -19,12 +19,15 @@ 
static int pxe1610_identify(struct i2c_client *client,

			     struct pmbus_driver_info *info)

{

	if (pmbus_check_byte_register(client, 0, PMBUS_VOUT_MODE)) {

	int i;



	for (i = 0; i < PXE1610_NUM_PAGES; i++) {

		if (pmbus_check_byte_register(client, i, PMBUS_VOUT_MODE)) {

			u8 vout_mode;

			int ret;



			/* Read the register with VOUT scaling value.*/

		ret = pmbus_read_byte_data(client, 0, PMBUS_VOUT_MODE);

			ret = pmbus_read_byte_data(client, i, PMBUS_VOUT_MODE);

			if (ret < 0)

				return ret;
@@ -32,15 +35,16 @@ static int pxe1610_identify(struct i2c_client *client, 


			switch (vout_mode) {

			case 1:

			info->vrm_version = vr12;

				info->vrm_version[i] = vr12;

				break;

			case 2:

			info->vrm_version = vr13;

				info->vrm_version[i] = vr13;

				break;

			default:

				return -ENODEV;

			}

		}

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE