From patchwork Fri Jan 31 20:40:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sybil Isabel Dorsett X-Patchwork-Id: 13955807 Received: from mail-106104.protonmail.ch (mail-106104.protonmail.ch [79.135.106.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80F7225760 for ; Fri, 31 Jan 2025 20:40:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.104 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738356058; cv=none; b=ECpNx4oINEmsmJOGjsC/VOVgF3O7mQxH8w9KZKU5sOpuHjI+ObdhK6S+5DlOvzRCdOW9PxKWpGsTpxN1/LOTRNjPNxg6eqMVxpKgrFxcnVo8c1lcTe23QpAqsGa1FQQ/KjNpfJ4nFloefAoD3YPV7wltzp+ljG9pVwuwKM/q0Ro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738356058; c=relaxed/simple; bh=syc1sIgEYukNEqJa8DChTmRlkTkcWqFoIiEqdImom5k=; h=Date:To:From:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=TQBZECwxOzo5+sxt3QxRyAbpsoFY8+a7l4b6eNwgBHWk2JWtSpUn44bmEX+NO5k/Z7CIEmPlayKiLXAHZ+J5aFYz+ig4so01zcbgKQdEPIpjioIt0heVWzg4rvlLGCVwCRu9TrJC1gvlaBySGG0HHPqjX8MqywK6Ka0Wd2lD1EQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=proton.me; spf=pass smtp.mailfrom=proton.me; dkim=pass (2048-bit key) header.d=proton.me header.i=@proton.me header.b=Tuo2kscC; arc=none smtp.client-ip=79.135.106.104 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=proton.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=proton.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=proton.me header.i=@proton.me header.b="Tuo2kscC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1738356048; x=1738615248; bh=Yi3JIUM6xwq3zGVkOrxOqLB0T0cu4+4SGhnD3OuiQYU=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=Tuo2kscCycnFyLEJBFT7SltaKsLYC76K1zubFu/LdOzD9BI9SuFaZI13js8o4a5m8 67F8dMo9+XJgoaMLqFycUIMBC+sQGPG3jgUY03Yy16qFvHZz4gT5RQ5Mdnp4tGwxU7 +rifCb31lcXwh/NvMbjFgiyN2PDO+0flLE2B4x9vU4Z2vcU6qU2F4/rK+mwn/vJE54 Q4q97i1WXjLKuFbY38MZQrmjqvcyMyDQRLEWQjCS7oEyrdq0fYD8xc3gKNz8xeAvH5 lp3TfhvGJILnR3zaepAIe4OR+rkoxVWLBbUMKoMcsJpp5hjnlLdg2KDeUX8AMrXRnM UxntfMJXN447A== Date: Fri, 31 Jan 2025 20:40:40 +0000 To: Henrique de Moraes Holschuh From: Sybil Isabel Dorsett Cc: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Sybil Isabel Dorsett Subject: [PATCH] Fix invalid fan speed on ThinkPad X120e Message-ID: <20250131203854.6608-1-sybdorsett@proton.me> Feedback-ID: 131381098:user:proton X-Pm-Message-ID: 654a71d66ed105459ecb1103c6d9ea69b8661d1b Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Fix fan speed reported in ticks per revolution on ThinkPad X120e by converting the reported value to RPM based on a 22.5 KHz clock. Based on the information on https://www.thinkwiki.org/wiki/How_to_control_fan_speed, the same problem is highly likely to be relevant to at least Edge11, but Edge11 is not addressed in this patch. Signed-off-by: Sybil Isabel Dorsett --- drivers/platform/x86/thinkpad_acpi.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 1fcb0f996..147a70af3 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -7885,6 +7885,7 @@ static struct ibm_struct volume_driver_data = { #define FAN_NS_CTRL_STATUS BIT(2) /* Bit which determines control is enabled or not */ #define FAN_NS_CTRL BIT(4) /* Bit which determines control is by host or EC */ +#define FAN_CLOCK_TPM (22500*60) /* Ticks per minute for a 22.5 KHz clock */ enum { /* Fan control constants */ fan_status_offset = 0x2f, /* EC register 0x2f */ @@ -7940,6 +7941,7 @@ static int fan_watchdog_maxinterval; static bool fan_with_ns_addr; static bool ecfw_with_fan_dec_rpm; +static bool fan_speed_requires_conversion; static struct mutex fan_mutex; @@ -8142,8 +8144,11 @@ static int fan_get_speed(unsigned int *speed) !acpi_ec_read(fan_rpm_offset + 1, &hi))) return -EIO; - if (likely(speed)) + if (likely(speed)) { *speed = (hi << 8) | lo; + if (fan_speed_requires_conversion && *speed != 0) + *speed = FAN_CLOCK_TPM / *speed; + } break; case TPACPI_FAN_RD_TPEC_NS: if (!acpi_ec_read(fan_rpm_status_ns, &lo)) @@ -8176,8 +8181,11 @@ static int fan2_get_speed(unsigned int *speed) if (rc) return -EIO; - if (likely(speed)) + if (likely(speed)) { *speed = (hi << 8) | lo; + if (fan_speed_requires_conversion && *speed != 0) + *speed = FAN_CLOCK_TPM / *speed; + } break; case TPACPI_FAN_RD_TPEC_NS: @@ -8788,6 +8796,7 @@ static const struct attribute_group fan_driver_attr_group = { #define TPACPI_FAN_NOFAN 0x0008 /* no fan available */ #define TPACPI_FAN_NS 0x0010 /* For EC with non-Standard register addresses */ #define TPACPI_FAN_DECRPM 0x0020 /* For ECFW's with RPM in register as decimal */ +#define TPACPI_FAN_TPR 0x0040 /* Fan speed is in Ticks Per Revolution */ static const struct tpacpi_quirk fan_quirk_table[] __initconst = { TPACPI_QEC_IBM('1', 'Y', TPACPI_FAN_Q1), @@ -8817,6 +8826,7 @@ static const struct tpacpi_quirk fan_quirk_table[] __initconst = { TPACPI_Q_LNV3('R', '0', 'V', TPACPI_FAN_NS), /* 11e Gen5 KL-Y */ TPACPI_Q_LNV3('N', '1', 'O', TPACPI_FAN_NOFAN), /* X1 Tablet (2nd gen) */ TPACPI_Q_LNV3('R', '0', 'Q', TPACPI_FAN_DECRPM),/* L480 */ + TPACPI_Q_LNV('8', 'F', TPACPI_FAN_TPR), /* ThinkPad x120e */ }; static int __init fan_init(struct ibm_init_struct *iibm) @@ -8887,6 +8897,8 @@ static int __init fan_init(struct ibm_init_struct *iibm) if (quirks & TPACPI_FAN_Q1) fan_quirk1_setup(); + if (quirks & TPACPI_FAN_TPR) + fan_speed_requires_conversion = true; /* Try and probe the 2nd fan */ tp_features.second_fan = 1; /* needed for get_speed to work */ res = fan2_get_speed(&speed);