From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.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 8EDCC27A909; Mon, 14 Apr 2025 13:27:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637269; cv=none; b=cKXpJxO96FixWj+6vP8qEuOR0zxgs/Iu4MIy0ZAof8R/P/EUp8dhWnEuS8yqtFWCuksUrTCxyDdM8z2h+WYpGkJFV9B72oprlLm2S61fYSSrAo6de+6al6+bjQGrNf6MiVRXv4GppYf42yXmt3/jfu9/dmlUizEM4k0i+0dcQ6I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637269; c=relaxed/simple; bh=W9a1bZacIMHZgIEupV7PVdZLCgm8bqcqKRtbQq4Ex1E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=mX5V+1jS0g9KPMdcEeIomkFS71KEksffxVFjRI3ETK7KZ33mhOOrnMtBUnvS7yVVp6+d8QS5tueGyWPArvik0SuudZDJpQv9F+UNASxSp3LVl3hgtwgEp55nrObhaub9lExocsa0LSctlhBYJXsVjUqDQInPMn9JKtjw95V9eLk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SbI3R2Hu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SbI3R2Hu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BFF8C4CEE9; Mon, 14 Apr 2025 13:27:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744637269; bh=W9a1bZacIMHZgIEupV7PVdZLCgm8bqcqKRtbQq4Ex1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SbI3R2HuY5SatqlYnlIkFo7rdplGekmfNhK8Wn/Lq2Z0u0qCwFrD+12dtQuX9ptSP nLIaV0tPS/wyGRUR1H5KGuBiWl8mw0O24axwGt2cHzMr9+8fsyd5DxZp54G1EkxxDs jZBCAIlMCo7G/3eUmgLdsGxXeMdlTgaN9om2AYaePZd7G+WhxgvJe5Jkx8Kb0o6cw1 qACAwGUpBRK0j/PglNTXjpTTa/OyDwbtvLk1QMiJSW7AaFUcS/397s3PTCFzEv8Hzl hl6FAnJZYNvzbon2AEKzKqcQHZT9ThB8Ey+IqodqXRqm/KEsnLU3QMGER+fGwDLzQI gJ1QROoahfP/w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Trevor Gamblin , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Sasha Levin , michael.hennerich@analog.com, nuno.sa@analog.com, linux-pwm@vger.kernel.org Subject: [PATCH AUTOSEL 6.13 09/34] pwm: axi-pwmgen: Let .round_waveform_tohw() signal when request was rounded up Date: Mon, 14 Apr 2025 09:27:03 -0400 Message-Id: <20250414132729.679254-9-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414132729.679254-1-sashal@kernel.org> References: <20250414132729.679254-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.13.11 Content-Transfer-Encoding: 8bit From: Uwe Kleine-König [ Upstream commit a85e08a05bf77d5d03b4ac0c59768a606a1b640b ] The .round_waveform_tohw() is supposed to return 1 if the requested waveform cannot be implemented by rounding down all parameters. Also adapt the corresponding comment to better describe why the implemented procedure is right. Signed-off-by: Uwe Kleine-König Tested-by: Trevor Gamblin Link: https://lore.kernel.org/r/ba451573f0218d76645f068cec78bd97802cf010.1743844730.git.u.kleine-koenig@baylibre.com Signed-off-by: Uwe Kleine-König Signed-off-by: Sasha Levin --- drivers/pwm/pwm-axi-pwmgen.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/pwm/pwm-axi-pwmgen.c b/drivers/pwm/pwm-axi-pwmgen.c index 4259a0db9ff45..4337c8f5acf05 100644 --- a/drivers/pwm/pwm-axi-pwmgen.c +++ b/drivers/pwm/pwm-axi-pwmgen.c @@ -75,6 +75,7 @@ static int axi_pwmgen_round_waveform_tohw(struct pwm_chip *chip, { struct axi_pwmgen_waveform *wfhw = _wfhw; struct axi_pwmgen_ddata *ddata = axi_pwmgen_ddata_from_chip(chip); + int ret = 0; if (wf->period_length_ns == 0) { *wfhw = (struct axi_pwmgen_waveform){ @@ -91,12 +92,15 @@ static int axi_pwmgen_round_waveform_tohw(struct pwm_chip *chip, if (wfhw->period_cnt == 0) { /* * The specified period is too short for the hardware. - * Let's round .duty_cycle down to 0 to get a (somewhat) - * valid result. + * So round up .period_cnt to 1 (i.e. the smallest + * possible period). With .duty_cycle and .duty_offset + * being less than or equal to .period, their rounded + * value must be 0. */ wfhw->period_cnt = 1; wfhw->duty_cycle_cnt = 0; wfhw->duty_offset_cnt = 0; + ret = 1; } else { wfhw->duty_cycle_cnt = min_t(u64, mul_u64_u32_div(wf->duty_length_ns, ddata->clk_rate_hz, NSEC_PER_SEC), @@ -111,7 +115,7 @@ static int axi_pwmgen_round_waveform_tohw(struct pwm_chip *chip, pwm->hwpwm, wf->duty_length_ns, wf->period_length_ns, wf->duty_offset_ns, ddata->clk_rate_hz, wfhw->period_cnt, wfhw->duty_cycle_cnt, wfhw->duty_offset_cnt); - return 0; + return ret; } static int axi_pwmgen_round_waveform_fromhw(struct pwm_chip *chip, struct pwm_device *pwm, -- 2.39.5