From patchwork Mon Aug 19 07:06:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mailinflist1@johanneskirchmair.de X-Patchwork-Id: 13767982 Received: from a.mail-out.lima-city.de (a.mail-out.lima-city.de [91.216.248.201]) (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 3807013BC1E for ; Mon, 19 Aug 2024 07:15:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.216.248.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724051740; cv=none; b=kxkUHEzGx72Zed2bIDxveLeCaRothK5y4kRMQNst60Ha8F25G4/ytkYG7eryc5A/1wrsQD6749O4oyGuWQDl9JbcYZY/e7cf2aNZS9SIaXUXMrWkRwQ/jmXJaObEV8+EcNSUKa5qAuREuGi4T+N0eA9fOWh2TGPjH1pgO0g+OOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724051740; c=relaxed/simple; bh=V7xuXsLM7ZWbYeRkhbETyZRzVh4DSxT0Vxs1oToA2GI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=jAYxsOMWqlsoBgpABW7pfQNIbqm9EOspyRrg9ztWFRkqcOoXyeSliXXriH6myQScqqzyezdJwbjVLzpCyK7q0MohCBKi23GSp15AU8YXw82apiOcZUwEFLa4pcefqm9VDyrlJXilpfciPdfmsRzf6eWavE9vtaZemMYoh2QFQWQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=johanneskirchmair.de; spf=none smtp.mailfrom=johanneskirchmair.de; dkim=pass (1024-bit key) header.d=johanneskirchmair.de header.i=@johanneskirchmair.de header.b=scG3tHlu; arc=none smtp.client-ip=91.216.248.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=johanneskirchmair.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=johanneskirchmair.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=johanneskirchmair.de header.i=@johanneskirchmair.de header.b="scG3tHlu" From: mailinflist1@johanneskirchmair.de DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=johanneskirchmair.de; s=securedbylima-20161106; t=1724051322; bh=V7xuXsLM7ZWbYeRkhbETyZRzVh4DSxT0Vxs1oToA2GI=; h=From:To:Cc:Subject:Date:From; b=scG3tHlumDgsDVbGzabtRZozdAFcNjJ/EhZHH1GSxZ+IQ1HYLisiHbUFbwiytiqct FzjiYWgwXxO5Zws9ItQ0HaOV0A2/kTGl1rT37uyWOBUHb03iVMO6QoTwryjYdQocrI DrjapcRNMJBXGFDEUTKmkb4lkQbGZZS2gmWkvlfw= To: linux-hwmon@vger.kernel.org Cc: groeck7@gmail.com, Johannes Kirchmair Subject: [PATCH v2] hwmon: pwmfan: do not force disable pwm controller Date: Mon, 19 Aug 2024 09:06:49 +0200 Message-Id: <20240819070649.333505-1-mailinflist1@johanneskirchmair.de> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Johannes Kirchmair The pwm1_enable attribute of the pwmfan driver influences the mode of operation, especially in case of a requested pwm1 duty cycle of zero. Especially setting pwm1_enable to two, should keep the pwm controller enabled even if the duty cycle is set to zero [1]. This is not the case at the moment, as the pwm controller is disabled always if pwm1 is set to zero. This commit tries to fix this behavior. [1] https://docs.kernel.org/hwmon/pwm-fan.html Signed-off-by: Johannes Kirchmair --- drivers/hwmon/pwm-fan.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index a1712649b07e..c434db4656e7 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -167,7 +167,7 @@ static int pwm_fan_power_on(struct pwm_fan_ctx *ctx) return ret; } -static int pwm_fan_power_off(struct pwm_fan_ctx *ctx) +static int pwm_fan_power_off(struct pwm_fan_ctx *ctx, bool force_disable) { struct pwm_state *state = &ctx->pwm_state; bool enable_regulator = false; @@ -180,7 +180,8 @@ static int pwm_fan_power_off(struct pwm_fan_ctx *ctx) state, &enable_regulator); - state->enabled = false; + if (force_disable) + state->enabled = false; state->duty_cycle = 0; ret = pwm_apply_might_sleep(ctx->pwm, state); if (ret) { @@ -213,7 +214,7 @@ static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm) return ret; ret = pwm_fan_power_on(ctx); } else { - ret = pwm_fan_power_off(ctx); + ret = pwm_fan_power_off(ctx, false); } if (!ret) ctx->pwm_value = pwm; @@ -468,7 +469,7 @@ static void pwm_fan_cleanup(void *__ctx) del_timer_sync(&ctx->rpm_timer); /* Switch off everything */ ctx->enable_mode = pwm_disable_reg_disable; - pwm_fan_power_off(ctx); + pwm_fan_power_off(ctx, true); } static int pwm_fan_probe(struct platform_device *pdev) @@ -661,7 +662,7 @@ static int pwm_fan_suspend(struct device *dev) { struct pwm_fan_ctx *ctx = dev_get_drvdata(dev); - return pwm_fan_power_off(ctx); + return pwm_fan_power_off(ctx, true); } static int pwm_fan_resume(struct device *dev)