From: Sasha Levin Date: Thu, 29 Dec 2022 12:46:44 +0000 (-0500) Subject: Fixes for 5.15 X-Git-Tag: v5.15.86~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d308046fedcfdcd94ef252dd48d36b4af0955abb;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.15 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/pwm-tegra-fix-32-bit-build.patch b/queue-5.15/pwm-tegra-fix-32-bit-build.patch new file mode 100644 index 00000000000..f08242dfeb0 --- /dev/null +++ b/queue-5.15/pwm-tegra-fix-32-bit-build.patch @@ -0,0 +1,47 @@ +From 5c526cce962447cef973e79ea1ffc992237297a4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Nov 2022 11:45:48 +0000 +Subject: pwm: tegra: Fix 32 bit build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Steven Price + +[ Upstream commit dd1f1da4ada5d8ac774c2ebe97230637820b3323 ] + +The value of NSEC_PER_SEC << PWM_DUTY_WIDTH doesn't fix within a 32 bit +integer causing a build warning/error (and the value truncated): + + drivers/pwm/pwm-tegra.c: In function ‘tegra_pwm_config’: + drivers/pwm/pwm-tegra.c:148:53: error: result of ‘1000000000 << 8’ requires 39 bits to represent, but ‘long int’ only has 32 bits [-Werror=shift-overflow=] + 148 | required_clk_rate = DIV_ROUND_UP_ULL(NSEC_PER_SEC << PWM_DUTY_WIDTH, + | ^~ + +Explicitly cast to a u64 to ensure the correct result. + +Fixes: cfcb68817fb3 ("pwm: tegra: Improve required rate calculation") +Signed-off-by: Steven Price +Reviewed-by: Uwe Kleine-König +Reviewed-by: Jon Hunter +Signed-off-by: Sasha Levin +--- + drivers/pwm/pwm-tegra.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c +index 2735a97906fd..6a1ff9d42f79 100644 +--- a/drivers/pwm/pwm-tegra.c ++++ b/drivers/pwm/pwm-tegra.c +@@ -142,7 +142,7 @@ static int tegra_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, + * source clock rate as required_clk_rate, PWM controller will + * be able to configure the requested period. + */ +- required_clk_rate = DIV_ROUND_UP_ULL(NSEC_PER_SEC << PWM_DUTY_WIDTH, ++ required_clk_rate = DIV_ROUND_UP_ULL((u64)NSEC_PER_SEC << PWM_DUTY_WIDTH, + period_ns); + + err = clk_set_rate(pc->clk, required_clk_rate); +-- +2.35.1 + diff --git a/queue-5.15/series b/queue-5.15/series index 7dd5c837805..ae6c7f94bee 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -730,3 +730,4 @@ media-dvbdev-fix-build-warning-due-to-comments.patch media-dvbdev-fix-refcnt-bug.patch extcon-usbc-tusb320-call-the-type-c-irq-handler-only-if-a-port-is-registered.patch mfd-qcom_rpm-use-devm_of_platform_populate-to-simpli.patch +pwm-tegra-fix-32-bit-build.patch