Received: from mailgate02.uberspace.is (mailgate02.uberspace.is [185.26.156.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A215637DE85 for ; Sat, 23 May 2026 09:54:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.26.156.114 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779530067; cv=none; b=NX21XRY7gucF3S9DH3ZJWy+9FJIAGMLXwlo88PCIEHdPiL33+kV0AUgiBFHnjYo9VPbiOQYaYTvSrBZeIiAzHUxKcqm26gJIvG3rNBNLmeQdiBFxfnJpm/tLB1RGUBPR+Uan2lI2FhsPDbRieEHk5g8o9kYOWNVFrO7DnirSBeM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779530067; c=relaxed/simple; bh=1W384CBEC7OXLg7fDBZ5nq+gU0F4DmKT5ie5aZa9oQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GYBfZHVFDB1d/tNBZjt4etV+i4HgzBT2bvl1UyRlRrhvP3NQWJUX0oNQEQD7RJjhmHwsciU1gzHed03JwDEXRCpS38SKuNnK+p2BZ21XKVJaPoGg1e9ToL9zcfgVigItjFrW+yRwaYgzEKbW/0NMv7vstP64Ndl1Tg6KtOLDwTA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jhbruhn.de; spf=pass smtp.mailfrom=jhbruhn.de; dkim=pass (4096-bit key) header.d=jhbruhn.de header.i=@jhbruhn.de header.b=abY/T1T6; arc=none smtp.client-ip=185.26.156.114 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=jhbruhn.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jhbruhn.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=jhbruhn.de header.i=@jhbruhn.de header.b="abY/T1T6" Received: from boethin.uberspace.de (boethin.uberspace.de [185.26.156.96]) by mailgate02.uberspace.is (Postfix) with ESMTPS id 1801B17F78E for ; Sat, 23 May 2026 11:54:23 +0200 (CEST) Received: (qmail 18040 invoked by uid 990); 23 May 2026 09:54:23 -0000 Authentication-Results: boethin.uberspace.de; auth=pass (plain) Received: from unknown (HELO unknown) (::1) by boethin.uberspace.de (Haraka/3.1.1) with ESMTPSA; Sat, 23 May 2026 11:54:22 +0200 From: Jan-Henrik Bruhn To: sashiko-bot@kernel.org Cc: kernel@jhbruhn.de, linux-hwmon@vger.kernel.org, sashiko-reviews@lists.linux.dev Subject: [PATCH v3] hwmon: (lm63) expose PWM frequency and LUT hysteresis as writable Date: Sat, 23 May 2026 11:54:12 +0200 Message-ID: <20260523095412.3341202-1-kernel@jhbruhn.de> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260522205930.3E2EF1F000E9@smtp.kernel.org> References: <20260522205930.3E2EF1F000E9@smtp.kernel.org> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Bar: - X-Rspamd-Report: MID_CONTAINS_FROM(1) BAYES_HAM(-3) MIME_GOOD(-0.1) R_MISSING_CHARSET(0.5) X-Rspamd-Score: -1.6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=jhbruhn.de; s=uberspace; h=from:to:cc:subject:date; bh=1W384CBEC7OXLg7fDBZ5nq+gU0F4DmKT5ie5aZa9oQY=; b=abY/T1T65PkGEqBh2HdMcTWW7Qx/bYxsst8/l14CVmsmkmI5WlaK1hCPiB8oPowmqxlgusdekl t7S2LbJjZh0/LOwjOfFVNkKEI+2tinLmR1YzMj/XpLTuLMbMtEJR5fEKY40FSom80J/XFm07KQYh Psj586YiU8//eUvYNtQlytv7eoGl03tdnhpfg9ZXq4Ygg2/MqU3xxaGuWK2rWk1zgrtTpJSO6VK0 TWoQX41ES0/fhnGOs3lsctO517jGm/Z5zMOrDb5+C5LwmEHbyBPqTn1ybCAEb4PtzRoa7zv8vWCi ufDYfDgvjmcI5dWnVEwwy682Aw1SzXFFvVmwX+jiHXATftDVFhRkPb3FCSK6MkFxhC2jBjpJXzim MEWCeX/ewyPith5iJ5XGJG9NWIRPvctDe42t5GSe0naukgnCNQk3rdTofoIFc/gB5u2M1NB9WLlC J33fNipbKfOGr3NhSUZcUJwr2hGvQCVcSKRNHc2qHql94RCVD2DGpJiFID9nGk7EjexOPA4kbzpz 2uaCyrsLSYk2b5iodHxbNZinqzUAtxtf9Y7K1MNBXx+xmBRZINZgzg3kHGmWY88x/fbqMJQQIFKb XQtMXfSiZZzdN8jEO6n32QbuJE2QYZD4FOH8l7XI/a43LdLGPrKlekSnKQP1RH+shB3uB0U7Yg3o E= The driver caches the PWM frequency register and the CONFIG_FAN slow-clock select bit, but never lets userspace pick a different output frequency. Add a pwm1_freq sysfs attribute that selects the closest SCS + PFR combination for the requested value in Hz, gated by manual mode like set_pwm1(). PFR is clamped to 31 so that 2*PFR fits in the chip's 6-bit PWM register (matching the existing scaling assumption in show_pwm1). The hardware LUT hysteresis register is shared by all LUT entries, so the per-point pwm1_auto_pointN_temp_hyst attributes can't be made RW without N-to-1 cross-attribute side effects. Following the max31760 precedent, expose a single chip-wide pwm1_auto_point_temp_hyst attribute holding the hysteresis amount in millidegrees; the per-point attributes stay RO and continue to show the resulting absolute trip-down temperature for each entry. This was tested on a Linksys LGS328MPC switch hardware where the fan would not spin with the default PWM Frequency, which is why this change is required. Signed-off-by: Jan-Henrik Bruhn --- v3: - pwm1_freq_store: re-check the manual-mode bit under update_lock after the in-lock read of LM63_REG_CONFIG_FAN, instead of relying on the cached value before locking. - pwm1_freq_store: read LM96163_REG_CONFIG_ENHANCED before writing LM63_REG_CONFIG_FAN and LM63_REG_PWM_FREQ so an SMBus failure aborts cleanly without leaving the cache out of sync. v2: - check return value of i2c_smbus_read_byte_data() in pwm1_freq_store() and propagate the error instead of silently using truncated values. --- drivers/hwmon/lm63.c | 123 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c index a0d77a7386a9..2a11b9987dfc 100644 --- a/drivers/hwmon/lm63.c +++ b/drivers/hwmon/lm63.c @@ -92,6 +92,9 @@ static const unsigned short normal_i2c[] = { 0x18, 0x4c, 0x4e, I2C_CLIENT_END }; #define LM96163_REG_REMOTE_TEMP_U_LSB 0x32 #define LM96163_REG_CONFIG_ENHANCED 0x45 +#define LM63_PWM_BASE_FAST_HZ 180000 +#define LM63_PWM_BASE_SLOW_HZ 700 + #define LM63_MAX_CONVRATE 9 #define LM63_MAX_CONVRATE_HZ 32 @@ -455,6 +458,86 @@ static ssize_t pwm1_enable_store(struct device *dev, return count; } +static ssize_t pwm1_freq_show(struct device *dev, + struct device_attribute *dummy, char *buf) +{ + struct lm63_data *data = lm63_update_device(dev); + unsigned int base = (data->config_fan & 0x08) ? + LM63_PWM_BASE_SLOW_HZ : LM63_PWM_BASE_FAST_HZ; + + return sprintf(buf, "%u\n", base / data->pwm1_freq); +} + +/* + * Pick the closest CONFIG_FAN.SCS + PFR for the requested frequency. + * PWM_FREQ writes need the LUT unlocked, same as set_pwm1(). LUT PWM + * bytes are register-relative; rewrite them after a frequency change + * if duty cycles must be preserved. + */ +static ssize_t pwm1_freq_store(struct device *dev, + struct device_attribute *dummy, + const char *buf, size_t count) +{ + struct lm63_data *data = dev_get_drvdata(dev); + struct i2c_client *client = data->client; + unsigned long val, pfr_fast, pfr_slow, err_fast, err_slow, pfr; + bool slow_clock; + int ret; + + ret = kstrtoul(buf, 10, &val); + if (ret) + return ret; + if (val == 0) + return -EINVAL; + + pfr_fast = clamp_val(DIV_ROUND_CLOSEST((unsigned long)LM63_PWM_BASE_FAST_HZ, val), + 1UL, 31UL); + pfr_slow = clamp_val(DIV_ROUND_CLOSEST((unsigned long)LM63_PWM_BASE_SLOW_HZ, val), + 1UL, 31UL); + err_fast = abs_diff(LM63_PWM_BASE_FAST_HZ / pfr_fast, val); + err_slow = abs_diff(LM63_PWM_BASE_SLOW_HZ / pfr_slow, val); + + if (err_slow < err_fast) { + slow_clock = true; + pfr = pfr_slow; + } else { + slow_clock = false; + pfr = pfr_fast; + } + + mutex_lock(&data->update_lock); + ret = i2c_smbus_read_byte_data(client, LM63_REG_CONFIG_FAN); + if (ret < 0) { + mutex_unlock(&data->update_lock); + return ret; + } + data->config_fan = ret; + + if (!(data->config_fan & 0x20)) { /* register is read-only */ + mutex_unlock(&data->update_lock); + return -EPERM; + } + + if (data->kind == lm96163) { + ret = i2c_smbus_read_byte_data(client, LM96163_REG_CONFIG_ENHANCED); + if (ret < 0) { + mutex_unlock(&data->update_lock); + return ret; + } + data->pwm_highres = !slow_clock && pfr == 8 && (ret & 0x10); + } + + if (slow_clock) + data->config_fan |= 0x08; + else + data->config_fan &= ~0x08; + i2c_smbus_write_byte_data(client, LM63_REG_CONFIG_FAN, data->config_fan); + i2c_smbus_write_byte_data(client, LM63_REG_PWM_FREQ, pfr); + data->pwm1_freq = pfr; + mutex_unlock(&data->update_lock); + return count; +} + /* * There are 8bit registers for both local(temp1) and remote(temp2) sensor. * For remote sensor registers temp2_offset has to be considered, @@ -629,6 +712,42 @@ static ssize_t show_lut_temp_hyst(struct device *dev, return sprintf(buf, "%d\n", temp); } +/* + * The LM63 has a single hysteresis register shared by all LUT entries. + * Expose it as a chip-wide hysteresis amount in millidegrees; the + * per-point pwm1_auto_pointN_temp_hyst attributes remain read-only and + * show the resulting absolute trip-down temperature for each entry. + */ +static ssize_t pwm1_auto_point_temp_hyst_show(struct device *dev, + struct device_attribute *dummy, + char *buf) +{ + struct lm63_data *data = lm63_update_device(dev); + + return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->lut_temp_hyst)); +} + +static ssize_t pwm1_auto_point_temp_hyst_store(struct device *dev, + struct device_attribute *dummy, + const char *buf, size_t count) +{ + struct lm63_data *data = dev_get_drvdata(dev); + struct i2c_client *client = data->client; + unsigned long val; + int err; + + err = kstrtoul(buf, 10, &val); + if (err) + return err; + + mutex_lock(&data->update_lock); + data->lut_temp_hyst = HYST_TO_REG(val); + i2c_smbus_write_byte_data(client, LM63_REG_LUT_TEMP_HYST, + data->lut_temp_hyst); + mutex_unlock(&data->update_lock); + return count; +} + /* * And now the other way around, user-space provides an absolute * hysteresis value and we have to store a relative one @@ -764,6 +883,8 @@ static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan, static SENSOR_DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm1, set_pwm1, 0); static DEVICE_ATTR_RW(pwm1_enable); +static DEVICE_ATTR_RW(pwm1_freq); +static DEVICE_ATTR_RW(pwm1_auto_point_temp_hyst); static SENSOR_DEVICE_ATTR(pwm1_auto_point1_pwm, S_IWUSR | S_IRUGO, show_pwm1, set_pwm1, 1); static SENSOR_DEVICE_ATTR(pwm1_auto_point1_temp, S_IWUSR | S_IRUGO, @@ -869,6 +990,8 @@ static DEVICE_ATTR_RW(update_interval); static struct attribute *lm63_attributes[] = { &sensor_dev_attr_pwm1.dev_attr.attr, &dev_attr_pwm1_enable.attr, + &dev_attr_pwm1_freq.attr, + &dev_attr_pwm1_auto_point_temp_hyst.attr, &sensor_dev_attr_pwm1_auto_point1_pwm.dev_attr.attr, &sensor_dev_attr_pwm1_auto_point1_temp.dev_attr.attr, &sensor_dev_attr_pwm1_auto_point1_temp_hyst.dev_attr.attr, -- 2.48.1