Commit 43f33b6e authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (pmbus) Add 'phase' parameter where needed for multi-phase support 



In preparation for multi-phase support, add 'phase' parameter to read_word
and set_page functions. Actual multi-phase support will be added in
a subsequent patch.

Cc: Vadim Pasternak <vadimp@mellanox.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent a1dd176c

Documentation/hwmon/pmbus-core.rst

+15 −7
Original line number Diff line number Diff line
@@ -162,9 +162,12 @@ Read byte from page <page>, register <reg>. 


::



  int (*read_word_data)(struct i2c_client *client, int page, int reg);

  int (*read_word_data)(struct i2c_client *client, int page, int phase,

                        int reg);



Read word from page <page>, register <reg>.

Read word from page <page>, phase <pase>, register <reg>. If the chip does not

support multiple phases, the phase parameter can be ignored. If the chip

supports multiple phases, a phase value of 0xff indicates all phases.



::
@@ -201,16 +204,21 @@ is mandatory. 


::



  int pmbus_set_page(struct i2c_client *client, u8 page);

  int pmbus_set_page(struct i2c_client *client, u8 page, u8 phase);



Set PMBus page register to <page> for subsequent commands.

Set PMBus page register to <page> and <phase> for subsequent commands.

If the chip does not support multiple phases, the phase parameter is

ignored. Otherwise, a phase value of 0xff selects all phases.



::



  int pmbus_read_word_data(struct i2c_client *client, u8 page, u8 reg);

  int pmbus_read_word_data(struct i2c_client *client, u8 page, u8 phase,

                           u8 reg);



Read word data from <page>, <reg>. Similar to i2c_smbus_read_word_data(), but

selects page first.

Read word data from <page>, <phase>, <reg>. Similar to

i2c_smbus_read_word_data(), but selects page and phase first. If the chip does

not support multiple phases, the phase parameter is ignored. Otherwise, a phase

value of 0xff selects all phases.



::

drivers/hwmon/pmbus/adm1275.c

+24 −13
Original line number Diff line number Diff line
@@ -226,7 +226,8 @@ static int adm1275_write_pmon_config(const struct adm1275_data *data, 
	return ret;

}



static int adm1275_read_word_data(struct i2c_client *client, int page, int reg)

static int adm1275_read_word_data(struct i2c_client *client, int page,

				  int phase, int reg)

{

	const struct pmbus_driver_info *info = pmbus_get_driver_info(client);

	const struct adm1275_data *data = to_adm1275_data(info);
@@ -239,58 +240,68 @@ static int adm1275_read_word_data(struct i2c_client *client, int page, int reg) 
	case PMBUS_IOUT_UC_FAULT_LIMIT:

		if (!data->have_uc_fault)

			return -ENXIO;

		ret = pmbus_read_word_data(client, 0, ADM1275_IOUT_WARN2_LIMIT);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1275_IOUT_WARN2_LIMIT);

		break;

	case PMBUS_IOUT_OC_FAULT_LIMIT:

		if (!data->have_oc_fault)

			return -ENXIO;

		ret = pmbus_read_word_data(client, 0, ADM1275_IOUT_WARN2_LIMIT);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1275_IOUT_WARN2_LIMIT);

		break;

	case PMBUS_VOUT_OV_WARN_LIMIT:

		if (data->have_vout)

			return -ENODATA;

		ret = pmbus_read_word_data(client, 0,

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1075_VAUX_OV_WARN_LIMIT);

		break;

	case PMBUS_VOUT_UV_WARN_LIMIT:

		if (data->have_vout)

			return -ENODATA;

		ret = pmbus_read_word_data(client, 0,

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1075_VAUX_UV_WARN_LIMIT);

		break;

	case PMBUS_READ_VOUT:

		if (data->have_vout)

			return -ENODATA;

		ret = pmbus_read_word_data(client, 0, ADM1075_READ_VAUX);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1075_READ_VAUX);

		break;

	case PMBUS_VIRT_READ_IOUT_MIN:

		if (!data->have_iout_min)

			return -ENXIO;

		ret = pmbus_read_word_data(client, 0, ADM1293_IOUT_MIN);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1293_IOUT_MIN);

		break;

	case PMBUS_VIRT_READ_IOUT_MAX:

		ret = pmbus_read_word_data(client, 0, ADM1275_PEAK_IOUT);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1275_PEAK_IOUT);

		break;

	case PMBUS_VIRT_READ_VOUT_MAX:

		ret = pmbus_read_word_data(client, 0, ADM1275_PEAK_VOUT);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1275_PEAK_VOUT);

		break;

	case PMBUS_VIRT_READ_VIN_MAX:

		ret = pmbus_read_word_data(client, 0, ADM1275_PEAK_VIN);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1275_PEAK_VIN);

		break;

	case PMBUS_VIRT_READ_PIN_MIN:

		if (!data->have_pin_min)

			return -ENXIO;

		ret = pmbus_read_word_data(client, 0, ADM1293_PIN_MIN);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1293_PIN_MIN);

		break;

	case PMBUS_VIRT_READ_PIN_MAX:

		if (!data->have_pin_max)

			return -ENXIO;

		ret = pmbus_read_word_data(client, 0, ADM1276_PEAK_PIN);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1276_PEAK_PIN);

		break;

	case PMBUS_VIRT_READ_TEMP_MAX:

		if (!data->have_temp_max)

			return -ENXIO;

		ret = pmbus_read_word_data(client, 0, ADM1278_PEAK_TEMP);

		ret = pmbus_read_word_data(client, 0, 0xff,

					   ADM1278_PEAK_TEMP);

		break;

	case PMBUS_VIRT_RESET_IOUT_HISTORY:

	case PMBUS_VIRT_RESET_VOUT_HISTORY:

