102 lines
3.4 KiB
Diff
102 lines
3.4 KiB
Diff
|
From 582264258aa3e95f87e33221ff9026899e02d529 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vadim Pasternak <vadimp@nvidia.com>
|
||
|
|
Date: Sun, 23 Jul 2023 06:26:09 +0000
|
||
|
|
Subject: [PATCH] hwmon: (mlxreg-fan) Add support for new flavour of capability
|
||
|
|
register
|
||
|
|
X-NVConfidentiality: public
|
||
|
|
|
||
|
|
FAN platform data is common across the various systems, while fan
|
||
|
|
driver should be able to apply only the fan instances relevant
|
||
|
|
to specific system.
|
||
|
|
|
||
|
|
For example, platform data might contain descriptions for fan1,
|
||
|
|
fan2, ..., fan{n}, while some systems equipped with all 'n' fans,
|
||
|
|
others with less.
|
||
|
|
Also, on some systems fan drawer can be equipped with several
|
||
|
|
tachometers and on others only with one.
|
||
|
|
|
||
|
|
For detection of the real number of equipped drawers and tachometers
|
||
|
|
special capability registers are used.
|
||
|
|
These registers used to indicate presence of drawers and tachometers
|
||
|
|
through the bitmap.
|
||
|
|
|
||
|
|
For some new big modular systems this register will provide presence
|
||
|
|
data by counter.
|
||
|
|
|
||
|
|
Use slot parameter to distinct whether capability register contains
|
||
|
|
bitmask or counter.
|
||
|
|
|
||
|
|
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
|
||
|
|
---
|
||
|
|
drivers/hwmon/mlxreg-fan.c | 19 ++++++++++++++++---
|
||
|
|
1 file changed, 16 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/hwmon/mlxreg-fan.c b/drivers/hwmon/mlxreg-fan.c
|
||
|
|
index acba9d688..c0b42821f 100644
|
||
|
|
--- a/drivers/hwmon/mlxreg-fan.c
|
||
|
|
+++ b/drivers/hwmon/mlxreg-fan.c
|
||
|
|
@@ -72,12 +72,14 @@ struct mlxreg_fan;
|
||
|
|
* @reg: register offset;
|
||
|
|
* @mask: fault mask;
|
||
|
|
* @prsnt: present register offset;
|
||
|
|
+ * @shift: tacho presence bit shift;
|
||
|
|
*/
|
||
|
|
struct mlxreg_fan_tacho {
|
||
|
|
bool connected;
|
||
|
|
u32 reg;
|
||
|
|
u32 mask;
|
||
|
|
u32 prsnt;
|
||
|
|
+ u32 shift;
|
||
|
|
};
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -146,8 +148,10 @@ mlxreg_fan_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
|
||
|
|
/*
|
||
|
|
* Map channel to presence bit - drawer can be equipped with
|
||
|
|
* one or few FANs, while presence is indicated per drawer.
|
||
|
|
+ * Shift channel value if necessary to align with register value.
|
||
|
|
*/
|
||
|
|
- if (BIT(channel / fan->tachos_per_drwr) & regval) {
|
||
|
|
+ if (BIT(rol32(channel, tacho->shift) / fan->tachos_per_drwr) &
|
||
|
|
+ regval) {
|
||
|
|
/* FAN is not connected - return zero for FAN speed. */
|
||
|
|
*val = 0;
|
||
|
|
return 0;
|
||
|
|
@@ -411,7 +415,7 @@ static int mlxreg_fan_connect_verify(struct mlxreg_fan *fan,
|
||
|
|
return err;
|
||
|
|
}
|
||
|
|
|
||
|
|
- return !!(regval & data->bit);
|
||
|
|
+ return data->slot ? (data->slot <= regval ? 1 : 0) : !!(regval & data->bit);
|
||
|
|
}
|
||
|
|
|
||
|
|
static int mlxreg_pwm_connect_verify(struct mlxreg_fan *fan,
|
||
|
|
@@ -486,6 +490,7 @@ 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].shift = data->capability_bit;
|
||
|
|
fan->tacho[tacho_num++].connected = true;
|
||
|
|
tacho_avail++;
|
||
|
|
} else if (strnstr(data->label, "pwm", sizeof(data->label))) {
|
||
|
|
@@ -548,7 +553,15 @@ static int mlxreg_fan_config(struct mlxreg_fan *fan,
|
||
|
|
return err;
|
||
|
|
}
|
||
|
|
|
||
|
|
- drwr_avail = hweight32(regval);
|
||
|
|
+ /*
|
||
|
|
+ * The number of drawers could be specified in registers by counters for newer
|
||
|
|
+ * systems, or by bitmasks for older systems. In case the data is provided by
|
||
|
|
+ * counter, it is indicated through 'version' field.
|
||
|
|
+ */
|
||
|
|
+ if (pdata->version)
|
||
|
|
+ drwr_avail = regval;
|
||
|
|
+ else
|
||
|
|
+ drwr_avail = hweight32(regval);
|
||
|
|
if (!tacho_avail || !drwr_avail || tacho_avail < drwr_avail) {
|
||
|
|
dev_err(fan->dev, "Configuration is invalid: drawers num %d tachos num %d\n",
|
||
|
|
drwr_avail, tacho_avail);
|
||
|
|
--
|
||
|
|
2.14.1
|
||
|
|
|