Commit 7b66f439 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v5.15-rc4' of... 

Merge tag 'hwmon-for-v5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - Fixed various potential NULL pointer accesses in w8379* drivers

 - Improved error handling, fault reporting, and fixed rounding in
   thmp421 driver

 - Fixed error handling in ltc2947 driver

 - Added missing attribute to pmbus/mp2975 driver

 - Fixed attribute values in pbus/ibm-cffps, occ, and mlxreg-fan
   drivers

 - Removed unused residual code from k10temp driver

* tag 'hwmon-for-v5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field
  hwmon: (w83792d) Fix NULL pointer dereference by removing unnecessary structure field
  hwmon: (w83791d) Fix NULL pointer dereference by removing unnecessary structure field
  hwmon: (pmbus/mp2975) Add missed POUT attribute for page 1 mp2975 controller
  hwmon: (pmbus/ibm-cffps) max_power_out swap changes
  hwmon: (occ) Fix P10 VRM temp sensors
  hwmon: (ltc2947) Properly handle errors when looking for the external clock
  hwmon: (tmp421) fix rounding for negative values
  hwmon: (tmp421) report /PVLD condition as fault
  hwmon: (tmp421) handle I2C errors
  hwmon: (mlxreg-fan) Return non-zero value when fan current state is enforced from sysfs
  hwmon: (k10temp) Remove residues of current and voltage
parents e25ca045 dd4d747e

Documentation/hwmon/k10temp.rst

+0 −17
Original line number Diff line number Diff line
@@ -132,20 +132,3 @@ On Family 17h and Family 18h CPUs, additional temperature sensors may report 
Core Complex Die (CCD) temperatures. Up to 8 such temperatures are reported

as temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU

variant.
 


Various Family 17h and 18h CPUs report voltage and current telemetry

information. The following attributes may be reported.



Attribute	Label	Description

===============	=======	================

in0_input	Vcore	Core voltage

in1_input	Vsoc	SoC voltage

curr1_input	Icore	Core current

curr2_input	Isoc	SoC current

===============	=======	================



Current values are raw (unscaled) as reported by the CPU. Core current is

reported as multiples of 1A / LSB. SoC is reported as multiples of 0.25A

/ LSB. The real current is board specific. Reported currents should be seen

as rough guidance, and should be scaled using sensors3.conf as appropriate

for a given board.

drivers/hwmon/k10temp.c

+0 −6
Original line number Diff line number Diff line
@@ -362,12 +362,6 @@ static const struct hwmon_channel_info *k10temp_info[] = { 
			   HWMON_T_INPUT | HWMON_T_LABEL,

			   HWMON_T_INPUT | HWMON_T_LABEL,

			   HWMON_T_INPUT | HWMON_T_LABEL),

	HWMON_CHANNEL_INFO(in,

			   HWMON_I_INPUT | HWMON_I_LABEL,

			   HWMON_I_INPUT | HWMON_I_LABEL),

	HWMON_CHANNEL_INFO(curr,

			   HWMON_C_INPUT | HWMON_C_LABEL,

			   HWMON_C_INPUT | HWMON_C_LABEL),

	NULL

};

drivers/hwmon/ltc2947-core.c

+6 −2
Original line number Diff line number Diff line
@@ -989,8 +989,12 @@ static int ltc2947_setup(struct ltc2947_data *st) 
		return ret;



	/* check external clock presence */

	extclk = devm_clk_get(st->dev, NULL);

	if (!IS_ERR(extclk)) {

	extclk = devm_clk_get_optional(st->dev, NULL);

	if (IS_ERR(extclk))

		return dev_err_probe(st->dev, PTR_ERR(extclk),

				     "Failed to get external clock\n");



	if (extclk) {

		unsigned long rate_hz;

		u8 pre = 0, div, tbctl;

		u64 aux;

drivers/hwmon/mlxreg-fan.c

+9 −3
Original line number Diff line number Diff line
@@ -315,8 +315,8 @@ static int mlxreg_fan_set_cur_state(struct thermal_cooling_device *cdev, 
{

	struct mlxreg_fan *fan = cdev->devdata;

	unsigned long cur_state;

	int i, config = 0;

	u32 regval;

	int i;

	int err;



	/*
@@ -329,6 +329,12 @@ static int mlxreg_fan_set_cur_state(struct thermal_cooling_device *cdev, 
	 * overwritten.

	 */

	if (state >= MLXREG_FAN_SPEED_MIN && state <= MLXREG_FAN_SPEED_MAX) {

		/*

		 * This is configuration change, which is only supported through sysfs.

		 * For configuration non-zero value is to be returned to avoid thermal

		 * statistics update.

		 */

		config = 1;

		state -= MLXREG_FAN_MAX_STATE;

		for (i = 0; i < state; i++)

			fan->cooling_levels[i] = state;
@@ -343,7 +349,7 @@ static int mlxreg_fan_set_cur_state(struct thermal_cooling_device *cdev, 


		cur_state = MLXREG_FAN_PWM_DUTY2STATE(regval);

		if (state < cur_state)

			return 0;

			return config;



		state = cur_state;

	}
@@ -359,7 +365,7 @@ static int mlxreg_fan_set_cur_state(struct thermal_cooling_device *cdev, 
		dev_err(fan->dev, "Failed to write PWM duty\n");

		return err;

	}

	return 0;

	return config;

}



static const struct thermal_cooling_device_ops mlxreg_fan_cooling_ops = {

drivers/hwmon/occ/common.c

+5 −12
Original line number Diff line number Diff line
@@ -340,18 +340,11 @@ static ssize_t occ_show_temp_10(struct device *dev, 
		if (val == OCC_TEMP_SENSOR_FAULT)

			return -EREMOTEIO;



		/*

		 * VRM doesn't return temperature, only alarm bit. This

		 * attribute maps to tempX_alarm instead of tempX_input for

		 * VRM

		 */

		if (temp->fru_type != OCC_FRU_TYPE_VRM) {

		/* sensor not ready */

		if (val == 0)

			return -EAGAIN;



		val *= 1000;

		}

		break;

	case 2:

		val = temp->fru_type;
@@ -886,7 +879,7 @@ static int occ_setup_sensor_attrs(struct occ *occ) 
					     0, i);

		attr++;



		if (sensors->temp.version > 1 &&

		if (sensors->temp.version == 2 &&

		    temp->fru_type == OCC_FRU_TYPE_VRM) {

			snprintf(attr->name, sizeof(attr->name),

				 "temp%d_alarm", s);