drivers/hwmon/pmbus/ibm-cffps.c

+8 −7
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static ssize_t ibm_cffps_debugfs_read(struct file *file, char __user *buf, 
	struct ibm_cffps *psu = to_psu(idxp, idx);

	char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };



	pmbus_set_page(psu->client, 0);

	pmbus_set_page(psu->client, 0, 0xff);



	switch (idx) {

	case CFFPS_DEBUGFS_INPUT_HISTORY:
@@ -247,7 +247,7 @@ static ssize_t ibm_cffps_debugfs_write(struct file *file, 


	switch (idx) {

	case CFFPS_DEBUGFS_ON_OFF_CONFIG:

		pmbus_set_page(psu->client, 0);

		pmbus_set_page(psu->client, 0, 0xff);



		rc = simple_write_to_buffer(&data, 1, ppos, buf, count);

		if (rc <= 0)
@@ -325,13 +325,13 @@ static int ibm_cffps_read_byte_data(struct i2c_client *client, int page, 
}



static int ibm_cffps_read_word_data(struct i2c_client *client, int page,

				    int reg)

				    int phase, int reg)

{

	int rc, mfr;



	switch (reg) {

	case PMBUS_STATUS_WORD:

		rc = pmbus_read_word_data(client, page, reg);

		rc = pmbus_read_word_data(client, page, phase, reg);

		if (rc < 0)

			return rc;
@@ -348,7 +348,8 @@ static int ibm_cffps_read_word_data(struct i2c_client *client, int page, 
			rc |= PB_STATUS_OFF;

		break;

	case PMBUS_VIRT_READ_VMON:

		rc = pmbus_read_word_data(client, page, CFFPS_12VCS_VOUT_CMD);

		rc = pmbus_read_word_data(client, page, phase,

					  CFFPS_12VCS_VOUT_CMD);

		break;

	default:

		rc = -ENODATA;
@@ -379,7 +380,7 @@ static int ibm_cffps_led_brightness_set(struct led_classdev *led_cdev, 
	dev_dbg(&psu->client->dev, "LED brightness set: %d. Command: %d.\n",

		brightness, next_led_state);



	pmbus_set_page(psu->client, 0);

	pmbus_set_page(psu->client, 0, 0xff);



	rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,

				       next_led_state);
@@ -401,7 +402,7 @@ static int ibm_cffps_led_blink_set(struct led_classdev *led_cdev, 


	dev_dbg(&psu->client->dev, "LED blink set.\n");



	pmbus_set_page(psu->client, 0);

	pmbus_set_page(psu->client, 0, 0xff);



	rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,

				       CFFPS_LED_BLINK);

drivers/hwmon/pmbus/ir35221.c

+14 −9
Original line number Diff line number Diff line
@@ -21,37 +21,42 @@ 
#define IR35221_MFR_IOUT_VALLEY		0xcb

#define IR35221_MFR_TEMP_VALLEY		0xcc



static int ir35221_read_word_data(struct i2c_client *client, int page, int reg)

static int ir35221_read_word_data(struct i2c_client *client, int page,

				  int phase, int reg)

{

	int ret;



	switch (reg) {

	case PMBUS_VIRT_READ_VIN_MAX:

		ret = pmbus_read_word_data(client, page, IR35221_MFR_VIN_PEAK);

		ret = pmbus_read_word_data(client, page, phase,

					   IR35221_MFR_VIN_PEAK);

		break;

	case PMBUS_VIRT_READ_VOUT_MAX:

		ret = pmbus_read_word_data(client, page, IR35221_MFR_VOUT_PEAK);

		ret = pmbus_read_word_data(client, page, phase,

					   IR35221_MFR_VOUT_PEAK);

		break;

	case PMBUS_VIRT_READ_IOUT_MAX:

		ret = pmbus_read_word_data(client, page, IR35221_MFR_IOUT_PEAK);

		ret = pmbus_read_word_data(client, page, phase,

					   IR35221_MFR_IOUT_PEAK);

		break;

	case PMBUS_VIRT_READ_TEMP_MAX:

		ret = pmbus_read_word_data(client, page, IR35221_MFR_TEMP_PEAK);

		ret = pmbus_read_word_data(client, page, phase,

					   IR35221_MFR_TEMP_PEAK);

		break;

	case PMBUS_VIRT_READ_VIN_MIN:

		ret = pmbus_read_word_data(client, page,

		ret = pmbus_read_word_data(client, page, phase,

					   IR35221_MFR_VIN_VALLEY);

		break;

	case PMBUS_VIRT_READ_VOUT_MIN:

		ret = pmbus_read_word_data(client, page,

		ret = pmbus_read_word_data(client, page, phase,

					   IR35221_MFR_VOUT_VALLEY);

		break;

	case PMBUS_VIRT_READ_IOUT_MIN:

		ret = pmbus_read_word_data(client, page,

		ret = pmbus_read_word_data(client, page, phase,

					   IR35221_MFR_IOUT_VALLEY);

		break;

	case PMBUS_VIRT_READ_TEMP_MIN:

		ret = pmbus_read_word_data(client, page,

		ret = pmbus_read_word_data(client, page, phase,

					   IR35221_MFR_TEMP_VALLEY);

		break;

	default:

drivers/hwmon/pmbus/isl68137.c

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ static ssize_t isl68137_avs_enable_store_page(struct i2c_client *client, 
	 * enabling AVS control is the workaround.

	 */

	if (op_val == ISL68137_VOUT_AVS) {

		rc = pmbus_read_word_data(client, page, PMBUS_VOUT_COMMAND);

		rc = pmbus_read_word_data(client, page, 0xff,

					  PMBUS_VOUT_COMMAND);

		if (rc < 0)

			return rc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE