Skip to contentSkip to conversation

hwmon: (mlxreg-fan) Add support for fan drawers capability and present registers

PATCH Superseded Vadim Pasternak 2 participants 5 messages Mar 16, 2021 – Mar 21, 2021 Hardware monitoring

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hwmon: (mlxreg-fan) Add support for fan drawers capability and present registers

Add support for fan drawer's capability and present registers in order to set mapping between the fan drawers and tachometers. Some systems are equipped with fan drawers with one tachometer inside. Others with fan drawers with several tachometers inside. Using present register along with tachometer-to-drawer mapping allows to skip reading missed tachometers and expose input for them as zero, instead of exposing fault code returned by hardware.

---
v1->v2:
Comments pointed out by Guenter:
- Simplify drawers number calculation in mlxreg_fan_config().
- Validate that the number of drawers and tachometers, supported on system, both are not zero. Otherwise return error.
Added by Vadim:
- Change comment in mlxreg_fan_read() regarding FAN presence - use "FAN is inserted" instead of "FAN is physically connected", t clarify that "FAN presence" can be changed dynamically.

---
 drivers/hwmon/mlxreg-fan.c | 48 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)
drivers/hwmon/mlxreg-fan.c +47 -1
index ed8d59d4eecb..8a69044140a6 100644
@@ -67,11 +67,13 @@
  * @connected: indicates if tachometer is connected;
  * @reg: register offset;
  * @mask: fault mask;
+ * @prsnt: present register offset;
  */
 struct mlxreg_fan_tacho {
 	bool connected;
 	u32 reg;
 	u32 mask;
+	u32 prsnt;
 };
 
 /*
@@ -92,6 +94,7 @@ struct mlxreg_fan_pwm {
  * @regmap: register map of parent device;
  * @tacho: tachometer data;
  * @pwm: PWM data;
+ * @tachos_per_drwr - number of tachometers per drawer;
  * @samples: minimum allowed samples per pulse;
  * @divider: divider value for tachometer RPM calculation;
  * @cooling: cooling device levels;
@@ -103,6 +106,7 @@ struct mlxreg_fan {
 	struct mlxreg_core_platform_data *pdata;
 	struct mlxreg_fan_tacho tacho[MLXREG_FAN_MAX_TACHO];
 	struct mlxreg_fan_pwm pwm;
+	int tachos_per_drwr;
 	int samples;
 	int divider;
 	u8 cooling_levels[MLXREG_FAN_MAX_STATE + 1];
@@ -123,6 +127,26 @@ mlxreg_fan_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
 		tacho = &fan->tacho[channel];
 		switch (attr) {
 		case hwmon_fan_input:
+			/*
+			 * Check FAN presence: FAN related bit in presence register is one,
+			 * if FAN is not physically connected, zero - otherwise.
+			 */
+			if (tacho->prsnt) {
+				err = regmap_read(fan->regmap, tacho->prsnt, &regval);
+				if (err)
+					return err;
+
+				/*
+				 * Map channel to presence bit - drawer can be equipped with
+				 * one or few FANs, while presence is indicated per drawer.
+				 */
+				if ((BIT(channel / fan->tachos_per_drwr) & regval)) {
+					/* FAN is not connected - return zero for FAN speed. */
+					*val = 0;
+					return 0;
+				}
+			}
+
 			err = regmap_read(fan->regmap, tacho->reg, &regval);
 			if (err)
 				return err;
@@ -388,9 +412,9 @@ static int mlxreg_fan_speed_divider_get(struct mlxreg_fan *fan,
 static int mlxreg_fan_config(struct mlxreg_fan *fan,
 			     struct mlxreg_core_platform_data *pdata)
 {
+	int tacho_num = 0, regval, drwr_avail = 0, tacho_avail = 0, i;
 	struct mlxreg_core_data *data = pdata->data;
 	bool configured = false;
-	int tacho_num = 0, i;
 	int err;
 
 	fan->samples = MLXREG_FAN_TACHO_SAMPLES_PER_PULSE_DEF;
@@ -415,7 +439,9 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,
 
 			fan->tacho[tacho_num].reg = data->reg;
 			fan->tacho[tacho_num].mask = data->mask;
+			fan->tacho[tacho_num].prsnt = data->reg_prsnt;
 			fan->tacho[tacho_num++].connected = true;
+			tacho_avail++;
 		} else if (strnstr(data->label, "pwm", sizeof(data->label))) {
 			if (fan->pwm.connected) {
 				dev_err(fan->dev, "duplicate pwm entry: %s\n",
@@ -453,6 +479,26 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,
 		}
 	}
 
+	if (pdata->capability) {
+		/* Obtain the number of FAN drawers, supported by system. */
+		err = regmap_read(fan->regmap, pdata->capability, &regval);
+		if (err) {
+			dev_err(fan->dev, "Failed to query capability register 0x%08x\n",
+				pdata->capability);
+			return err;
+		}
+
+		drwr_avail = hweight32(regval);
+		if (!tacho_avail || !drwr_avail) {
+			dev_err(fan->dev, "Configuration is invalid: drawers num %d tachos num %d\n",
+				drwr_avail, tacho_avail);
+			return -EINVAL;
+		}
+
+		/* Set the number of tachometers per one drawer. */
+		fan->tachos_per_drwr = tacho_avail / drwr_avail;
+	}
+
 	/* Init cooling levels per PWM state. */
 	for (i = 0; i < MLXREG_FAN_SPEED_MIN_LEVEL; i++)
 		fan->cooling_levels[i] = MLXREG_FAN_SPEED_MIN_LEVEL;
Signature · 1 line
2.11.0
maintainer
#1 lore raw
Quoted 9 lines · Vadim Pasternak

Add support for fan drawer's capability and present registers in order to set mapping between the fan drawers and tachometers. Some systems are equipped with fan drawers with one tachometer inside. Others with fan drawers with several tachometers inside. Using present register along with tachometer-to-drawer mapping allows to skip reading missed tachometers and expose input for them as zero, instead of exposing fault code returned by hardware.

I had asked for a number of changes to v2. Resending v2 without addressing anything isn't really helpful.

Guenter

#2 lore raw
Quoted 19 lines

-----Original Message-----
From: Guenter Roeck <[email protected]> On Behalf Of Guenter Roeck
Sent: Friday, March 19, 2021 11:36 PM
To: Vadim Pasternak <[email protected]>
Cc: [email protected]
Subject: Re: [Re-send PATCH hwmon-next v2 1/1] hwmon: (mlxreg-fan) Add support for fan drawers capability and present registers

Quoted 8 lines · Vadim Pasternak

Add support for fan drawer's capability and present registers in order to set mapping between the fan drawers and tachometers. Some systems are equipped with fan drawers with one tachometer inside. Others with fan drawers with several tachometers inside. Using present register along with tachometer-to-drawer mapping allows to skip reading missed tachometers and expose input for them as zero, instead of exposing fault code returned by hardware.

Quoted 4 lines
Quoted 1 line

I had asked for a number of changes to v2. Resending v2 without addressing anything isn't really helpful.

Hi Guenter,

I am sorry, I missed the change related to your comment:
"The outer double (( )) is pointless.".
I'll fix it.

I think I handled your other comments or I am wrong?

Should I send patch as v3 or as v2?

Thanks,
Vadim.

Quoted 2 lines

Guenter

maintainer
#3 lore raw
Quoted 24 lines · Vadim Pasternak
Quoted 19 lines

-----Original Message-----
From: Guenter Roeck <[email protected]> On Behalf Of Guenter Roeck
Sent: Friday, March 19, 2021 11:36 PM
To: Vadim Pasternak <[email protected]>
Cc: [email protected]
Subject: Re: [Re-send PATCH hwmon-next v2 1/1] hwmon: (mlxreg-fan) Add support for fan drawers capability and present registers

Quoted 8 lines · Vadim Pasternak

Add support for fan drawer's capability and present registers in order to set mapping between the fan drawers and tachometers. Some systems are equipped with fan drawers with one tachometer inside. Others with fan drawers with several tachometers inside. Using present register along with tachometer-to-drawer mapping allows to skip reading missed tachometers and expose input for them as zero, instead of exposing fault code returned by hardware.

Quoted 4 lines
Quoted 1 line

I had asked for a number of changes to v2. Resending v2 without addressing anything isn't really helpful.

Quoted 8 lines

Hi Guenter,

I am sorry, I missed the change related to your comment:
"The outer double (( )) is pointless.".
I'll fix it.

I think I handled your other comments or I am wrong?

None of the comments I sent as response to the original v2 have been addressed.

Quoted 2 lines

Should I send patch as v3 or as v2?

Any change requires a new version.

Guenter

Quoted 5 lines

Thanks,
Vadim.

Quoted 2 lines

Guenter

#4 lore raw
Quoted 44 lines

-----Original Message-----
From: Guenter Roeck <[email protected]> On Behalf Of Guenter Roeck
Sent: Sunday, March 21, 2021 6:13 PM
To: Vadim Pasternak <[email protected]>
Cc: [email protected]
Subject: Re: [Re-send PATCH hwmon-next v2 1/1] hwmon: (mlxreg-fan) Add support for fan drawers capability and present registers

Quoted 24 lines · Vadim Pasternak
Quoted 19 lines

-----Original Message-----
From: Guenter Roeck <[email protected]> On Behalf Of Guenter Roeck
Sent: Friday, March 19, 2021 11:36 PM
To: Vadim Pasternak <[email protected]>
Cc: [email protected]
Subject: Re: [Re-send PATCH hwmon-next v2 1/1] hwmon: (mlxreg-fan) Add support for fan drawers capability and present registers

Quoted 8 lines · Vadim Pasternak

Add support for fan drawer's capability and present registers in order to set mapping between the fan drawers and tachometers. Some systems are equipped with fan drawers with one tachometer inside. Others with fan drawers with several tachometers inside. Using present register along with tachometer-to-drawer mapping allows to skip reading missed tachometers and expose input for them as zero, instead of exposing fault code returned by hardware.

Quoted 4 lines
Quoted 1 line

I had asked for a number of changes to v2. Resending v2 without addressing anything isn't really helpful.

Quoted 8 lines

Hi Guenter,

I am sorry, I missed the change related to your comment:
"The outer double (( )) is pointless.".
I'll fix it.

I think I handled your other comments or I am wrong?

Quoted 6 lines

None of the comments I sent as response to the original v2 have been addressed.

Quoted 2 lines

Should I send patch as v3 or as v2?

Any change requires a new version.

Ah, I understood now.
From some reason I didn't get your comments for v2 to my mail box and I thought it was just missed.

Now, I found you review at:
https://www.spinics.net/lists/linux-hwmon/msg10195.html

I'll go over your comments and prepare v3.
Very sorry.

Thanks,
Vadim.

Quoted 8 lines

Guenter

Quoted 5 lines

Thanks,
Vadim.

Quoted 2 lines

Guenter